diff --git a/Android/Application/AndroidManifest.xml b/Android/Application/AndroidManifest.xml index 03181d5270bf8f248049a3dbcf40d6eb2066b679..b6f6e0701d962d0e0eed612b76aed4d924fdcbdc 100644 --- a/Android/Application/AndroidManifest.xml +++ b/Android/Application/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/Android/Application/mksettings b/Android/Application/mksettings index 58657b1e1cf6849f70385cd19e2d684abc0590a1..454a7ca0861a950fadfbf30af3606471608445e5 100755 --- a/Android/Application/mksettings +++ b/Android/Application/mksettings @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Android/Application/newstrings b/Android/Application/newstrings index c46c9c3bf85e12872010370b65335c184c839fe7..56a930bd2013c3bd2e2ab90cb2f3768393c536c3 100755 --- a/Android/Application/newstrings +++ b/Android/Application/newstrings @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Android/Application/project.properties b/Android/Application/project.properties index 935a4ed441c98702eba971ec877d106722664ce1..b033637739bc39e4a5b2e561772434271a002d40 100644 --- a/Android/Application/project.properties +++ b/Android/Application/project.properties @@ -12,4 +12,5 @@ # Project target. target=android-21 +sdk.buildtools=21.1.2 android.library.reference.1=../Core diff --git a/Android/Application/res/values-da/strings.xml b/Android/Application/res/values-da/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..f0d1c919ef751098b5c8cd8f178461ea5ae40d3c --- /dev/null +++ b/Android/Application/res/values-da/strings.xml @@ -0,0 +1,222 @@ + + + + BRLTTY + BRLTTY understøtter braille enheder. + + BRLTTY Input Service + Tastaturer på Braille enheder + + Notifikationer + Hurtig Indstillinger + Tilbage + Hjem + Seneste Apps + + BRLTTY Indstillinger + Generalle indstillinger + Håndter enheder + Advancerede indstillinger + + Navigationstilstand + Taleunderstøttelse + + Teksttabel + Attributtabel + Forkortelsestabel + Tastaturtabel + + Log Niveau + Log Kategori + Log Tilgængelighedshændelser + Log Fremkaldt skærm + Log Tastaturhændelser + + Valgte enhed + Tilføj enhed + Fjern enhed + + Ingen enheder + Enhed ikke valgt + + Enhedsnavn + Kommunikationsmetode + Vælg enhed + Braille driver + Udført + kommunikationsmetode ikke valgt + enhed ikke valgt + braille driver ikke valgt + ingen enheder + enhedsnavn allerede i brug + + Vil du virkelig gerne fjerne denne enhed ? + + ingen valgt + + Vertikal liste + To dimensionelt gitter + + Ingen + Medfødt + + Bluetooth + USB + Seriel + + Aflus + Information + Opmærksomhed + Advarsel + Fejl + Kirtisk + Alarm + Uheld + + Generisk input + Input pakker + Output pakker + Braille enhed nøglehændelser + Tastatur nøglehændelser + Markør følgning + Markør ruteplanlægning + Opdateringshændelser + Talehændelser + Asynkrone hændelser + Server hændelser + Serielt I/O + USB I/O + Bluetooth I/O + Braille-driver hændelser + Tale-driver hændelser + Skærm-river hændelser + + autofind + + lokal-baseret autovælg + Arabisk (generisk) + Assamese + Awadhi + Bulgarsk + Bihari + Bengali + Tibetansk + Braj + Braille Ready Format (for at vise .brf files i en editor eller fremviser) + Tjekkisk + Welsk + Dansk (Svend Thougaard, 2002-11-18) + Dansk + Dansk (LogText) + Tysk + Dravidian + Græsk + Engelsk (Canada) + Engelsk + Engelsk (United Kingdom) + Engelsk (Nord Amerikansk Braille Computer Code) + Engelsk (United States) + Esperanto + Spansk + Estisk + Finsk + Fransk (unified 2007) + Fransk (Canada) + Fransk (Code Braille Informatique Français Standard) + Fransk + Fransk (Frankrig) + Fransk (VisioBraille) + Irsk + Gaelic + Gondi + Gujarati + Hebraisk + Hindi + Kroatisk + Ungarnsk + Armenisk + Islandsk + Italiensk + Khasi + Kannada + Konkani + Kurukh + Litauisk + Lettisk + Malagasy + Maori + Malayalam + Manipuri + Marathi + Maltese + Munda + Marwari + Nepalesisk + Newari + Belgisk (Belgien) + Belgisk + Hollansk (Holland) + Norsk (med understøttelse for andre sprog) + Norsk + Norsk (Offentlig utvalg for punktskrift) + Newari (old) + Oriya + Panjabi + Pali + Polsk + Portugisisk + Romansk + Russisk + Sanskrit + Santali + Sindhi + Slovakisk + Slovensk + Svensk (1989 standard) + Svensk (1996 standard) + Svensk + Swahili + Tamil + Telugu + Tyrkisk + Vietnamesisk + + inverteret forgrundsfarve i venstre søjle og baggrundsfarve i højre søjle + forgrundsfarve i venstre søjle og baggrundsfarve i højre søjle + forgrundsfarve i øverste firkant og baggrundsfarve i nederste firkant + + Afrikaans (forkortet) + Amharic (uforkortet) + Tysk (uforkortet) + Tysk (forkortet - 1998 standard) + Tysk (basis forkortelser) + Engelsk (Unified English Braille, grade 2) + Engelsk (US, grade 2) + Spansk (grade 2) + Fransk (forkortet) + Fransk (uforkortet) + Hausa (forkortet) + Indonesisk (forkortet) + Intertionale aonetiske alfabet + Japansk (uforkortet) + Koreansk (grade 1) + Koreansk (grade 2) + Koreansk (uforkortet) + Malaisisk (forkortet) + Munda (forkortet) + Belgisk (forkortet) + Chichewa (forkortet) + Portugiskisk (grade 2) + Sinhalese (uforkortet) + Swahili (forkortet) + Thailandsk (Forkortet) + Kinesisk (Taiwan, uforkortet) + Kinesisk (Taiwan, Unique Chinese Braille) + Zulu (forkortet) + + genveje for braille tastaturer + genveje for hele tastaturer + genveje for taste-baseret navigation + genveje for tastaturer uden nummerisk tastatur + genveje for Sun Type 6 tastaturer + diff --git a/Android/Application/res/values/settings_lists.xml b/Android/Application/res/values/settings_lists.xml index df37166234c84bc9b85e728dd3946242e5adf0f7..3db5a12c5adfff79099671ef2a6dc21cbfd99ddd 100644 --- a/Android/Application/res/values/settings_lists.xml +++ b/Android/Application/res/values/settings_lists.xml @@ -20,6 +20,7 @@ HIMS HandyTech HumanWare + Inceptor Iris Libbraille LogText @@ -61,6 +62,7 @@ @string/BRAILLE_DRIVER_LABEL_hm @string/BRAILLE_DRIVER_LABEL_ht @string/BRAILLE_DRIVER_LABEL_hw + @string/BRAILLE_DRIVER_LABEL_ic @string/BRAILLE_DRIVER_LABEL_ir @string/BRAILLE_DRIVER_LABEL_lb @string/BRAILLE_DRIVER_LABEL_lt @@ -103,6 +105,7 @@ hm ht hw + ic ir lb lt @@ -211,6 +214,7 @@ Tamil Telugu Turkish + Ukrainian Vietnamese @@ -300,6 +304,7 @@ @string/TEXT_TABLE_LABEL_ta @string/TEXT_TABLE_LABEL_te @string/TEXT_TABLE_LABEL_tr + @string/TEXT_TABLE_LABEL_uk @string/TEXT_TABLE_LABEL_vi @@ -390,6 +395,7 @@ ta te tr + uk vi @@ -426,6 +432,7 @@ Korean (uncontracted) Korean (grade 1) Korean (grade 2) + Lithuanian (uncontracted) Malagasy (contracted) Munda (contracted) Dutch (contracted) @@ -456,6 +463,7 @@ @string/CONTRACTION_TABLE_LABEL_ko @string/CONTRACTION_TABLE_LABEL_ko_g1 @string/CONTRACTION_TABLE_LABEL_ko_g2 + @string/CONTRACTION_TABLE_LABEL_lt @string/CONTRACTION_TABLE_LABEL_mg @string/CONTRACTION_TABLE_LABEL_mun @string/CONTRACTION_TABLE_LABEL_nl @@ -487,6 +495,7 @@ ko ko-g1 ko-g2 + lt mg mun nl diff --git a/Android/Application/res/xml/usb_devices.xml b/Android/Application/res/xml/usb_devices.xml index b5a22e3b892abd5f494372be38317dda71b40735..52fa327121a1a6d09b0f17f2cdc907d57ba788f9 100644 --- a/Android/Application/res/xml/usb_devices.xml +++ b/Android/Application/res/xml/usb_devices.xml @@ -72,6 +72,10 @@ + + + + @@ -145,6 +149,7 @@ + @@ -267,6 +272,10 @@ + + + + @@ -276,7 +285,7 @@ - + diff --git a/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java b/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java index 86ee6b0b2d510adce50800293e50554cbb124d50..e0749a3fb384ab5a4e2ae36ef60ed7cfb5a2ccfe 100644 --- a/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java +++ b/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java b/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java index 240329a58c5bd60aa0c5a97ecc1c06c6232e1d36..762988e90f7b77053ff2fddc8b5f34b90240b19a 100644 --- a/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java +++ b/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java b/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java index 375dea244be72ede9921bd5e1ba267af70842dfe..033be59054fa82b9937512b74bc7521024709ebc 100644 --- a/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java b/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java index 61e56ac2556292b9f7b7137f90f1622caf60affa..ecd6be125b4c7e47982ecc74dff83e98556ac20f 100644 --- a/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java +++ b/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java b/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java index 30d417d9e36c261cd4d05951a3584e3b17161767..71ef432bf69210bca016b30ba5a5689542509f78 100644 --- a/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java +++ b/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/BrailleService.java b/Android/Application/src/org/a11y/brltty/android/BrailleService.java index 5b848ae5ddd34cd6810a5960bd3e5e60d8641989..9f5380c6e59faaef932a22bbf8ec8f1a30d73a5e 100644 --- a/Android/Application/src/org/a11y/brltty/android/BrailleService.java +++ b/Android/Application/src/org/a11y/brltty/android/BrailleService.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/CoreThread.java b/Android/Application/src/org/a11y/brltty/android/CoreThread.java index 4c0c2362ac2869238ebc4650d308e62637b304a4..2460db7cb75021cd5c385b7d74555cebba303405 100644 --- a/Android/Application/src/org/a11y/brltty/android/CoreThread.java +++ b/Android/Application/src/org/a11y/brltty/android/CoreThread.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java b/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java index a847ab42210b6b4a292dae0bf3cf7844cedbbe6c..921eb5c00dd8182d03dd1bed2779d6b5aa33560e 100644 --- a/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java +++ b/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/InputService.java b/Android/Application/src/org/a11y/brltty/android/InputService.java index cd23c6eeb8e34f979a2664006b14d8e0e622a263..e8533058e9ec1c5f06935a2553611d063fcfd283 100644 --- a/Android/Application/src/org/a11y/brltty/android/InputService.java +++ b/Android/Application/src/org/a11y/brltty/android/InputService.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java b/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java index d979830c23bd80810147721df283587611a90f76..bc9dd50c675f89fad9ad319c033424ca9350057e 100644 --- a/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java b/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java index a3b03c0c22219f60a95bbe812bd6632d40b3facd..f4280a7ecb04ae7ac10a25f2a6dde406b43fc872 100644 --- a/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java +++ b/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/LockUtilities.java b/Android/Application/src/org/a11y/brltty/android/LockUtilities.java index 0cddced87351377430d50e227dc5f5a1e3155924..fc5b539e716235837b8d6c273144876cc45edee5 100644 --- a/Android/Application/src/org/a11y/brltty/android/LockUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/LockUtilities.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/PcmDevice.java b/Android/Application/src/org/a11y/brltty/android/PcmDevice.java index 2252a81be409bffa55cb94c539ef94167d52bc42..b482de573c0976256cd9b91a1f9a26f75457f744 100644 --- a/Android/Application/src/org/a11y/brltty/android/PcmDevice.java +++ b/Android/Application/src/org/a11y/brltty/android/PcmDevice.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java b/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java index e0a821d73cf1689c3922203478ba6b375a948256..63f1c9b89d9382b5d51a4e89c9538aedfefef7da 100644 --- a/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java +++ b/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java b/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java index b42ace52e05f211e2d2ed4f107ffc2f4547d0900..f1a029b8644d02aed610c3a6dea7f7e2a5f24f43 100644 --- a/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java +++ b/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java b/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java index 9735a532926d3735f789bb7630adfa00ec590a6f..f6de275855cd453f1dacad71d41b8bbcd009d1c8 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenElement.java b/Android/Application/src/org/a11y/brltty/android/ScreenElement.java index 8125c377b9b88399677307357e2f0400585072fe..8aea7f2db7e0d2c0facab3b5328d44a608dd9efd 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenElement.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenElement.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java b/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java index cf78894d8b524835b524fe0e6ced252e05a6d45e..20f7e7695ad4b6942c299927c22a42216ccd7af1 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java b/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java index b107daefc716c7b28b2d9a133ea77380cb124b44..e3cd8b7ab9f6a351f15808cf34938cb282136cc0 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java b/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java index 3d0af68945fd825795424488335478b2eaeb0dda..7cf4cf0581dcccff2dc91ccc5f7205c08302e37f 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java b/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java index 9b5afcb03a9ba827a09364ffc03ed9a4ec998c28..20f9ab1ca208dbbe0eccb84cd9b4638051ea2392 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java b/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java index 83fb0f5b25895e9a3469a6b30648b3be15aac4cc..f42374ae7515d68725ecd79f51161397c642f6c8 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java b/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java index 410f51cc929da6f3fa2ce913c36e7cc862c085c3..68add95a6fe83e8094e7cc95390185e008a07cf1 100644 --- a/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java +++ b/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java b/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java index 879c523d043959eb83eacff889da8fb43245057e..ed553dbb71f24462b937a698c2e1de34c78b8adf 100644 --- a/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java +++ b/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/SingletonReference.java b/Android/Application/src/org/a11y/brltty/android/SingletonReference.java index 574d4ab2889ffbe8df496a62eca572dba25fa7a4..fcf008b2aa7c144d75ddaea0b3732dc11a9e2d09 100644 --- a/Android/Application/src/org/a11y/brltty/android/SingletonReference.java +++ b/Android/Application/src/org/a11y/brltty/android/SingletonReference.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java b/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java index d9d3e0ad2e85c486943cdf7e7a89801fa9d79b9d..120a9d45b4e0bf3bae9b6eedd07e4bcb9ca9be1f 100644 --- a/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java +++ b/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/StringMaker.java b/Android/Application/src/org/a11y/brltty/android/StringMaker.java index 2e3d47caa67d57bb4c8bcbe937068d3cde159fca..9a2075a037b93dbb6449e5a8697a97c9621a38b2 100644 --- a/Android/Application/src/org/a11y/brltty/android/StringMaker.java +++ b/Android/Application/src/org/a11y/brltty/android/StringMaker.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java b/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java index 08a2952247ccb65404414866769d937f10868e93..8fba9d43ebeaa2317eb3f8c5bf97ec0f609a8b1b 100644 --- a/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java +++ b/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/UsbHelper.java b/Android/Application/src/org/a11y/brltty/android/UsbHelper.java index f8fb9f6cac9e30d4ed68ed20ab2e47bf6ca73ae1..368f77ec9b46afaffa6450c3263730a0c662afb0 100644 --- a/Android/Application/src/org/a11y/brltty/android/UsbHelper.java +++ b/Android/Application/src/org/a11y/brltty/android/UsbHelper.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java b/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java index a8d3a703503439045c3071ad94ab75ca31d516aa..f93767c5b77f8657d06cf46c98956ba1300cc878 100644 --- a/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java +++ b/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Core/Makefile b/Android/Core/Makefile index e92614b49fde70eecdcdbde2021525a99b05b4f8..9c6848b2f2eaa221bf4fe46424a1cf738aed4f57 100644 --- a/Android/Core/Makefile +++ b/Android/Core/Makefile @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java b/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java index 4b628ea741d6441d04ad5ebb0f5ab35c1a846705..4316139134d59fcc5ddcb35411df90592ac86bc6 100644 --- a/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java +++ b/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java b/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java index 6b0c6c167fe72be0d811463eb98be3bb9f19a1b3..0e9fe6eed9fd7bdd9d781572595926a845c36722 100644 --- a/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java +++ b/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Core/src/org/a11y/brltty/core/LogLevel.java b/Android/Core/src/org/a11y/brltty/core/LogLevel.java index 823761a9e3ccbd5f97a84b0aa03d7a1bec3bdae1..9f7b774462db53d0273b195b59f9a1f3b3c21cf7 100644 --- a/Android/Core/src/org/a11y/brltty/core/LogLevel.java +++ b/Android/Core/src/org/a11y/brltty/core/LogLevel.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java b/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java index 0c1a5648726878f0f4e9d1417a524f52042f9725..efd24b8d0c7081f1a0b45704798b279706788cc3 100644 --- a/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java +++ b/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Android/TRANSLATORS b/Android/TRANSLATORS index 9b65f219d54ae2a9244ad7f86f63afbde73c533d..0c008848048ec8b4de3af18bd0b268400463723b 100644 --- a/Android/TRANSLATORS +++ b/Android/TRANSLATORS @@ -1,4 +1,5 @@ cs Petr Řehák +da Ole Guldberg de Dietmar Segbert de Mario Lang en Dave Mielke diff --git a/Autostart/AppStream/Makefile.in b/Autostart/AppStream/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..d370d9b9ca01ac9b6152e99bb778b37aa0d04d19 --- /dev/null +++ b/Autostart/AppStream/Makefile.in @@ -0,0 +1,30 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +METAINFO_DIRECTORY = $(INSTALL_ROOT)$(datadir)/metainfo +METAINFO_FILE = org.a11y.brltty.metainfo.xml + +install-metainfo-directory: + $(INSTALL_DIRECTORY) $(METAINFO_DIRECTORY) + +install: install-metainfo-directory + $(INSTALL_DATA) $(SRC_TOP)Autostart/AppStream/$(METAINFO_FILE) $(METAINFO_DIRECTORY) + +uninstall: + -rm -f $(METAINFO_DIRECTORY)/$(METAINFO_FILE) + diff --git a/Autostart/AppStream/org.a11y.brltty.metainfo.xml b/Autostart/AppStream/org.a11y.brltty.metainfo.xml index bd8fcc8e8ae86473d31b35ef5a279be9637a119f..a5408881cdbce0c8db382dda4d6d6cdb046a6b49 100644 --- a/Autostart/AppStream/org.a11y.brltty.metainfo.xml +++ b/Autostart/AppStream/org.a11y.brltty.metainfo.xml @@ -1,7 +1,7 @@ usb:v045Ep930B* + + + usb:v0483pA1D3* + usb:v06B0p0001* @@ -180,6 +184,7 @@ usb:v0904p3000* + usb:v0904p3001* @@ -302,6 +307,10 @@ usb:v1148p0301* + + + usb:v1209pABC0* + usb:v1C71pC004* @@ -311,7 +320,7 @@ usb:v1C71pC005* - + usb:v1C71pC006* diff --git a/Autostart/AppStream/reldeps.mk b/Autostart/AppStream/reldeps.mk new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/Autostart/Hotplug/brltty b/Autostart/Hotplug/brltty index 4cf5731a546edbde5a69d34b46d93d574794424f..59e20c865b4ae6e176933c270857b0333667e5b9 100755 --- a/Autostart/Hotplug/brltty +++ b/Autostart/Hotplug/brltty @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Autostart/Hotplug/brltty.usermap b/Autostart/Hotplug/brltty.usermap index 7273521e8f913eedcfff13343dfb8105a4e9b31d..ad938810e6077bee683bd775b3d6f924ca4421e3 100644 --- a/Autostart/Hotplug/brltty.usermap +++ b/Autostart/Hotplug/brltty.usermap @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -87,6 +87,10 @@ brltty 0x0003 0x045e 0x930a # HIMS [Braille Edge] brltty 0x0003 0x045e 0x930b +# Device: 0483:A1D3 +# Baum [Orbit 20 (20 cells)] +brltty 0x0003 0x0483 0xa1d3 + # Device: 06B0:0001 # Alva [Satellite (5nn)] brltty 0x0003 0x06b0 0x0001 @@ -160,6 +164,7 @@ brltty 0x0003 0x0904 0x2016 brltty 0x0003 0x0904 0x3000 # Device: 0904:3001 +# Baum [Orbit in Refreshabraille Emulation Mode (18 cells)] # Baum [Refreshabraille 18 (18 cells)] brltty 0x0003 0x0904 0x3001 @@ -282,6 +287,10 @@ brltty 0x0003 0x10c4 0xea80 # BrailleMemo [Smart] brltty 0x0003 0x1148 0x0301 +# Device: 1209:ABC0 +# Inceptor [all models] +brltty 0x0003 0x1209 0xabc0 + # Device: 1C71:C004 # BrailleNote [HumanWare APEX] brltty 0x0003 0x1c71 0xc004 @@ -291,7 +300,7 @@ brltty 0x0003 0x1c71 0xc004 brltty 0x0003 0x1c71 0xc005 # Device: 1C71:C006 -# HumanWare [all models (HID protocol)] +# HumanWare [non-Touch models (HID protocol)] brltty 0x0003 0x1c71 0xc006 # Device: 1C71:C00A diff --git a/Autostart/Systemd/Makefile.in b/Autostart/Systemd/Makefile.in index 0e44f687146691115f5fdbf5e453bcbb78682271..b940470b802dde5382594130d32d9d4ee317b91a 100644 --- a/Autostart/Systemd/Makefile.in +++ b/Autostart/Systemd/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -25,7 +25,7 @@ install-units-directory: $(INSTALL_DIRECTORY) $(SYSTEMD_UNITS_DIRECTORY) install-units: install-units-directory - for extension in service target; do \ + for extension in service path; do \ $(INSTALL_DATA) $(SRC_DIR)/*.$$extension $(SYSTEMD_UNITS_DIRECTORY); \ done @@ -40,3 +40,6 @@ uninstall: -rm -f $(SYSTEMD_UNITS_DIRECTORY)/$(PACKAGE_TARNAME)@.* -rm -f $(SYSTEMD_SCRIPTS_DIRECTORY)/$(PACKAGE_TARNAME)-systemd-* +reload: + systemctl daemon-reload + diff --git a/Autostart/Systemd/brltty-systemd-wrapper b/Autostart/Systemd/brltty-systemd-wrapper index dcaa70d6f81c52350c49e938ce69d54f44b9730e..a81ce250c0801e8bef4ec5f9f42138d90ddaf62b 100755 --- a/Autostart/Systemd/brltty-systemd-wrapper +++ b/Autostart/Systemd/brltty-systemd-wrapper @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -23,22 +23,31 @@ readonly programName="${0##*/}" programMessage() { local message="${1}" + local level="${2}" + logger -p "daemon.${level:-info}" -t "${programName}" -- "${1}" && + [ ! -t 2 ] || echo >&2 "${programName}: ${message}" } +errorMessage() { + local message="${1}" + local code="${2}" + + programMessage "${message}" err + exit "${code:-1}" +} + syntaxError() { local message="${1}" - programMessage "${message}" - exit 2 + errorMessage "${message}" 2 } semanticError() { local message="${1}" - programMessage "${message}" - exit 3 + errorMessage "${message}" 3 } readonly currentInstance="${BRLTTY_SYSTEMD_INSTANCE:-${defaultInstance}}" @@ -75,6 +84,6 @@ else fi set -- "${BRLTTY_EXECUTABLE_PATH:-brltty}" -E ${BRLTTY_EXECUTABLE_ARGUMENTS} "${@}" -programMessage "starting executable: ${*}" +programMessage "starting executable: ${*}" info exec "${@}" exit "${?}" diff --git a/Autostart/Systemd/brltty.target b/Autostart/Systemd/brltty.path similarity index 65% rename from Autostart/Systemd/brltty.target rename to Autostart/Systemd/brltty.path index fe37839b9902133da659dfcb28af8e8766d7843b..c8a9fc677cfc8d9bb22af32d8c65177e2950f7b8 100644 --- a/Autostart/Systemd/brltty.target +++ b/Autostart/Systemd/brltty.path @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -20,6 +20,10 @@ Description=Default BRLTTY Instance Requires=brltty@-etc-brltty.conf.service +[Path] +PathExists=/etc/brltty.conf +Unit=brltty@-etc-brltty.conf.service + [Install] WantedBy=sysinit.target diff --git a/Autostart/Systemd/brltty@.target b/Autostart/Systemd/brltty@.path similarity index 66% rename from Autostart/Systemd/brltty@.target rename to Autostart/Systemd/brltty@.path index 5f46f18350fba6183414966de2155985f8c239f7..820bc56444368bdab3f3cf2b84d178e7be77a129 100644 --- a/Autostart/Systemd/brltty@.target +++ b/Autostart/Systemd/brltty@.path @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -20,6 +20,10 @@ Description=BRLTTY (using configuration file /etc/brltty_%I.conf) Requires=brltty@-etc-brltty_%i.conf.service +[Path] +PathExists=/etc/brltty_%I.conf +Unit=brltty@-etc-brltty_%i.conf.service + [Install] WantedBy=sysinit.target diff --git a/Autostart/Systemd/brltty@.service.in b/Autostart/Systemd/brltty@.service.in index 3838c864cc72c402e48cb23ce466642a3a9292f2..062cfec83da6ef1a6181caf40232439207d981ce 100644 --- a/Autostart/Systemd/brltty@.service.in +++ b/Autostart/Systemd/brltty@.service.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Autostart/Udev/Makefile.in b/Autostart/Udev/Makefile.in index ee34cb7354adb2f89ba533b6981609d35146dcdc..b47e60da24494aafe40984befebefcbe72a2992e 100644 --- a/Autostart/Udev/Makefile.in +++ b/Autostart/Udev/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -47,3 +47,6 @@ uninstall: -rm -f $(UDEV_RULES_DIRECTORY)/?*-$(PACKAGE_TARNAME).$(UDEV_RULES_EXTENSION) -rm -f $(UDEV_LIBRARY_DIRECTORY)/$(PACKAGE_TARNAME)-* +reload: + udevadm control --reload + diff --git a/Autostart/Udev/brltty-wrapper b/Autostart/Udev/brltty-wrapper index 9ae45a2e6eeacfce438abafed30a3f4266b39b1f..8711a449af4df8c5861226e50be093fd90cf8b73 100755 --- a/Autostart/Udev/brltty-wrapper +++ b/Autostart/Udev/brltty-wrapper @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Autostart/Udev/rules b/Autostart/Udev/rules index 4df9d7e6fec519d3d76561abf2c8570e63bf543a..af6146cace994a0bab459f6920b64d0393662f76 100644 --- a/Autostart/Udev/rules +++ b/Autostart/Udev/rules @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -94,6 +94,10 @@ ENV{PRODUCT}=="45e/930a/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_ru # HIMS [Braille Edge] ENV{PRODUCT}=="45e/930b/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run" +# Device: 0483:A1D3 +# Baum [Orbit 20 (20 cells)] +ENV{PRODUCT}=="483/a1d3/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + # Device: 06B0:0001 # Alva [Satellite (5nn)] ENV{PRODUCT}=="6b0/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" @@ -167,6 +171,7 @@ ENV{PRODUCT}=="904/2016/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_ru ENV{PRODUCT}=="904/3000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" # Device: 0904:3001 +# Baum [Orbit in Refreshabraille Emulation Mode (18 cells)] # Baum [Refreshabraille 18 (18 cells)] ENV{PRODUCT}=="904/3001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" @@ -289,6 +294,10 @@ ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_r # BrailleMemo [Smart] ENV{PRODUCT}=="1148/301/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm", GOTO="brltty_usb_run" +# Device: 1209:ABC0 +# Inceptor [all models] +ENV{PRODUCT}=="1209/abc0/*", ENV{BRLTTY_BRAILLE_DRIVER}="ic", GOTO="brltty_usb_run" + # Device: 1C71:C004 # BrailleNote [HumanWare APEX] ENV{PRODUCT}=="1c71/c004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bn", GOTO="brltty_usb_run" @@ -298,7 +307,7 @@ ENV{PRODUCT}=="1c71/c004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bn", GOTO="brltty_usb_r ENV{PRODUCT}=="1c71/c005/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" # Device: 1C71:C006 -# HumanWare [all models (HID protocol)] +# HumanWare [non-Touch models (HID protocol)] ENV{PRODUCT}=="1c71/c006/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" # Device: 1C71:C00A diff --git a/Autostart/Windows/brltty-libusb-1.0.inf b/Autostart/Windows/brltty-libusb-1.0.inf index d2ed6d44cfb13eaf2cb2215df27b0a5029fca121..7a29a0275787df9eb3ca869ef136ce8c37bf2d1d 100644 --- a/Autostart/Windows/brltty-libusb-1.0.inf +++ b/Autostart/Windows/brltty-libusb-1.0.inf @@ -90,6 +90,9 @@ HKR,,Icon,,-20 ; Device: 045E:930B "LibUSB-1.0: HIMS [Braille Edge]"=LIBUSB_DEV, USB\VID_045E&PID_930B +; Device: 0483:A1D3 +"LibUSB-1.0: Baum [Orbit 20 (20 cells)]"=LIBUSB_DEV, USB\VID_0483&PID_A1D3 + ; Device: 06B0:0001 "LibUSB-1.0: Alva [Satellite (5nn)]"=LIBUSB_DEV, USB\VID_06B0&PID_0001 @@ -145,7 +148,7 @@ HKR,,Icon,,-20 "LibUSB-1.0: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3000 ; Device: 0904:3001 -"LibUSB-1.0: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 +"LibUSB-1.0: Baum [Orbit in Refreshabraille Emulation Mode (18 cells)], Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 ; Device: 0904:4004 "LibUSB-1.0: Baum [Pronto! V3 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_4004 @@ -237,6 +240,9 @@ HKR,,Icon,,-20 ; Device: 1148:0301 "LibUSB-1.0: BrailleMemo [Smart]"=LIBUSB_DEV, USB\VID_1148&PID_0301 +; Device: 1209:ABC0 +"LibUSB-1.0: Inceptor [all models]"=LIBUSB_DEV, USB\VID_1209&PID_ABC0 + ; Device: 1C71:C004 "LibUSB-1.0: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 @@ -244,7 +250,7 @@ HKR,,Icon,,-20 "LibUSB-1.0: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 ; Device: 1C71:C006 -"LibUSB-1.0: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +"LibUSB-1.0: HumanWare [non-Touch models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1C71:C00A "LibUSB-1.0: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A @@ -401,6 +407,9 @@ HKR,,Icon,,-20 ; Device: 045E:930B "LibUSB-1.0: HIMS [Braille Edge]"=LIBUSB_DEV, USB\VID_045E&PID_930B +; Device: 0483:A1D3 +"LibUSB-1.0: Baum [Orbit 20 (20 cells)]"=LIBUSB_DEV, USB\VID_0483&PID_A1D3 + ; Device: 06B0:0001 "LibUSB-1.0: Alva [Satellite (5nn)]"=LIBUSB_DEV, USB\VID_06B0&PID_0001 @@ -456,7 +465,7 @@ HKR,,Icon,,-20 "LibUSB-1.0: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3000 ; Device: 0904:3001 -"LibUSB-1.0: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 +"LibUSB-1.0: Baum [Orbit in Refreshabraille Emulation Mode (18 cells)], Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 ; Device: 0904:4004 "LibUSB-1.0: Baum [Pronto! V3 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_4004 @@ -548,6 +557,9 @@ HKR,,Icon,,-20 ; Device: 1148:0301 "LibUSB-1.0: BrailleMemo [Smart]"=LIBUSB_DEV, USB\VID_1148&PID_0301 +; Device: 1209:ABC0 +"LibUSB-1.0: Inceptor [all models]"=LIBUSB_DEV, USB\VID_1209&PID_ABC0 + ; Device: 1C71:C004 "LibUSB-1.0: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 @@ -555,7 +567,7 @@ HKR,,Icon,,-20 "LibUSB-1.0: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 ; Device: 1C71:C006 -"LibUSB-1.0: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +"LibUSB-1.0: HumanWare [non-Touch models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1C71:C00A "LibUSB-1.0: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A diff --git a/Autostart/Windows/brltty-libusb.inf b/Autostart/Windows/brltty-libusb.inf index c42a4d4bea57c124b9e84330520e885631be4a8c..d75128e26f685bc7fe4d2170dc3b253d5b988c89 100644 --- a/Autostart/Windows/brltty-libusb.inf +++ b/Autostart/Windows/brltty-libusb.inf @@ -177,6 +177,9 @@ ServiceBinary = %12%\libusb0_x64.sys ; Device: 045E:930B "LibUSB-Win32: HIMS [Braille Edge]"=LIBUSB_DEV, USB\VID_045E&PID_930B +; Device: 0483:A1D3 +"LibUSB-Win32: Baum [Orbit 20 (20 cells)]"=LIBUSB_DEV, USB\VID_0483&PID_A1D3 + ; Device: 06B0:0001 "LibUSB-Win32: Alva [Satellite (5nn)]"=LIBUSB_DEV, USB\VID_06B0&PID_0001 @@ -232,7 +235,7 @@ ServiceBinary = %12%\libusb0_x64.sys "LibUSB-Win32: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3000 ; Device: 0904:3001 -"LibUSB-Win32: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 +"LibUSB-Win32: Baum [Orbit in Refreshabraille Emulation Mode (18 cells)], Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 ; Device: 0904:4004 "LibUSB-Win32: Baum [Pronto! V3 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_4004 @@ -324,6 +327,9 @@ ServiceBinary = %12%\libusb0_x64.sys ; Device: 1148:0301 "LibUSB-Win32: BrailleMemo [Smart]"=LIBUSB_DEV, USB\VID_1148&PID_0301 +; Device: 1209:ABC0 +"LibUSB-Win32: Inceptor [all models]"=LIBUSB_DEV, USB\VID_1209&PID_ABC0 + ; Device: 1C71:C004 "LibUSB-Win32: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 @@ -331,7 +337,7 @@ ServiceBinary = %12%\libusb0_x64.sys "LibUSB-Win32: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 ; Device: 1C71:C006 -"LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +"LibUSB-Win32: HumanWare [non-Touch models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1C71:C00A "LibUSB-Win32: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A @@ -488,6 +494,9 @@ ServiceBinary = %12%\libusb0_x64.sys ; Device: 045E:930B "LibUSB-Win32: HIMS [Braille Edge]"=LIBUSB_DEV, USB\VID_045E&PID_930B +; Device: 0483:A1D3 +"LibUSB-Win32: Baum [Orbit 20 (20 cells)]"=LIBUSB_DEV, USB\VID_0483&PID_A1D3 + ; Device: 06B0:0001 "LibUSB-Win32: Alva [Satellite (5nn)]"=LIBUSB_DEV, USB\VID_06B0&PID_0001 @@ -543,7 +552,7 @@ ServiceBinary = %12%\libusb0_x64.sys "LibUSB-Win32: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3000 ; Device: 0904:3001 -"LibUSB-Win32: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 +"LibUSB-Win32: Baum [Orbit in Refreshabraille Emulation Mode (18 cells)], Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 ; Device: 0904:4004 "LibUSB-Win32: Baum [Pronto! V3 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_4004 @@ -635,6 +644,9 @@ ServiceBinary = %12%\libusb0_x64.sys ; Device: 1148:0301 "LibUSB-Win32: BrailleMemo [Smart]"=LIBUSB_DEV, USB\VID_1148&PID_0301 +; Device: 1209:ABC0 +"LibUSB-Win32: Inceptor [all models]"=LIBUSB_DEV, USB\VID_1209&PID_ABC0 + ; Device: 1C71:C004 "LibUSB-Win32: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 @@ -642,7 +654,7 @@ ServiceBinary = %12%\libusb0_x64.sys "LibUSB-Win32: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 ; Device: 1C71:C006 -"LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +"LibUSB-Win32: HumanWare [non-Touch models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1C71:C00A "LibUSB-Win32: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A @@ -799,6 +811,9 @@ ServiceBinary = %12%\libusb0_x64.sys ; Device: 045E:930B "LibUSB-Win32: HIMS [Braille Edge]"=LIBUSB_DEV, USB\VID_045E&PID_930B +; Device: 0483:A1D3 +"LibUSB-Win32: Baum [Orbit 20 (20 cells)]"=LIBUSB_DEV, USB\VID_0483&PID_A1D3 + ; Device: 06B0:0001 "LibUSB-Win32: Alva [Satellite (5nn)]"=LIBUSB_DEV, USB\VID_06B0&PID_0001 @@ -854,7 +869,7 @@ ServiceBinary = %12%\libusb0_x64.sys "LibUSB-Win32: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3000 ; Device: 0904:3001 -"LibUSB-Win32: Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 +"LibUSB-Win32: Baum [Orbit in Refreshabraille Emulation Mode (18 cells)], Baum [Refreshabraille 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_3001 ; Device: 0904:4004 "LibUSB-Win32: Baum [Pronto! V3 18 (18 cells)]"=LIBUSB_DEV, USB\VID_0904&PID_4004 @@ -946,6 +961,9 @@ ServiceBinary = %12%\libusb0_x64.sys ; Device: 1148:0301 "LibUSB-Win32: BrailleMemo [Smart]"=LIBUSB_DEV, USB\VID_1148&PID_0301 +; Device: 1209:ABC0 +"LibUSB-Win32: Inceptor [all models]"=LIBUSB_DEV, USB\VID_1209&PID_ABC0 + ; Device: 1C71:C004 "LibUSB-Win32: BrailleNote [HumanWare APEX]"=LIBUSB_DEV, USB\VID_1C71&PID_C004 @@ -953,7 +971,7 @@ ServiceBinary = %12%\libusb0_x64.sys "LibUSB-Win32: HumanWare [all models (serial protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C005 ; Device: 1C71:C006 -"LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +"LibUSB-Win32: HumanWare [non-Touch models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 ; Device: 1C71:C00A "LibUSB-Win32: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A diff --git a/Bindings/Java/Brlapi.java b/Bindings/Java/Brlapi.java index 8d300695771ef03eb144cb9f75ac33f9846c7236..8a18af3cf30c598ef7586a829356afacc558a179 100644 --- a/Bindings/Java/Brlapi.java +++ b/Bindings/Java/Brlapi.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/ConnectionSettings.java b/Bindings/Java/ConnectionSettings.java index b23cb8142c30749e6375cfdcdc3e9aeeb79d925b..7bec5d52446e4fa456e8974d5506852344f89daa 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-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/DisplaySize.java b/Bindings/Java/DisplaySize.java index 9c8d289d8577d492fae53fe2f9f9f4f8555dac42..068d4f80ae60597228e7367e7471e748a3e94b79 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-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Error.java b/Bindings/Java/Error.java index 502787c2169f2f3ea0286e9eb66c6865c026b946..9b903c7db3ad1cca34134ccfc62b485155bdc1ca 100644 --- a/Bindings/Java/Error.java +++ b/Bindings/Java/Error.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Exception.java b/Bindings/Java/Exception.java index 1386aec985a729334046f104f3b31d3c7d429429..6bc8386c07771771c8492342e0faf7ddacf45b14 100644 --- a/Bindings/Java/Exception.java +++ b/Bindings/Java/Exception.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Key.java b/Bindings/Java/Key.java index 59bcc6e2ba0d879cca1feb840b24c64eef70c65c..f20f8ab4a5b2a87cb320eef0bf2dbacf7e355c3b 100644 --- a/Bindings/Java/Key.java +++ b/Bindings/Java/Key.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/Makefile.in b/Bindings/Java/Makefile.in index 3a1d65febded844cc045f5b0c9fefd8e1548245e..b0a6e1c2832f597e366076001909a337fa13d563 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-2017 by +# Copyright (C) 2006-2018 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Java/Native.java b/Bindings/Java/Native.java index 45c5163f379cef6e36772793de62b57df2bf5da1..daabd41d7a21ff8084f41a3aab4b23bfbd748815 100644 --- a/Bindings/Java/Native.java +++ b/Bindings/Java/Native.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -33,6 +33,7 @@ public class Native { public native void closeConnection (); public native String getDriverName () throws Error; + public native DisplaySize getModelIdentifier () throws Error; public native DisplaySize getDisplaySize () throws Error; public native int enterTtyMode (int tty, String driver) throws Error; diff --git a/Bindings/Java/Test.java b/Bindings/Java/Test.java index e9ec57202cc8799e402fab4b157fc7d988213d9e..6549f5bbd3681607ec846c2a73b11eea319eb607 100644 --- a/Bindings/Java/Test.java +++ b/Bindings/Java/Test.java @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -55,6 +55,9 @@ public class Test implements Constants { System.out.print("Driver is " + brlapi.getDriverName()); System.out.println(); + System.out.print("Model is " + brlapi.getModelIdentifier()); + System.out.println(); + DisplaySize size = brlapi.getDisplaySize(); System.out.println("Display size is " + size.getWidth() + "x" + size.getHeight()); diff --git a/Bindings/Java/WriteArguments.java b/Bindings/Java/WriteArguments.java index 9a051c20307ae2337ee4fc7008b718c9188a8a3c..9f50de9c02ee5eac3e677e4e2ae799bea71f7b16 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-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * diff --git a/Bindings/Java/apitest b/Bindings/Java/apitest index e41ba3ebf3873aaaefcd33294460f5c5d1521ee9..977788a5ef28a3632cba165d15674c578b5b3bb4 100755 --- a/Bindings/Java/apitest +++ b/Bindings/Java/apitest @@ -1,8 +1,8 @@ -#!/bin/bash -p +#!/bin/sh ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2017 by +# Copyright (C) 2006-2018 by # Samuel Thibault # Sébastien Hinderer # @@ -18,10 +18,6 @@ # This software is maintained by Dave Mielke . ############################################################################### -currentDirectory="$(pwd)" - -export LD_LIBRARY_PATH="${currentDirectory}" -export LD_PRELOAD="${currentDirectory}/../../Programs/libbrlapi.so" - -exec java -classpath "${currentDirectory}/classes" org.a11y.BrlAPI.Test "${@}" +. "${0%/*}/../../apitest.sh" +exec java -classpath "${programDirectory}/classes" org.a11y.BrlAPI.Test "${@}" exit "${?}" diff --git a/Bindings/Java/bindings.c b/Bindings/Java/bindings.c index c24d6ff263f5123830e99ab3d54c2dff1bd8b1c1..5311f06475c458f40b3ba5382ca434eea507cd1d 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-2017 by + * Copyright (C) 2006-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -251,6 +251,21 @@ JNIEXPORT jstring JNICALL Java_org_a11y_BrlAPI_Native_getDriverName(JNIEnv *jenv return (*jenv)->NewStringUTF(jenv, name); } +JNIEXPORT jstring JNICALL Java_org_a11y_BrlAPI_Native_getModelIdentifier(JNIEnv *jenv, jobject jobj) { + char identifier[32]; + GET_HANDLE(jenv, jobj, NULL); + + env = jenv; + + if (brlapi__getModelIdentifier(handle, identifier, sizeof(identifier)) < 0) { + ThrowError(jenv, __func__); + return NULL; + } + + identifier[sizeof(identifier)-1] = 0; + return (*jenv)->NewStringUTF(jenv, identifier); +} + JNIEXPORT jobject JNICALL Java_org_a11y_BrlAPI_Native_getDisplaySize(JNIEnv *jenv, jobject jobj) { unsigned int x, y; jclass jcsize; diff --git a/Bindings/Java/bindings.m4 b/Bindings/Java/bindings.m4 index eac8c686a207023d9ff47bb3eeaae24498971681..71b499f0fee159fe2b0942f3fe8869e1f22a9595 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-2017 by +# Copyright (C) 2006-2018 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Java/constants.awk b/Bindings/Java/constants.awk index c558a6b8e09e645b94eb87151de9d3de37daaccc..cecaffcfdb1fc4d358c7ff1acb06496b96e6190e 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-2017 by +# Copyright (C) 2006-2018 by # Samuel Thibault # Sébastien Hinderer # diff --git a/Bindings/Lisp/Makefile.in b/Bindings/Lisp/Makefile.in index 6788f8f67f1f6d16bcd599f12c33fcb427898169..55327b53663bc6d4257d69648908efa1e50a3a96 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-2017 by Mario Lang +# Copyright (C) 2006-2018 by Mario Lang # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Lisp/apisetup.lisp b/Bindings/Lisp/apisetup.lisp new file mode 100644 index 0000000000000000000000000000000000000000..5b1074b84743daa9fe738043289620a28670e4b5 --- /dev/null +++ b/Bindings/Lisp/apisetup.lisp @@ -0,0 +1,28 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; libbrlapi - A library providing access to braille terminals for applications. +; +; Copyright (C) 2006-2018 by Mario Lang +; +; libbrlapi 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.com/ +; +; This software is maintained by Dave Mielke . +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(require 'asdf) +(require 'sb-posix) + +(defun current-directory () + "The current working directory as a directory path." + (concatenate 'string (sb-posix:getcwd) "/") +) + +(pushnew (current-directory) asdf:*central-registry* :test #'equal) +(asdf:operate 'asdf:load-op 'brlapi) + diff --git a/Bindings/Lisp/apitest b/Bindings/Lisp/apitest new file mode 100755 index 0000000000000000000000000000000000000000..34505028227f532f88399af64e95549fc24978cd --- /dev/null +++ b/Bindings/Lisp/apitest @@ -0,0 +1,21 @@ +#!/bin/sh +############################################################################### +# libbrlapi - A library providing access to braille terminals for applications. +# +# Copyright (C) 2006-2018 by Dave Mielke +# +# libbrlapi 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +. "${0%/*}/../../apitest.sh" +exec sbcl --script "${programDirectory}/apitest.lisp" "${@}" +exit "${?}" diff --git a/Bindings/Lisp/apitest.lisp b/Bindings/Lisp/apitest.lisp new file mode 100644 index 0000000000000000000000000000000000000000..643f506f4c009557fa256e86092d5ec58ce0cc70 --- /dev/null +++ b/Bindings/Lisp/apitest.lisp @@ -0,0 +1,75 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; libbrlapi - A library providing access to braille terminals for applications. +; +; Copyright (C) 2006-2018 by Mario Lang +; +; libbrlapi 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.com/ +; +; This software is maintained by Dave Mielke . +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(load "apisetup.lisp") + +(defun brlapi-test-tty (output session tty) + "Perform a test of BrlAPI's input functions." + + (brlapi:enter-tty-mode session tty) + (brlapi:write-text session "Press any key to continue...") + (apply #'format output "Key: type=~A command=~A argument=~D flags=~{~A~^,~}~%" + (brlapi:expand-key-code (brlapi:read-key session t))) + (brlapi:leave-tty-mode session) +) + +(defun brlapi-test (&key auth host tty) + "Perform a test of various BrlAPI functiins." + + (let ( + (output *standard-output*) + (session (brlapi:open-connection :auth auth :host host)) + ) + + (if (brlapi:is-connected session) + (progn + (format output "Session: ") + (brlapi:print-properties session output) + (format output "~%") + + (if tty (brlapi-test-tty output session (parse-integer tty))) + ) + (format output "connection failure~%") + ) + + (brlapi:close-connection session) + ) +) + +(defun program-arguments () + "The command-line arguments." + + sb-ext:*posix-argv* +) + +(defun string->keyword (string) + "Convert a string to a keyword." + + (values (intern string "KEYWORD")) +) + +(defun arguments->keyword-options (arguments) + "Convert a list of argument strings into a list of keyword options." + + (loop + for (option value) on arguments by #'cddr + append (list (string->keyword (string-upcase option)) value) + ) +) + +(apply #'brlapi-test (arguments->keyword-options (cdr (program-arguments)))) +(exit) diff --git a/Bindings/Lisp/bindings.m4 b/Bindings/Lisp/bindings.m4 index cbaf4cdb5c37b4cac4da530483c112b989a64090..96fc17766c53e14a202aec067a357265f6315c3e 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-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Lisp/brlapi.asd b/Bindings/Lisp/brlapi.asd index 98600c66a6e79698f645aef415e4e9ee0a266857..c958d20d488459f908888bc47f8fb4d817cb9e76 100644 --- a/Bindings/Lisp/brlapi.asd +++ b/Bindings/Lisp/brlapi.asd @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; libbrlapi - A library providing access to braille terminals for applications. ; -; Copyright (C) 2006-2017 by Mario Lang +; Copyright (C) 2006-2018 by Mario Lang ; ; libbrlapi comes with ABSOLUTELY NO WARRANTY. ; diff --git a/Bindings/Lisp/brlapi.lisp.in b/Bindings/Lisp/brlapi.lisp.in index 2915933e6e9f781db885f3c39da7984a77900adf..231bc1f2064d9b76c0af3d180187b232c2c9d693 100644 --- a/Bindings/Lisp/brlapi.lisp.in +++ b/Bindings/Lisp/brlapi.lisp.in @@ -2,7 +2,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; libbrlapi - A library providing access to braille terminals for applications. ; -; Copyright (C) 2006-2017 by Mario Lang +; Copyright (C) 2006-2018 by Mario Lang ; ; libbrlapi comes with ABSOLUTELY NO WARRANTY. ; @@ -23,11 +23,12 @@ (defpackage :brlapi (:use :common-lisp :cffi) - (:export #:open-connection #:close-connection - #:driver-name #:display-size + (:export #:open-connection #:close-connection #:is-connected + #:print-properties #:print-object + #:driver-name #:model-identifier #:display-size #:enter-tty-mode #:leave-tty-mode #:write-text #:write-dots #:write-region - #:read-key #:expand-key)) + #:read-key #:expand-key-code)) (in-package :brlapi) @@ -41,20 +42,45 @@ ;;;; * The DISPLAY class (defclass display () - ((handle :initarg :handle :reader display-handle) - (fd :initarg :fd :reader display-file-descriptor) - (auth :initarg :auth :reader display-auth) - (host :initarg :host :reader display-host) - (tty :initform nil :reader display-tty))) + ((handle :initarg :handle :reader connection-handle) + (fd :initarg :fd :reader file-descriptor) + (auth :initarg :auth :reader server-auth) + (host :initarg :host :reader server-host) + (tty :initform nil :reader entered-tty))) + +(defmethod is-connected ((obj display)) + (and + obj + (let + ((fd (file-descriptor obj))) + (and fd (numberp fd) (not (< fd 0))) + ) + ) +) + +(defmethod print-properties ((obj display) stream) + (multiple-value-bind (width height) (display-size obj) + (format stream + "fd=~D auth=~A host=~A driver=~A model=~A width=~D height=~D" + (file-descriptor obj) + (server-auth obj) + (server-host obj) + (driver-name obj) + (model-identifier obj) + width + height + ) + ) +) (defmethod print-object ((obj display) stream) (print-unreadable-object (obj stream :type t) - (if (not (display-file-descriptor obj)) - (format stream "disconnected") - (apply #'format stream "~Dx~D fd=~D, host=~A, driver=~A" - (concatenate 'list (multiple-value-list (display-size obj)) - (list (display-file-descriptor obj) (display-host obj) - (driver-name obj))))))) + (if (is-connected obj) + (print-properties obj stream) + (format stream "disconnected") + ) + ) +) ;;;; * Error handling @@ -87,7 +113,7 @@ (auth :string) (host :string)) -(defun open-connection (&optional auth host) +(defun open-connection (&key auth host) "Open a new connection to BRLTTY on HOST usng AUTH for authorization. Return a DISPLAY object which can further be used to interact with BRLTTY." (with-foreign-object (settings 'settings) @@ -110,9 +136,9 @@ Return a DISPLAY object which can further be used to interact with BRLTTY." display))) (defmethod close-connection ((obj display)) - (foreign-funcall "brlapi__closeConnection" :pointer (display-handle obj) :void) + (foreign-funcall "brlapi__closeConnection" :pointer (connection-handle obj) :void) (setf (slot-value obj 'fd) nil) - (foreign-free (display-handle obj)) + (foreign-free (connection-handle obj)) (setf (slot-value obj 'handle) nil)) ;;;; * Querying the display @@ -120,26 +146,31 @@ Return a DISPLAY object which can further be used to interact with BRLTTY." (defmethod driver-name ((obj display)) "Return the currently used driver name." (with-foreign-pointer-as-string ((str str-size) 64) - (foreign-funcall "brlapi__getDriverName" :pointer (display-handle obj) + (foreign-funcall "brlapi__getDriverName" :pointer (connection-handle obj) + :string str :int str-size brlapi-code))) + +(defmethod model-identifier ((obj display)) + "Return the currently used display model." + (with-foreign-pointer-as-string ((str str-size) 64) + (foreign-funcall "brlapi__getModelIdentifier" :pointer (connection-handle obj) :string str :int str-size brlapi-code))) (defmethod display-size ((obj display)) "Return the dimensions of DISPLAY as multiple values. The first value represents the x dimension and the second the y dimension." (with-foreign-objects ((x :int) (y :int)) - (foreign-funcall "brlapi__getDisplaySize" :pointer (display-handle obj) :pointer x :pointer y brlapi-code) + (foreign-funcall "brlapi__getDisplaySize" :pointer (connection-handle obj) :pointer x :pointer y brlapi-code) (values (mem-ref x :int) (mem-ref y :int)))) - ;;;; * TTY mode (defmethod enter-tty-mode ((obj display) tty &optional (driver "")) (declare (integer tty)) (declare (string driver)) - (setf (slot-value obj 'tty) (foreign-funcall "brlapi__enterTtyMode" :pointer (display-handle obj) :int tty :string driver brlapi-code))) + (setf (slot-value obj 'tty) (foreign-funcall "brlapi__enterTtyMode" :pointer (connection-handle obj) :int tty :string driver brlapi-code))) (defmethod leave-tty-mode ((obj display)) - (foreign-funcall "brlapi__leaveTtyMode" :pointer (display-handle obj) brlapi-code) + (foreign-funcall "brlapi__leaveTtyMode" :pointer (connection-handle obj) brlapi-code) (setf (slot-value obj 'tty) nil)) @@ -150,7 +181,7 @@ The first value represents the x dimension and the second the y dimension." (declare (string text)) (declare (integer cursor)) (if (eql (foreign-funcall "brlapi__writeText" - :pointer (display-handle obj) + :pointer (connection-handle obj) :int cursor :string text brlapi-code) 0) @@ -166,7 +197,7 @@ The first value represents the x dimension and the second the y dimension." (foreign-bitfield-value 'dots (nth i dots-list)))) (loop for i from (length dots-list) below (display-size obj) do (setf (mem-aref dots 'dots i) 0)) - (foreign-funcall "brlapi__writeDots" :pointer (display-handle obj) :pointer dots brlapi-code))) + (foreign-funcall "brlapi__writeDots" :pointer (connection-handle obj) :pointer dots brlapi-code))) (defcstruct write-struct (display-number :int) @@ -208,7 +239,7 @@ The first value represents the x dimension and the second the y dimension." (foreign-slot-value ws 'write-struct 'text) txt (foreign-slot-value ws 'write-struct 'attr-or) attro (foreign-slot-value ws 'write-struct 'attr-and) attra) - (eql (foreign-funcall "brlapi__write" :pointer (display-handle obj) :pointer ws brlapi-code) 0)))) + (eql (foreign-funcall "brlapi__write" :pointer (connection-handle obj) :pointer ws brlapi-code) 0)))) ;;;; * Input @@ -216,22 +247,51 @@ The first value represents the x dimension and the second the y dimension." (defctype key-code :uint64) (defmethod read-key ((obj display) &optional block) (with-foreign-object (key 'key-code) - (case (foreign-funcall "brlapi__readKey" :pointer (display-handle obj) :boolean block :pointer key brlapi-code) + (case (foreign-funcall "brlapi__readKey" :pointer (connection-handle obj) :boolean block :pointer key brlapi-code) (0 nil) (1 (mem-ref key 'key-code))))) -(defun expand-key (code) - (with-foreign-objects ((command :int) (arg :int) (flags :int)) - (foreign-funcall "brlapi_expandKeyCode" - key-code code - :pointer command :pointer arg :pointer flags - :int) - (values (intern (foreign-funcall "brlapi_getKeyName" - :int (mem-ref command :int) - :int (mem-ref arg :int) - :string)) - (mem-ref arg :int) - (mem-ref flags :int)))) +(defcstruct expanded-key-code + "A key code broken down into its individual fields." + (type :int) + (command :int) + (argument :int) + (flags :int) +) + +(defcstruct key-code-description + "The description of a key code." + (type-name :string) + (command-name :string) + (argument-value :int) + (flag-count :int) + (flag-names :string :count 32) + (field-values expanded-key-code) +) + +(defun expand-key-code (code) + "Return the individual fields of the key code as a list. +The list contains: + 0: type (a string) + 1: command (a string) + 2: argument (a non-negative integer) + 3: flags (a list of strings)" + + (with-foreign-object (description 'key-code-description) + (setf result (foreign-funcall "brlapi_describeKeyCode" + key-code code :pointer description :int)) + (with-foreign-slots + ((type-name command-name argument-value flag-count flag-names) description key-code-description) + + (list + type-name command-name argument-value + (loop + for index below flag-count + collect (mem-aref (foreign-slot-pointer description 'key-code-description 'flag-names) :string index)) + ) + ) + ) +) ;;;; * Example usage diff --git a/Bindings/OCaml/Makefile.in b/Bindings/OCaml/Makefile.in index 38d8f71d9d41e6df5722acf2687ecccd543626de..47f720110949dbddd54b964479f83746273fa08d 100644 --- a/Bindings/OCaml/Makefile.in +++ b/Bindings/OCaml/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Bindings/OCaml/brlapi_stubs.c b/Bindings/OCaml/brlapi_stubs.c index f0a4874cb7e05bf9132186b40926f45df53551d5..c7e6a4af22f3b87046512d6613716a3539dec6e9 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-2017 by + * Copyright (C) 2005-2018 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff --git a/Bindings/OCaml/constants.awk b/Bindings/OCaml/constants.awk index 0a41ba6c220b4c1bc424bf5b1cf3dca8ffce878c..949db31203c3eea6b5a858cbbe27c8b464e511a4 100644 --- a/Bindings/OCaml/constants.awk +++ b/Bindings/OCaml/constants.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Bindings/OCaml/main.ml b/Bindings/OCaml/main.ml index 66ed4eae50f484c247b51260cb8d03c04d2916b9..275f4ac4e584ca4904b7b2b0e98b5c5197584ed0 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-2017 by + * Copyright (C) 2002-2018 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff --git a/Bindings/OCaml/main.mli b/Bindings/OCaml/main.mli index 6dbb87f82d2b4b207b978a0bf220c27dcb6ee962..c345455b6a37eb7eaa3f65e4022e627bca926c5f 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-2017 by + * Copyright (C) 2002-2018 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff --git a/Bindings/Python/Makefile.in b/Bindings/Python/Makefile.in index 3bdebb33f592a0f6c70025c839c7548a79f75aad..b09d884f0639b8a7c1687b82f84dbd56e74b9295 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-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/apitest b/Bindings/Python/apitest new file mode 100755 index 0000000000000000000000000000000000000000..3b6b5974b87cfae49c9bee33ab4a7fce5876c6a4 --- /dev/null +++ b/Bindings/Python/apitest @@ -0,0 +1,21 @@ +#!/bin/bash +############################################################################### +# libbrlapi - A library providing access to braille terminals for applications. +# +# Copyright (C) 2006-2018 by Dave Mielke +# +# libbrlapi 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +. "${0%/*}/../../apitest.sh" +exec python "${programDirectory}/${programName}.py" "${@}" +exit "${?}" diff --git a/Bindings/Python/apitest.py b/Bindings/Python/apitest.py index 39bf50b2083c58f55c85252b083db8608f70b73d..1b94ef6611f6227fd85a1c871741d211a4747d1a 100755 --- a/Bindings/Python/apitest.py +++ b/Bindings/Python/apitest.py @@ -1,16 +1,15 @@ -#!/usr/bin/env python ############################################################################### # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -96,6 +95,7 @@ if __name__ == "__main__": try: writeProperty("Driver", brl.driverName) + writeProperty("Model", brl.modelIdentifier) writeProperty("Columns", str(brl.displaySize[0])) writeProperty("Rows", str(brl.displaySize[1])) diff --git a/Bindings/Python/bindings.c b/Bindings/Python/bindings.c index 8da055822ac927aaf3b6bf90809fe6129750a19c..9e28d647dc10f251e004b37f7b5290efe78c2993 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-2017 by + * Copyright (C) 2005-2018 by * Alexis Robert * Samuel Thibault * diff --git a/Bindings/Python/bindings.h b/Bindings/Python/bindings.h index a5a2f996836b689ad46bb4ca0c2c6355f70d43bf..cb02b7dd2345cb33ffe01ffc2aee045250d8ef0e 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-2017 by + * Copyright (C) 2005-2018 by * Alexis Robert * Samuel Thibault * diff --git a/Bindings/Python/bindings.m4 b/Bindings/Python/bindings.m4 index 58f02163ac0772062b19b2c20935fbc1960bd449..34db8bfe1f5a24ba95bdd84776a7676d17c065f1 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-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # @@ -20,6 +20,16 @@ AC_DEFUN([BRLTTY_PYTHON_BINDINGS], [dnl PYTHON_OK=true +# Suppress a new warning introduced in Python 3.6: +# +# Python runtime initialized with LC_CTYPE=C +# (a locale with default ASCII encoding), +# which may cause Unicode compatibility problems. +# Using C.UTF-8, C.utf8, or UTF-8 (if available) +# as alternative Unicode-compatible locales is recommended. +# +export PYTHONCOERCECLOCALE=0 + AC_PATH_PROG([PYTHON], [python]) if test -z "${PYTHON}" then diff --git a/Bindings/Python/brlapi.pyx b/Bindings/Python/brlapi.pyx index 7c67b3878f05bb6ed0de74a55bd7a207073f8be2..598fd10be60d1cc7269cfb1e38daa94f5ff46e11 100644 --- a/Bindings/Python/brlapi.pyx +++ b/Bindings/Python/brlapi.pyx @@ -58,7 +58,7 @@ except brlapi.ConnectionError as e: ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # @@ -350,6 +350,19 @@ cdef class Connection: else: return name + property modelIdentifier: + """Get the identifier for the model of the braille display + See brlapi_getModelIdentifier(3).""" + def __get__(self): + cdef char identifier[21] + cdef int retval + with nogil: + retval = c_brlapi.brlapi__getModelIdentifier(self.h, identifier, sizeof(identifier)) + if retval == -1: + raise OperationError() + else: + return identifier + def enterTtyMode(self, tty = TTY_DEFAULT, driver = None): """Ask for some tty, with some key mechanism diff --git a/Bindings/Python/c_brlapi.pxd b/Bindings/Python/c_brlapi.pxd index 3786ea07d7abc9f4dfdf0156558859a0da4b0728..e337efce6cc6b6a5ff10104aa11218acb7d8cefa 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-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # @@ -62,6 +62,7 @@ cdef extern from "Programs/brlapi.h": int brlapi__getDisplaySize(brlapi_handle_t *, unsigned int*, unsigned int *y) nogil int brlapi__getDriverName(brlapi_handle_t *, char*, int) nogil + int brlapi__getModelIdentifier(brlapi_handle_t *, char*, int) nogil int brlapi__enterTtyMode(brlapi_handle_t *, int, char*) nogil int brlapi__enterTtyModeWithPath(brlapi_handle_t *, int *, int, char*) nogil diff --git a/Bindings/Python/constants.awk b/Bindings/Python/constants.awk index bea0f3bc7d7569538503c4af3c7f3afef8744201..dad00b9f73e06d6419b64347501d57b4f4bfc1c2 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-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/mkdoc.py b/Bindings/Python/mkdoc.py index e7278f1ea3c65cfee75c46d6e13cf4d6327198d1..3c1bb40de17d0141ad2deaca9fae88bef81c2847 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-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Python/setup.py.in b/Bindings/Python/setup.py.in index 111818f66fd8519af432b93a9bc0b5c9e3fea736..639be29062ac21fe6518f6dcdc57ee16a568f55e 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-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # diff --git a/Bindings/Tcl/Makefile.in b/Bindings/Tcl/Makefile.in index 185dd07d66d7ab4be4a8b6914860fde0c28e4678..683e74e651c782ac2841ba5a377cabc0eac0b1e7 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-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Tcl/apitest b/Bindings/Tcl/apitest index 0d05420408a81c01128de9f0abe504939af67c9d..e3760da7b3fe801956130ff49b9cb3ed687dbbea 100755 --- a/Bindings/Tcl/apitest +++ b/Bindings/Tcl/apitest @@ -1,8 +1,8 @@ -#!/bin/bash -p +#!/bin/bash ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -16,12 +16,6 @@ # This software is maintained by Dave Mielke . ############################################################################### -programName="$(basename "${0}")" -programDirectory="$(cd "$(dirname "${0}")" && pwd)" -currentDirectory="$(pwd)" - -export LD_LIBRARY_PATH="${currentDirectory}" -export LD_PRELOAD="${currentDirectory}/../../Programs/libbrlapi.so" - +. "${0%/*}/../../apitest.sh" exec tclsh "${programDirectory}/${programName}.tcl" "${@}" exit "${?}" diff --git a/Bindings/Tcl/apitest.tcl b/Bindings/Tcl/apitest.tcl index 6e53967b1bfa2cfb7d698108d79b98b7ff2abc1f..b12941a159c0d817cf318fbad8fe93fb57788670 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-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -52,6 +52,9 @@ puts "FileDescriptor: $fileDescriptor" set driverName [$session getDriverName] puts "DriverName: $driverName" +set modelIdentifier [$session getModelIdentifier] +puts "ModelIdentifier: $modelIdentifier" + set displaySize [$session getDisplaySize] puts "DisplaySize: [expandList $displaySize width height]" diff --git a/Bindings/Tcl/bindings.c b/Bindings/Tcl/bindings.c index 2edcc1c8d07ead76cf3da124b455bd97996510f3..f091200154c6103ada2362d9340dd48fe4107ee3 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-2017 by Dave Mielke + * Copyright (C) 2006-2018 by Dave Mielke * * libbrlapi comes with ABSOLUTELY NO WARRANTY. * @@ -365,6 +365,7 @@ brlapiSessionCommand (ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj *co "getDriverName", "getFileDescriptor", "getHost", + "getModelIdentifier", "ignoreKeyRanges", "ignoreKeys", "leaveRawMode", @@ -392,6 +393,7 @@ brlapiSessionCommand (ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj *co FCN_getDriverName, FCN_getFileDescriptor, FCN_getHost, + FCN_getModelIdentifier, FCN_ignoreKeyRanges, FCN_ignoreKeys, FCN_leaveRawMode, @@ -476,6 +478,32 @@ brlapiSessionCommand (ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj *co } } + case FCN_getModelIdentifier: { + size_t size = 0X10; + + if (objc != 2) { + Tcl_WrongNumArgs(interp, 2, objv, NULL); + return TCL_ERROR; + } + + while (1) { + char buffer[size]; + int result = brlapi__getModelIdentifier(session->handle, buffer, size); + + if (result == -1) { + setBrlapiError(interp); + return TCL_ERROR; + } + + if (result <= size) { + setStringResult(interp, buffer, result-1); + return TCL_OK; + } + + size = result; + } + } + case FCN_getDisplaySize: { unsigned int width, height; diff --git a/Bindings/Tcl/bindings.m4 b/Bindings/Tcl/bindings.m4 index 4a7a2cac45ee0d9f22d5a9d1805470643ec01c77..941c1d51a253828b328384db43e946733a4e6089 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-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bindings/Tcl/prologue.tcl b/Bindings/Tcl/prologue.tcl index aee7c8c9b38955441d11c093dbc100be3ac30a0e..9c580b7c90bb72cd3a6c45990e0c5ba53cce7385 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-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff --git a/Bootdisks/bp2cf b/Bootdisks/bp2cf index 796e1f78559b8ae3020c65910b2a1f6b501f1b9b..29ffaf80849488657b076723394f0f642148e322 100755 --- a/Bootdisks/bp2cf +++ b/Bootdisks/bp2cf @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Bootdisks/rhmkiso b/Bootdisks/rhmkiso index 450c5ebd59298dfdec9415febcc99706ade252f6..002df01e45d1c6f2ba45e2874f5c6df0cd154441 100755 --- a/Bootdisks/rhmkiso +++ b/Bootdisks/rhmkiso @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/DOS/mkdosarc b/DOS/mkdosarc index b63773f821a504c39be65c5a4e8f7ae629507764..cb3059551b46e74bcfcaeb433a1e3d6880e6236f 100755 --- a/DOS/mkdosarc +++ b/DOS/mkdosarc @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/DOS/mkdostools b/DOS/mkdostools index bc1c123c781d49d0c7ebac6a14700fa367c45f7d..701d8b4a5c1bbd8dc63ed55724f1c857f4025b2b 100755 --- a/DOS/mkdostools +++ b/DOS/mkdostools @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Documents/BrlAPIref.doxy.in b/Documents/BrlAPIref.doxy.in index 906d456d99148fdf569fa469266267736679538f..6100145b773a1d70922112de408d777ba41f5048 100644 --- a/Documents/BrlAPIref.doxy.in +++ b/Documents/BrlAPIref.doxy.in @@ -820,18 +820,6 @@ GENERATE_XML = NO XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting # and cross-referencing information) to the XML output. Note that diff --git a/Documents/BrlAPIref/html/brlapi_8h.html b/Documents/BrlAPIref/html/brlapi_8h.html index d5e263b5dbf26322044fed286a7cc7d0cd9b914f..8c1158640e0e3dc2321ca91cc4115ec511bb1dab 100644 --- a/Documents/BrlAPIref/html/brlapi_8h.html +++ b/Documents/BrlAPIref/html/brlapi_8h.html @@ -90,13 +90,13 @@ Data Structures - + - + @@ -110,7 +110,11 @@ Macros - + + + + + @@ -293,6 +297,10 @@ Functions + + + + @@ -349,14 +357,14 @@ Functions - - - - - - - - + + + + + + + + diff --git a/Documents/BrlAPIref/html/brlapi_8h_source.html b/Documents/BrlAPIref/html/brlapi_8h_source.html index 9a93b9fc6dc70b96eeae92d1b05219745536ac43..509608f3f954b68ffc3ef0ae8d819a5a00e8a671 100644 --- a/Documents/BrlAPIref/html/brlapi_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi_8h_source.html @@ -55,7 +55,7 @@
2 /*
3  * libbrlapi - A library providing access to braille terminals for applications.
4  *
-
5  * Copyright (C) 2002-2017 by
+
5  * Copyright (C) 2002-2018 by
6  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
8  *
@@ -80,13 +80,13 @@
31 
32 /* #undef BRLAPI_WIN32 */
33 
-
38 #define BRLAPI_RELEASE "0.6.6"
+
38 #define BRLAPI_RELEASE "0.6.7"
39 
41 #define BRLAPI_MAJOR 0
42 
44 #define BRLAPI_MINOR 6
45 
-
47 #define BRLAPI_REVISION 6
+
47 #define BRLAPI_REVISION 7
48 
51 /* Types are defined there */
52 #include <sys/types.h>
@@ -121,7 +121,7 @@
103 
105 size_t BRLAPI_STDCALL brlapi_getHandleSize(void);
106 
-
120 #define BRLAPI_SOCKETPORTNUM 4101
+
120 #define BRLAPI_SOCKETPORTNUM 4101
121 #define BRLAPI_SOCKETPORT "4101"
122 
124 #define BRLAPI_SOCKETPATH "/var/lib/BrlAPI"
@@ -133,440 +133,454 @@
138 #ifdef BRLAPI_WIN32
139 /* No authentication by default on Windows */
140 #define BRLAPI_DEFAUTH "none"
-
141 #else
-
142 #define BRLAPI_DEFAUTH "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
-
143 #endif /* BRLAPI_WIN32 */
-
144 
-
145 #ifdef __MINGW32__
-
146 typedef HANDLE brlapi_fileDescriptor;
-
147 #else /* __MINGW32__ */
-
148 typedef int brlapi_fileDescriptor;
-
149 #endif /* __MINGW32__ */
-
150 
-
181 typedef struct {
-
189  char *auth;
-
190 
-
199  char *host;
-
200 } brlapi_connectionSettings_t;
-
201 
-
202 /* BRLAPI_SETTINGS_INITIALIZER */
-
205 #define BRLAPI_SETTINGS_INITIALIZER { NULL, NULL }
-
206 
-
207 /* brlapi_openConnection */
-
252 #ifndef BRLAPI_NO_SINGLE_SESSION
-
253 brlapi_fileDescriptor BRLAPI_STDCALL brlapi_openConnection(const brlapi_connectionSettings_t *desiredSettings, brlapi_connectionSettings_t *actualSettings);
-
254 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
255 brlapi_fileDescriptor BRLAPI_STDCALL brlapi__openConnection(brlapi_handle_t *handle, const brlapi_connectionSettings_t *desiredSettings, brlapi_connectionSettings_t *actualSettings);
-
256 
-
257 /* brlapi_closeConnection */
-
264 #ifndef BRLAPI_NO_SINGLE_SESSION
-
265 void BRLAPI_STDCALL brlapi_closeConnection(void);
-
266 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
267 void BRLAPI_STDCALL brlapi__closeConnection(brlapi_handle_t *handle);
-
268 
-
284 #define BRLAPI_MAXNAMELENGTH 31
-
285 
-
286 /* brlapi_getDriverName */
-
298 #ifndef BRLAPI_NO_SINGLE_SESSION
-
299 int BRLAPI_STDCALL brlapi_getDriverName(char *buffer, size_t size);
-
300 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
301 int BRLAPI_STDCALL brlapi__getDriverName(brlapi_handle_t *handle, char *buffer, size_t size);
-
302 
-
303 /* brlapi_getDisplaySize */
-
305 #ifndef BRLAPI_NO_SINGLE_SESSION
-
306 int BRLAPI_STDCALL brlapi_getDisplaySize(unsigned int *x, unsigned int *y);
-
307 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
308 int BRLAPI_STDCALL brlapi__getDisplaySize(brlapi_handle_t *handle, unsigned int *x, unsigned int *y);
-
309 
-
333 /* brlapi_enterTtyMode */
-
353 #ifndef BRLAPI_NO_SINGLE_SESSION
-
354 int BRLAPI_STDCALL brlapi_enterTtyMode(int tty, const char *driver);
-
355 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
356 int BRLAPI_STDCALL brlapi__enterTtyMode(brlapi_handle_t *handle, int tty, const char *driver);
-
357 
-
367 #define BRLAPI_TTY_DEFAULT -1
-
368 
-
369 /* brlapi_enterTtyModeWithPath */
-
381 #ifndef BRLAPI_NO_SINGLE_SESSION
-
382 int BRLAPI_STDCALL brlapi_enterTtyModeWithPath(int *ttys, int count, const char *driver);
-
383 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
384 int BRLAPI_STDCALL brlapi__enterTtyModeWithPath(brlapi_handle_t *handle, int *ttys, int count, const char *driver);
-
385 
-
386 /* brlapi_leaveTtyMode */
-
393 #ifndef BRLAPI_NO_SINGLE_SESSION
-
394 int BRLAPI_STDCALL brlapi_leaveTtyMode(void);
-
395 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
396 int BRLAPI_STDCALL brlapi__leaveTtyMode(brlapi_handle_t *handle);
-
397 
-
398 /* brlapi_setFocus */
-
409 #ifndef BRLAPI_NO_SINGLE_SESSION
-
410 int BRLAPI_STDCALL brlapi_setFocus(int tty);
-
411 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
412 int BRLAPI_STDCALL brlapi__setFocus(brlapi_handle_t *handle, int tty);
-
413 
-
443 /* brlapi_writeText */
-
458 #ifndef BRLAPI_NO_SINGLE_SESSION
-
459 int BRLAPI_STDCALL brlapi_writeText(int cursor, const char *text);
-
460 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
461 int BRLAPI_STDCALL brlapi__writeText(brlapi_handle_t *handle, int cursor, const char *text);
-
462 
-
463 /* brlapi_writeWText */
-
476 #ifndef BRLAPI_NO_SINGLE_SESSION
-
477 int BRLAPI_STDCALL brlapi_writeWText(int cursor, const wchar_t *text);
-
478 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
479 int BRLAPI_STDCALL brlapi__writeWText(brlapi_handle_t *handle, int cursor, const wchar_t *text);
-
480 
-
481 /* brlapi_writeDots */
-
489 #ifndef BRLAPI_NO_SINGLE_SESSION
-
490 int BRLAPI_STDCALL brlapi_writeDots(const unsigned char *dots);
-
491 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
492 int BRLAPI_STDCALL brlapi__writeDots(brlapi_handle_t *handle, const unsigned char *dots);
-
493 
-
494 /* brlapi_writeArguments_t */
-
496 typedef struct {
-
497  int displayNumber ;
-
498  unsigned int regionBegin ;
-
499  unsigned int regionSize ;
-
500  char *text ;
-
501  int textSize ;
-
502  unsigned char *andMask ;
-
503  unsigned char *orMask ;
-
504  int cursor ;
-
505  char *charset ;
-
506 } brlapi_writeArguments_t;
-
507 
-
512 #define BRLAPI_DISPLAY_DEFAULT -1
-
513 
-
518 #define BRLAPI_CURSOR_LEAVE -1
-
519 
-
524 #define BRLAPI_CURSOR_OFF 0
-
525 
-
526 /* BRLAPI_WRITEARGUMENTS_INITIALIZER */
-
536 #define BRLAPI_WRITEARGUMENTS_INITIALIZER { \
-
537  .displayNumber = BRLAPI_DISPLAY_DEFAULT, \
-
538  .regionBegin = 0, \
-
539  .regionSize = 0, \
-
540  .text = NULL, \
-
541  .textSize = -1, \
-
542  .andMask = NULL, \
-
543  .orMask = NULL, \
-
544  .cursor = BRLAPI_CURSOR_LEAVE, \
-
545  .charset = NULL \
-
546 }
-
547 
-
548 /* brlapi_write */
-
584 #ifndef BRLAPI_NO_SINGLE_SESSION
-
585 int BRLAPI_STDCALL brlapi_write(const brlapi_writeArguments_t *arguments);
-
586 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
587 int BRLAPI_STDCALL brlapi__write(brlapi_handle_t *handle, const brlapi_writeArguments_t *arguments);
-
588 
-
591 #include "brlapi_keycodes.h"
-
592 
-
606 /* brlapi_expandedKeyCode_t */
-
608 typedef struct {
-
609  unsigned int type ;
-
610  unsigned int command ;
-
611  unsigned int argument ;
-
612  unsigned int flags ;
-
613 } brlapi_expandedKeyCode_t;
-
614 
-
615 /* brlapi_expandKeyCode */
-
623 int BRLAPI_STDCALL brlapi_expandKeyCode (brlapi_keyCode_t code, brlapi_expandedKeyCode_t *expansion);
-
624 
-
625 /* brlapi_describedKeyCode_t */
-
627 typedef struct {
-
628  const char *type ;
-
629  const char *command ;
-
630  unsigned int argument ;
-
631  unsigned int flags ;
-
632  const char *flag[64 - BRLAPI_KEY_FLAGS_SHIFT] ;
-
633  brlapi_expandedKeyCode_t values ;
-
634 } brlapi_describedKeyCode_t;
-
635 
-
636 /* brlapi_describeKeyCode */
-
644 int BRLAPI_STDCALL brlapi_describeKeyCode (brlapi_keyCode_t code, brlapi_describedKeyCode_t *description);
-
645 
-
647 #define BRLAPI_UC_ROW 0x2800UL
-
648 
-
649 /* brlapi_readKey */
-
716 #ifndef BRLAPI_NO_SINGLE_SESSION
-
717 int BRLAPI_STDCALL brlapi_readKey(int wait, brlapi_keyCode_t *code);
-
718 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
719 int BRLAPI_STDCALL brlapi__readKey(brlapi_handle_t *handle, int wait, brlapi_keyCode_t *code);
-
720 
-
722 typedef enum {
-
723  brlapi_rangeType_all,
-
724  brlapi_rangeType_type,
-
725  brlapi_rangeType_command,
-
726  brlapi_rangeType_key,
-
727  brlapi_rangeType_code,
-
728 } brlapi_rangeType_t;
-
729 
-
730 /* brlapi_ignoreKeys */
-
743 #ifndef BRLAPI_NO_SINGLE_SESSION
-
744 int BRLAPI_STDCALL brlapi_ignoreKeys(brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
-
745 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
746 int BRLAPI_STDCALL brlapi__ignoreKeys(brlapi_handle_t *handle, brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
-
747 
-
748 /* brlapi_acceptKeys */
-
761 #ifndef BRLAPI_NO_SINGLE_SESSION
-
762 int BRLAPI_STDCALL brlapi_acceptKeys(brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
-
763 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
764 int BRLAPI_STDCALL brlapi__acceptKeys(brlapi_handle_t *handle, brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
-
765 
-
766 /* brlapi_ignoreAllKeys */
-
772 #ifndef BRLAPI_NO_SINGLE_SESSION
-
773 int BRLAPI_STDCALL brlapi_ignoreAllKeys(void);
-
774 #define brlapi_ignoreAllKeys() brlapi_ignoreKeys(brlapi_rangeType_all, NULL, 0)
-
775 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
776 int BRLAPI_STDCALL brlapi__ignoreAllKeys(brlapi_handle_t *handle);
-
777 #define brlapi__ignoreAllKeys(handle) brlapi__ignoreKeys(handle, brlapi_rangeType_all, NULL, 0)
-
778 
-
779 /* brlapi_acceptAllKeys */
-
788 #ifndef BRLAPI_NO_SINGLE_SESSION
-
789 int BRLAPI_STDCALL brlapi_acceptAllKeys(void);
-
790 #define brlapi_acceptAllKeys() brlapi_acceptKeys(brlapi_rangeType_all, NULL, 0)
-
791 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
792 int BRLAPI_STDCALL brlapi__acceptAllKeys(brlapi_handle_t *handle);
-
793 #define brlapi__acceptAllKeys(handle) brlapi__acceptKeys(handle, brlapi_rangeType_all, NULL, 0)
-
794 
-
799 typedef struct {
-
800  brlapi_keyCode_t first;
-
801  brlapi_keyCode_t last;
-
802 } brlapi_range_t;
-
803 
-
804 /* brlapi_ignoreKeyRanges */
-
815 #ifndef BRLAPI_NO_SINGLE_SESSION
-
816 int BRLAPI_STDCALL brlapi_ignoreKeyRanges(brlapi_range_t ranges[], unsigned int count);
-
817 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
818 int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count);
-
819 
-
820 /* brlapi_acceptKeyRanges */
-
831 #ifndef BRLAPI_NO_SINGLE_SESSION
-
832 int BRLAPI_STDCALL brlapi_acceptKeyRanges(brlapi_range_t ranges[], unsigned int count);
-
833 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
834 int BRLAPI_STDCALL brlapi__acceptKeyRanges(brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count);
-
860 /* brlapi_enterRawMode */
-
865 #ifndef BRLAPI_NO_SINGLE_SESSION
-
866 int BRLAPI_STDCALL brlapi_enterRawMode(const char *driver);
-
867 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
868 int BRLAPI_STDCALL brlapi__enterRawMode(brlapi_handle_t *handle, const char *driver);
-
869 
-
870 /* brlapi_leaveRawMode */
-
873 #ifndef BRLAPI_NO_SINGLE_SESSION
-
874 int BRLAPI_STDCALL brlapi_leaveRawMode(void);
-
875 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
876 int BRLAPI_STDCALL brlapi__leaveRawMode(brlapi_handle_t *handle);
-
877 
-
878 /* brlapi_sendRaw */
-
884 #ifndef BRLAPI_NO_SINGLE_SESSION
-
885 ssize_t BRLAPI_STDCALL brlapi_sendRaw(const void *buffer, size_t size);
-
886 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
887 ssize_t BRLAPI_STDCALL brlapi__sendRaw(brlapi_handle_t *handle, const void *buffer, size_t size);
-
888 
-
889 /* brlapi_recvRaw */
-
896 #ifndef BRLAPI_NO_SINGLE_SESSION
-
897 ssize_t BRLAPI_STDCALL brlapi_recvRaw(void *buffer, size_t size);
-
898 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
899 ssize_t BRLAPI_STDCALL brlapi__recvRaw(brlapi_handle_t *handle, void *buffer, size_t size);
-
900 
-
901 /* brlapi_suspendDriver */
-
906 #ifndef BRLAPI_NO_SINGLE_SESSION
-
907 int BRLAPI_STDCALL brlapi_suspendDriver(const char *driver);
-
908 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
909 int BRLAPI_STDCALL brlapi__suspendDriver(brlapi_handle_t *handle, const char *driver);
-
910 
-
911 /* brlapi_resumeDriver */
-
915 #ifndef BRLAPI_NO_SINGLE_SESSION
-
916 int BRLAPI_STDCALL brlapi_resumeDriver(void);
-
917 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
918 int BRLAPI_STDCALL brlapi__resumeDriver(brlapi_handle_t *handle);
-
942 /* Error codes */
-
943 #define BRLAPI_ERROR_SUCCESS 0
-
944 #define BRLAPI_ERROR_NOMEM 1
-
945 #define BRLAPI_ERROR_TTYBUSY 2
-
946 #define BRLAPI_ERROR_DEVICEBUSY 3
-
947 #define BRLAPI_ERROR_UNKNOWN_INSTRUCTION 4
-
948 #define BRLAPI_ERROR_ILLEGAL_INSTRUCTION 5
-
949 #define BRLAPI_ERROR_INVALID_PARAMETER 6
-
950 #define BRLAPI_ERROR_INVALID_PACKET 7
-
951 #define BRLAPI_ERROR_CONNREFUSED 8
-
952 #define BRLAPI_ERROR_OPNOTSUPP 9
-
953 #define BRLAPI_ERROR_GAIERR 10
-
954 #define BRLAPI_ERROR_LIBCERR 11
-
955 #define BRLAPI_ERROR_UNKNOWNTTY 12
-
956 #define BRLAPI_ERROR_PROTOCOL_VERSION 13
-
957 #define BRLAPI_ERROR_EOF 14
-
958 #define BRLAPI_ERROR_EMPTYKEY 15
-
959 #define BRLAPI_ERROR_DRIVERERROR 16
-
960 #define BRLAPI_ERROR_AUTHENTICATION 17
-
962 /* brlapi_errlist */
-
963 
-
967 extern const char *brlapi_errlist[];
-
968 
-
969 /* brlapi_nerr */
-
971 extern const int brlapi_nerr;
-
972 
-
973 /* brlapi_perror */
-
978 void BRLAPI_STDCALL brlapi_perror(const char *s);
-
979 
-
980 /* brlapi_error_t */
-
982 typedef struct {
-
983  int brlerrno;
-
984  int libcerrno;
-
985  int gaierrno;
-
986  const char *errfun;
-
987 } brlapi_error_t;
-
988 
-
997 brlapi_error_t * BRLAPI_STDCALL brlapi_error_location(void);
-
998 
-
1007 extern brlapi_error_t brlapi_error;
-
1008 
-
1010 extern int brlapi_errno;
-
1012 extern int brlapi_libcerrno;
-
1014 extern int brlapi_gaierrno;
-
1016 extern const char *brlapi_errfun;
-
1017 
-
1019 #define brlapi_error (*brlapi_error_location())
-
1020 
-
1021 #define brlapi_errno (brlapi_error.brlerrno)
-
1022 
-
1023 #define brlapi_libcerrno (brlapi_error.libcerrno)
-
1024 
-
1025 #define brlapi_gaierrno (brlapi_error.gaierrno)
-
1026 
-
1027 #define brlapi_errfun (brlapi_error.errfun)
-
1028 
-
1029 /* brlapi_strerror */
-
1035 const char * BRLAPI_STDCALL brlapi_strerror(const brlapi_error_t *error);
-
1036 
-
1038 typedef uint32_t brlapi_packetType_t;
-
1039 
-
1040 /* brlapi_getPacketTypeName */
-
1046 const char * BRLAPI_STDCALL brlapi_getPacketTypeName(brlapi_packetType_t type);
-
1047 
-
1048 /* brlapi_exceptionHandler_t */
-
1060 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1061 typedef void (BRLAPI_STDCALL *brlapi_exceptionHandler_t)(int error, brlapi_packetType_t type, const void *packet, size_t size);
-
1062 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1063 typedef void (BRLAPI_STDCALL *brlapi__exceptionHandler_t)(brlapi_handle_t *handle, int error, brlapi_packetType_t type, const void *packet, size_t size);
+
141 #else /* BRLAPI_WIN32 */
+
142 #define BRLAPI_DEFAUTH_KEYFILE "keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
+
143 
+
144 #ifdef USE_POLKIT
+
145 #define BRLAPI_DEFAUTH_POLKIT "+polkit"
+
146 #else /* USE_POLKIT */
+
147 #define BRLAPI_DEFAUTH_POLKIT ""
+
148 #endif /* USE_POLKIT */
+
149 
+
150 #define BRLAPI_DEFAUTH BRLAPI_DEFAUTH_KEYFILE BRLAPI_DEFAUTH_POLKIT
+
151 #endif /* BRLAPI_WIN32 */
+
152 
+
153 #ifdef __MINGW32__
+
154 typedef HANDLE brlapi_fileDescriptor;
+
155 #else /* __MINGW32__ */
+
156 typedef int brlapi_fileDescriptor;
+
157 #endif /* __MINGW32__ */
+
158 
+
189 typedef struct {
+
197  char *auth;
+
198 
+
207  char *host;
+
208 } brlapi_connectionSettings_t;
+
209 
+
210 /* BRLAPI_SETTINGS_INITIALIZER */
+
213 #define BRLAPI_SETTINGS_INITIALIZER { NULL, NULL }
+
214 
+
215 /* brlapi_openConnection */
+
260 #ifndef BRLAPI_NO_SINGLE_SESSION
+
261 brlapi_fileDescriptor BRLAPI_STDCALL brlapi_openConnection(const brlapi_connectionSettings_t *desiredSettings, brlapi_connectionSettings_t *actualSettings);
+
262 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
263 brlapi_fileDescriptor BRLAPI_STDCALL brlapi__openConnection(brlapi_handle_t *handle, const brlapi_connectionSettings_t *desiredSettings, brlapi_connectionSettings_t *actualSettings);
+
264 
+
265 /* brlapi_closeConnection */
+
272 #ifndef BRLAPI_NO_SINGLE_SESSION
+
273 void BRLAPI_STDCALL brlapi_closeConnection(void);
+
274 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
275 void BRLAPI_STDCALL brlapi__closeConnection(brlapi_handle_t *handle);
+
276 
+
292 #define BRLAPI_MAXNAMELENGTH 31
+
293 
+
294 /* brlapi_getDriverName */
+
306 #ifndef BRLAPI_NO_SINGLE_SESSION
+
307 int BRLAPI_STDCALL brlapi_getDriverName(char *buffer, size_t size);
+
308 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
309 int BRLAPI_STDCALL brlapi__getDriverName(brlapi_handle_t *handle, char *buffer, size_t size);
+
310 
+
311 /* brlapi_getModelIdentifier */
+
323 #ifndef BRLAPI_NO_SINGLE_SESSION
+
324 int BRLAPI_STDCALL brlapi_getModelIdentifier(char *buffer, size_t size);
+
325 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
326 int BRLAPI_STDCALL brlapi__getModelIdentifier(brlapi_handle_t *handle, char *buffer, size_t size);
+
327 
+
328 /* brlapi_getDisplaySize */
+
330 #ifndef BRLAPI_NO_SINGLE_SESSION
+
331 int BRLAPI_STDCALL brlapi_getDisplaySize(unsigned int *x, unsigned int *y);
+
332 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
333 int BRLAPI_STDCALL brlapi__getDisplaySize(brlapi_handle_t *handle, unsigned int *x, unsigned int *y);
+
334 
+
358 /* brlapi_enterTtyMode */
+
378 #ifndef BRLAPI_NO_SINGLE_SESSION
+
379 int BRLAPI_STDCALL brlapi_enterTtyMode(int tty, const char *driver);
+
380 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
381 int BRLAPI_STDCALL brlapi__enterTtyMode(brlapi_handle_t *handle, int tty, const char *driver);
+
382 
+
392 #define BRLAPI_TTY_DEFAULT -1
+
393 
+
394 /* brlapi_enterTtyModeWithPath */
+
406 #ifndef BRLAPI_NO_SINGLE_SESSION
+
407 int BRLAPI_STDCALL brlapi_enterTtyModeWithPath(int *ttys, int count, const char *driver);
+
408 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
409 int BRLAPI_STDCALL brlapi__enterTtyModeWithPath(brlapi_handle_t *handle, int *ttys, int count, const char *driver);
+
410 
+
411 /* brlapi_leaveTtyMode */
+
418 #ifndef BRLAPI_NO_SINGLE_SESSION
+
419 int BRLAPI_STDCALL brlapi_leaveTtyMode(void);
+
420 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
421 int BRLAPI_STDCALL brlapi__leaveTtyMode(brlapi_handle_t *handle);
+
422 
+
423 /* brlapi_setFocus */
+
434 #ifndef BRLAPI_NO_SINGLE_SESSION
+
435 int BRLAPI_STDCALL brlapi_setFocus(int tty);
+
436 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
437 int BRLAPI_STDCALL brlapi__setFocus(brlapi_handle_t *handle, int tty);
+
438 
+
468 /* brlapi_writeText */
+
483 #ifndef BRLAPI_NO_SINGLE_SESSION
+
484 int BRLAPI_STDCALL brlapi_writeText(int cursor, const char *text);
+
485 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
486 int BRLAPI_STDCALL brlapi__writeText(brlapi_handle_t *handle, int cursor, const char *text);
+
487 
+
488 /* brlapi_writeWText */
+
501 #ifndef BRLAPI_NO_SINGLE_SESSION
+
502 int BRLAPI_STDCALL brlapi_writeWText(int cursor, const wchar_t *text);
+
503 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
504 int BRLAPI_STDCALL brlapi__writeWText(brlapi_handle_t *handle, int cursor, const wchar_t *text);
+
505 
+
506 /* brlapi_writeDots */
+
514 #ifndef BRLAPI_NO_SINGLE_SESSION
+
515 int BRLAPI_STDCALL brlapi_writeDots(const unsigned char *dots);
+
516 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
517 int BRLAPI_STDCALL brlapi__writeDots(brlapi_handle_t *handle, const unsigned char *dots);
+
518 
+
519 /* brlapi_writeArguments_t */
+
521 typedef struct {
+
522  int displayNumber ;
+
523  unsigned int regionBegin ;
+
524  unsigned int regionSize ;
+
525  char *text ;
+
526  int textSize ;
+
527  unsigned char *andMask ;
+
528  unsigned char *orMask ;
+
529  int cursor ;
+
530  char *charset ;
+
531 } brlapi_writeArguments_t;
+
532 
+
537 #define BRLAPI_DISPLAY_DEFAULT -1
+
538 
+
543 #define BRLAPI_CURSOR_LEAVE -1
+
544 
+
549 #define BRLAPI_CURSOR_OFF 0
+
550 
+
551 /* BRLAPI_WRITEARGUMENTS_INITIALIZER */
+
561 #define BRLAPI_WRITEARGUMENTS_INITIALIZER { \
+
562  .displayNumber = BRLAPI_DISPLAY_DEFAULT, \
+
563  .regionBegin = 0, \
+
564  .regionSize = 0, \
+
565  .text = NULL, \
+
566  .textSize = -1, \
+
567  .andMask = NULL, \
+
568  .orMask = NULL, \
+
569  .cursor = BRLAPI_CURSOR_LEAVE, \
+
570  .charset = NULL \
+
571 }
+
572 
+
573 /* brlapi_write */
+
609 #ifndef BRLAPI_NO_SINGLE_SESSION
+
610 int BRLAPI_STDCALL brlapi_write(const brlapi_writeArguments_t *arguments);
+
611 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
612 int BRLAPI_STDCALL brlapi__write(brlapi_handle_t *handle, const brlapi_writeArguments_t *arguments);
+
613 
+
616 #include "brlapi_keycodes.h"
+
617 
+
631 /* brlapi_expandedKeyCode_t */
+
633 typedef struct {
+
634  unsigned int type ;
+
635  unsigned int command ;
+
636  unsigned int argument ;
+
637  unsigned int flags ;
+
638 } brlapi_expandedKeyCode_t;
+
639 
+
640 /* brlapi_expandKeyCode */
+
648 int BRLAPI_STDCALL brlapi_expandKeyCode (brlapi_keyCode_t code, brlapi_expandedKeyCode_t *expansion);
+
649 
+
650 /* brlapi_describedKeyCode_t */
+
652 typedef struct {
+
653  const char *type ;
+
654  const char *command ;
+
655  unsigned int argument ;
+
656  unsigned int flags ;
+
657  const char *flag[64 - BRLAPI_KEY_FLAGS_SHIFT] ;
+
658  brlapi_expandedKeyCode_t values ;
+
659 } brlapi_describedKeyCode_t;
+
660 
+
661 /* brlapi_describeKeyCode */
+
669 int BRLAPI_STDCALL brlapi_describeKeyCode (brlapi_keyCode_t code, brlapi_describedKeyCode_t *description);
+
670 
+
672 #define BRLAPI_UC_ROW 0x2800UL
+
673 
+
674 /* brlapi_readKey */
+
741 #ifndef BRLAPI_NO_SINGLE_SESSION
+
742 int BRLAPI_STDCALL brlapi_readKey(int wait, brlapi_keyCode_t *code);
+
743 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
744 int BRLAPI_STDCALL brlapi__readKey(brlapi_handle_t *handle, int wait, brlapi_keyCode_t *code);
+
745 
+
747 typedef enum {
+
748  brlapi_rangeType_all,
+
749  brlapi_rangeType_type,
+
750  brlapi_rangeType_command,
+
751  brlapi_rangeType_key,
+
752  brlapi_rangeType_code,
+
753 } brlapi_rangeType_t;
+
754 
+
755 /* brlapi_ignoreKeys */
+
768 #ifndef BRLAPI_NO_SINGLE_SESSION
+
769 int BRLAPI_STDCALL brlapi_ignoreKeys(brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
+
770 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
771 int BRLAPI_STDCALL brlapi__ignoreKeys(brlapi_handle_t *handle, brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
+
772 
+
773 /* brlapi_acceptKeys */
+
786 #ifndef BRLAPI_NO_SINGLE_SESSION
+
787 int BRLAPI_STDCALL brlapi_acceptKeys(brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
+
788 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
789 int BRLAPI_STDCALL brlapi__acceptKeys(brlapi_handle_t *handle, brlapi_rangeType_t type, const brlapi_keyCode_t keys[], unsigned int count);
+
790 
+
791 /* brlapi_ignoreAllKeys */
+
797 #ifndef BRLAPI_NO_SINGLE_SESSION
+
798 int BRLAPI_STDCALL brlapi_ignoreAllKeys(void);
+
799 #define brlapi_ignoreAllKeys() brlapi_ignoreKeys(brlapi_rangeType_all, NULL, 0)
+
800 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
801 int BRLAPI_STDCALL brlapi__ignoreAllKeys(brlapi_handle_t *handle);
+
802 #define brlapi__ignoreAllKeys(handle) brlapi__ignoreKeys(handle, brlapi_rangeType_all, NULL, 0)
+
803 
+
804 /* brlapi_acceptAllKeys */
+
813 #ifndef BRLAPI_NO_SINGLE_SESSION
+
814 int BRLAPI_STDCALL brlapi_acceptAllKeys(void);
+
815 #define brlapi_acceptAllKeys() brlapi_acceptKeys(brlapi_rangeType_all, NULL, 0)
+
816 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
817 int BRLAPI_STDCALL brlapi__acceptAllKeys(brlapi_handle_t *handle);
+
818 #define brlapi__acceptAllKeys(handle) brlapi__acceptKeys(handle, brlapi_rangeType_all, NULL, 0)
+
819 
+
824 typedef struct {
+
825  brlapi_keyCode_t first;
+
826  brlapi_keyCode_t last;
+
827 } brlapi_range_t;
+
828 
+
829 /* brlapi_ignoreKeyRanges */
+
840 #ifndef BRLAPI_NO_SINGLE_SESSION
+
841 int BRLAPI_STDCALL brlapi_ignoreKeyRanges(const brlapi_range_t ranges[], unsigned int count);
+
842 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
843 int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count);
+
844 
+
845 /* brlapi_acceptKeyRanges */
+
856 #ifndef BRLAPI_NO_SINGLE_SESSION
+
857 int BRLAPI_STDCALL brlapi_acceptKeyRanges(const brlapi_range_t ranges[], unsigned int count);
+
858 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
859 int BRLAPI_STDCALL brlapi__acceptKeyRanges(brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count);
+
885 /* brlapi_enterRawMode */
+
890 #ifndef BRLAPI_NO_SINGLE_SESSION
+
891 int BRLAPI_STDCALL brlapi_enterRawMode(const char *driver);
+
892 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
893 int BRLAPI_STDCALL brlapi__enterRawMode(brlapi_handle_t *handle, const char *driver);
+
894 
+
895 /* brlapi_leaveRawMode */
+
898 #ifndef BRLAPI_NO_SINGLE_SESSION
+
899 int BRLAPI_STDCALL brlapi_leaveRawMode(void);
+
900 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
901 int BRLAPI_STDCALL brlapi__leaveRawMode(brlapi_handle_t *handle);
+
902 
+
903 /* brlapi_sendRaw */
+
909 #ifndef BRLAPI_NO_SINGLE_SESSION
+
910 ssize_t BRLAPI_STDCALL brlapi_sendRaw(const void *buffer, size_t size);
+
911 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
912 ssize_t BRLAPI_STDCALL brlapi__sendRaw(brlapi_handle_t *handle, const void *buffer, size_t size);
+
913 
+
914 /* brlapi_recvRaw */
+
921 #ifndef BRLAPI_NO_SINGLE_SESSION
+
922 ssize_t BRLAPI_STDCALL brlapi_recvRaw(void *buffer, size_t size);
+
923 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
924 ssize_t BRLAPI_STDCALL brlapi__recvRaw(brlapi_handle_t *handle, void *buffer, size_t size);
+
925 
+
926 /* brlapi_suspendDriver */
+
931 #ifndef BRLAPI_NO_SINGLE_SESSION
+
932 int BRLAPI_STDCALL brlapi_suspendDriver(const char *driver);
+
933 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
934 int BRLAPI_STDCALL brlapi__suspendDriver(brlapi_handle_t *handle, const char *driver);
+
935 
+
936 /* brlapi_resumeDriver */
+
940 #ifndef BRLAPI_NO_SINGLE_SESSION
+
941 int BRLAPI_STDCALL brlapi_resumeDriver(void);
+
942 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
943 int BRLAPI_STDCALL brlapi__resumeDriver(brlapi_handle_t *handle);
+
967 /* Error codes */
+
968 #define BRLAPI_ERROR_SUCCESS 0
+
969 #define BRLAPI_ERROR_NOMEM 1
+
970 #define BRLAPI_ERROR_TTYBUSY 2
+
971 #define BRLAPI_ERROR_DEVICEBUSY 3
+
972 #define BRLAPI_ERROR_UNKNOWN_INSTRUCTION 4
+
973 #define BRLAPI_ERROR_ILLEGAL_INSTRUCTION 5
+
974 #define BRLAPI_ERROR_INVALID_PARAMETER 6
+
975 #define BRLAPI_ERROR_INVALID_PACKET 7
+
976 #define BRLAPI_ERROR_CONNREFUSED 8
+
977 #define BRLAPI_ERROR_OPNOTSUPP 9
+
978 #define BRLAPI_ERROR_GAIERR 10
+
979 #define BRLAPI_ERROR_LIBCERR 11
+
980 #define BRLAPI_ERROR_UNKNOWNTTY 12
+
981 #define BRLAPI_ERROR_PROTOCOL_VERSION 13
+
982 #define BRLAPI_ERROR_EOF 14
+
983 #define BRLAPI_ERROR_EMPTYKEY 15
+
984 #define BRLAPI_ERROR_DRIVERERROR 16
+
985 #define BRLAPI_ERROR_AUTHENTICATION 17
+
987 /* brlapi_errlist */
+
988 
+
992 extern const char *brlapi_errlist[];
+
993 
+
994 /* brlapi_nerr */
+
996 extern const int brlapi_nerr;
+
997 
+
998 /* brlapi_perror */
+
1003 void BRLAPI_STDCALL brlapi_perror(const char *s);
+
1004 
+
1005 /* brlapi_error_t */
+
1007 typedef struct {
+
1008  int brlerrno;
+
1009  int libcerrno;
+
1010  int gaierrno;
+
1011  const char *errfun;
+
1012 } brlapi_error_t;
+
1013 
+
1022 brlapi_error_t * BRLAPI_STDCALL brlapi_error_location(void);
+
1023 
+
1032 extern brlapi_error_t brlapi_error;
+
1033 
+
1035 extern int brlapi_errno;
+
1037 extern int brlapi_libcerrno;
+
1039 extern int brlapi_gaierrno;
+
1041 extern const char *brlapi_errfun;
+
1042 
+
1044 #define brlapi_error (*brlapi_error_location())
+
1045 
+
1046 #define brlapi_errno (brlapi_error.brlerrno)
+
1047 
+
1048 #define brlapi_libcerrno (brlapi_error.libcerrno)
+
1049 
+
1050 #define brlapi_gaierrno (brlapi_error.gaierrno)
+
1051 
+
1052 #define brlapi_errfun (brlapi_error.errfun)
+
1053 
+
1054 /* brlapi_strerror */
+
1060 const char * BRLAPI_STDCALL brlapi_strerror(const brlapi_error_t *error);
+
1061 
+
1063 typedef uint32_t brlapi_packetType_t;
1064 
-
1065 /* brlapi_strexception */
-
1075 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1076 int BRLAPI_STDCALL brlapi_strexception(char *buffer, size_t bufferSize, int error, brlapi_packetType_t type, const void *packet, size_t packetSize);
-
1077 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1078 int BRLAPI_STDCALL brlapi__strexception(brlapi_handle_t *handle, char *buffer, size_t bufferSize, int error, brlapi_packetType_t type, const void *packet, size_t packetSize);
-
1079 
-
1080 /* brlapi_setExceptionHandler */
-
1089 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1090 brlapi_exceptionHandler_t BRLAPI_STDCALL brlapi_setExceptionHandler(brlapi_exceptionHandler_t handler);
-
1091 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1092 brlapi__exceptionHandler_t BRLAPI_STDCALL brlapi__setExceptionHandler(brlapi_handle_t *handle, brlapi__exceptionHandler_t handler);
-
1093 
-
1094 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1095 void BRLAPI_STDCALL brlapi_defaultExceptionHandler(int error, brlapi_packetType_t type, const void *packet, size_t size);
-
1096 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1097 void BRLAPI_STDCALL brlapi__defaultExceptionHandler(brlapi_handle_t *handle, int error, brlapi_packetType_t type, const void *packet, size_t size);
-
1098 
-
1101 /* Windows-specific tricks - don't look at this */
-
1102 #ifdef BRLAPI_WIN32
-
1103 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1104 int BRLAPI_STDCALL brlapi_writeTextWin(int cursor, const void *str, int wide);
-
1105 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1106 int BRLAPI_STDCALL brlapi__writeTextWin(brlapi_handle_t *handle, int cursor, const void *str, int wide);
-
1107 
-
1108 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1109 int BRLAPI_STDCALL brlapi_writeWin(const brlapi_writeArguments_t *s, int wide);
-
1110 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1111 int BRLAPI_STDCALL brlapi__writeWin(brlapi_handle_t *handle, const brlapi_writeArguments_t *s, int wide);
-
1112 
-
1113 #ifdef UNICODE
-
1114 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1115 #define brlapi_writeText(cursor, str) brlapi_writeTextWin(cursor, str, 1)
-
1116 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1117 #define brlapi__writeText(handle, cursor, str) brlapi__writeTextWin(handle, cursor, str, 1)
-
1118 
+
1065 /* brlapi_getPacketTypeName */
+
1071 const char * BRLAPI_STDCALL brlapi_getPacketTypeName(brlapi_packetType_t type);
+
1072 
+
1073 /* brlapi_exceptionHandler_t */
+
1085 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1086 typedef void (BRLAPI_STDCALL *brlapi_exceptionHandler_t)(int error, brlapi_packetType_t type, const void *packet, size_t size);
+
1087 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1088 typedef void (BRLAPI_STDCALL *brlapi__exceptionHandler_t)(brlapi_handle_t *handle, int error, brlapi_packetType_t type, const void *packet, size_t size);
+
1089 
+
1090 /* brlapi_strexception */
+
1100 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1101 int BRLAPI_STDCALL brlapi_strexception(char *buffer, size_t bufferSize, int error, brlapi_packetType_t type, const void *packet, size_t packetSize);
+
1102 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1103 int BRLAPI_STDCALL brlapi__strexception(brlapi_handle_t *handle, char *buffer, size_t bufferSize, int error, brlapi_packetType_t type, const void *packet, size_t packetSize);
+
1104 
+
1105 /* brlapi_setExceptionHandler */
+
1114 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1115 brlapi_exceptionHandler_t BRLAPI_STDCALL brlapi_setExceptionHandler(brlapi_exceptionHandler_t handler);
+
1116 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1117 brlapi__exceptionHandler_t BRLAPI_STDCALL brlapi__setExceptionHandler(brlapi_handle_t *handle, brlapi__exceptionHandler_t handler);
+
1118 
1119 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1120 #define brlapi_write(s) brlapi_writeWin(s, 1)
-
1121 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1122 #define brlapi__write(handle, s) brlapi__writeWin(handle, s, 1)
-
1123 
-
1124 #else /* UNICODE */
-
1125 
-
1126 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1127 #define brlapi_writeText(cursor, str) brlapi_writeTextWin(cursor, str, 0)
-
1128 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1129 #define brlapi__writeText(handle, cursor, str) brlapi__writeTextWin(handle, cursor, str, 0)
-
1130 
-
1131 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1132 #define brlapi_write(s) brlapi_writeWin(s, 0)
-
1133 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1134 #define brlapi__write(handle, s) brlapi__writeWin(handle, s, 0)
-
1135 
-
1136 #endif /* UNICODE */
-
1137 #endif /* BRLAPI_WIN32 */
-
1138 
-
1139 #ifndef BRLAPI_NO_DEPRECATED
-
1140 
-
1152 #define brlapi_settings_t brlapi_connectionSettings_t
-
1153 
-
1155 typedef struct {
-
1156  int displayNumber;
-
1157  unsigned int regionBegin;
-
1158  unsigned int regionSize;
-
1159  char *text;
-
1160  int textSize;
-
1161  unsigned char *attrAnd;
-
1162  unsigned char *attrOr;
-
1163  int cursor;
-
1164  char *charset;
-
1165 } brlapi_writeStruct;
-
1166 #define BRLAPI_WRITESTRUCT_INITIALIZER BRLAPI_WRITEARGUMENTS_INITIALIZER
-
1167 
-
1168 #define brl_keycode_t brlapi_keyCode_t
-
1169 #define brl_type_t brlapi_packetType_t
-
1170 
-
1171 #define BRLCOMMANDS NULL
-
1172 #define BRL_KEYCODE_MAX BRLAPI_KEY_MAX
-
1173 
-
1174 #ifndef BRLAPI_NO_SINGLE_SESSION
-
1175 #define brlapi_initializeConnection brlapi_openConnection
-
1176 #define brlapi_getTty brlapi_enterTtyMode
-
1177 #define brlapi_getTtyPath brlapi_enterTtyModeWithPath
-
1178 #define brlapi_leaveTty brlapi_leaveTtyMode
-
1179 #define brlapi_unignoreKeyRange brlapi_acceptKeyRange
-
1180 #define brlapi_unignoreKeySet brlapi_acceptKeySet
-
1181 #define brlapi_getRaw brlapi_enterRawMode
-
1182 #define brlapi_leaveRaw brlapi_leaveRawMode
-
1183 #define brlapi_suspend brlapi_suspendDriver
-
1184 #define brlapi_resume brlapi_resumeDriver
-
1185 #endif /* BRLAPI_NO_SINGLE_SESSION */
-
1186 
-
1187 #define BRLERR_SUCCESS BRLAPI_ERROR_SUCCESS
-
1188 #define BRLERR_NOMEM BRLAPI_ERROR_NOMEM
-
1189 #define BRLERR_TTYBUSY BRLAPI_ERROR_TTYBUSY
-
1190 #define BRLERR_DEVICEBUSY BRLAPI_ERROR_DEVICEBUSY
-
1191 #define BRLERR_UNKNOWN_INSTRUCTION BRLAPI_ERROR_UNKNOWN_INSTRUCTION
-
1192 #define BRLERR_ILLEGAL_INSTRUCTION BRLAPI_ERROR_ILLEGAL_INSTRUCTION
-
1193 #define BRLERR_INVALID_PARAMETER BRLAPI_ERROR_INVALID_PARAMETER
-
1194 #define BRLERR_INVALID_PACKET BRLAPI_ERROR_INVALID_PACKET
-
1195 #define BRLERR_CONNREFUSED BRLAPI_ERROR_CONNREFUSED
-
1196 #define BRLERR_OPNOTSUPP BRLAPI_ERROR_OPNOTSUPP
-
1197 #define BRLERR_GAIERR BRLAPI_ERROR_GAIERR
-
1198 #define BRLERR_LIBCERR BRLAPI_ERROR_LIBCERR
-
1199 #define BRLERR_UNKNOWNTTY BRLAPI_ERROR_UNKNOWNTTY
-
1200 #define BRLERR_PROTOCOL_VERSION BRLAPI_ERROR_PROTOCOL_VERSION
-
1201 #define BRLERR_EOF BRLAPI_ERROR_EOF
-
1202 #define BRLERR_EMPTYKEY BRLAPI_ERROR_EMPTYKEY
-
1203 #define BRLERR_DRIVERERROR BRLAPI_ERROR_DRIVERERROR
-
1204 
-
1206 #endif /* BRLAPI_NO_DEPRECATED */
-
1207 
-
1208 #ifdef __cplusplus
-
1209 }
-
1210 #endif /* __cplusplus */
+
1120 void BRLAPI_STDCALL brlapi_defaultExceptionHandler(int error, brlapi_packetType_t type, const void *packet, size_t size);
+
1121 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1122 void BRLAPI_STDCALL brlapi__defaultExceptionHandler(brlapi_handle_t *handle, int error, brlapi_packetType_t type, const void *packet, size_t size);
+
1123 
+
1126 /* Windows-specific tricks - don't look at this */
+
1127 #ifdef BRLAPI_WIN32
+
1128 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1129 int BRLAPI_STDCALL brlapi_writeTextWin(int cursor, const void *str, int wide);
+
1130 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1131 int BRLAPI_STDCALL brlapi__writeTextWin(brlapi_handle_t *handle, int cursor, const void *str, int wide);
+
1132 
+
1133 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1134 int BRLAPI_STDCALL brlapi_writeWin(const brlapi_writeArguments_t *s, int wide);
+
1135 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1136 int BRLAPI_STDCALL brlapi__writeWin(brlapi_handle_t *handle, const brlapi_writeArguments_t *s, int wide);
+
1137 
+
1138 #ifdef UNICODE
+
1139 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1140 #define brlapi_writeText(cursor, str) brlapi_writeTextWin(cursor, str, 1)
+
1141 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1142 #define brlapi__writeText(handle, cursor, str) brlapi__writeTextWin(handle, cursor, str, 1)
+
1143 
+
1144 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1145 #define brlapi_write(s) brlapi_writeWin(s, 1)
+
1146 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1147 #define brlapi__write(handle, s) brlapi__writeWin(handle, s, 1)
+
1148 
+
1149 #else /* UNICODE */
+
1150 
+
1151 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1152 #define brlapi_writeText(cursor, str) brlapi_writeTextWin(cursor, str, 0)
+
1153 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1154 #define brlapi__writeText(handle, cursor, str) brlapi__writeTextWin(handle, cursor, str, 0)
+
1155 
+
1156 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1157 #define brlapi_write(s) brlapi_writeWin(s, 0)
+
1158 #endif /* BRLAPI_NO_SINGLE_SESSION */
+
1159 #define brlapi__write(handle, s) brlapi__writeWin(handle, s, 0)
+
1160 
+
1161 #endif /* UNICODE */
+
1162 #endif /* BRLAPI_WIN32 */
+
1163 
+
1164 #ifndef BRLAPI_NO_DEPRECATED
+
1165 
+
1177 #define brlapi_settings_t brlapi_connectionSettings_t
+
1178 
+
1180 typedef struct {
+
1181  int displayNumber;
+
1182  unsigned int regionBegin;
+
1183  unsigned int regionSize;
+
1184  char *text;
+
1185  int textSize;
+
1186  unsigned char *attrAnd;
+
1187  unsigned char *attrOr;
+
1188  int cursor;
+
1189  char *charset;
+
1190 } brlapi_writeStruct;
+
1191 #define BRLAPI_WRITESTRUCT_INITIALIZER BRLAPI_WRITEARGUMENTS_INITIALIZER
+
1192 
+
1193 #define brl_keycode_t brlapi_keyCode_t
+
1194 #define brl_type_t brlapi_packetType_t
+
1195 
+
1196 #define BRLCOMMANDS NULL
+
1197 #define BRL_KEYCODE_MAX BRLAPI_KEY_MAX
+
1198 
+
1199 #ifndef BRLAPI_NO_SINGLE_SESSION
+
1200 #define brlapi_initializeConnection brlapi_openConnection
+
1201 #define brlapi_getTty brlapi_enterTtyMode
+
1202 #define brlapi_getTtyPath brlapi_enterTtyModeWithPath
+
1203 #define brlapi_leaveTty brlapi_leaveTtyMode
+
1204 #define brlapi_unignoreKeyRange brlapi_acceptKeyRange
+
1205 #define brlapi_unignoreKeySet brlapi_acceptKeySet
+
1206 #define brlapi_getRaw brlapi_enterRawMode
+
1207 #define brlapi_leaveRaw brlapi_leaveRawMode
+
1208 #define brlapi_suspend brlapi_suspendDriver
+
1209 #define brlapi_resume brlapi_resumeDriver
+
1210 #endif /* BRLAPI_NO_SINGLE_SESSION */
1211 
-
1212 #endif /* BRLAPI_INCLUDED */
+
1212 #define BRLERR_SUCCESS BRLAPI_ERROR_SUCCESS
+
1213 #define BRLERR_NOMEM BRLAPI_ERROR_NOMEM
+
1214 #define BRLERR_TTYBUSY BRLAPI_ERROR_TTYBUSY
+
1215 #define BRLERR_DEVICEBUSY BRLAPI_ERROR_DEVICEBUSY
+
1216 #define BRLERR_UNKNOWN_INSTRUCTION BRLAPI_ERROR_UNKNOWN_INSTRUCTION
+
1217 #define BRLERR_ILLEGAL_INSTRUCTION BRLAPI_ERROR_ILLEGAL_INSTRUCTION
+
1218 #define BRLERR_INVALID_PARAMETER BRLAPI_ERROR_INVALID_PARAMETER
+
1219 #define BRLERR_INVALID_PACKET BRLAPI_ERROR_INVALID_PACKET
+
1220 #define BRLERR_CONNREFUSED BRLAPI_ERROR_CONNREFUSED
+
1221 #define BRLERR_OPNOTSUPP BRLAPI_ERROR_OPNOTSUPP
+
1222 #define BRLERR_GAIERR BRLAPI_ERROR_GAIERR
+
1223 #define BRLERR_LIBCERR BRLAPI_ERROR_LIBCERR
+
1224 #define BRLERR_UNKNOWNTTY BRLAPI_ERROR_UNKNOWNTTY
+
1225 #define BRLERR_PROTOCOL_VERSION BRLAPI_ERROR_PROTOCOL_VERSION
+
1226 #define BRLERR_EOF BRLAPI_ERROR_EOF
+
1227 #define BRLERR_EMPTYKEY BRLAPI_ERROR_EMPTYKEY
+
1228 #define BRLERR_DRIVERERROR BRLAPI_ERROR_DRIVERERROR
+
1229 
+
1231 #endif /* BRLAPI_NO_DEPRECATED */
+
1232 
+
1233 #ifdef __cplusplus
+
1234 }
+
1235 #endif /* __cplusplus */
+
1236 
+
1237 #endif /* BRLAPI_INCLUDED */
diff --git a/Documents/BrlAPIref/html/brlapi__constants_8h_source.html b/Documents/BrlAPIref/html/brlapi__constants_8h_source.html index b20a0891fac2e071825ba88b5124ceeacd74a52a..1df13899d115729d3c1c54d516aa1d90ee2d9347 100644 --- a/Documents/BrlAPIref/html/brlapi__constants_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi__constants_8h_source.html @@ -54,7 +54,7 @@ Go to the documentation of this file.
1 /*
2  * libbrlapi - A library providing access to braille terminals for applications.
3  *
-
4  * Copyright (C) 2002-2017 by
+
4  * Copyright (C) 2002-2018 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff --git a/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html b/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html index 047bdb2d1744feec3f5e6963f395d81d4f7d0d7e..be5d84e6412430db8ec876fd65000fa2b2ffdb29 100644 --- a/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html @@ -54,7 +54,7 @@ Go to the documentation of this file.
1 /*
2  * libbrlapi - A library providing access to braille terminals for applications.
3  *
-
4  * Copyright (C) 2002-2017 by
+
4  * Copyright (C) 2002-2018 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff --git a/Documents/BrlAPIref/html/brlapi__protocol_8h.html b/Documents/BrlAPIref/html/brlapi__protocol_8h.html index 12dbd12f26bcc6179189a8d307f95255e5481787..04b6c2f34376a5dfaadfddcc7dcd0f06007312b3 100644 --- a/Documents/BrlAPIref/html/brlapi__protocol_8h.html +++ b/Documents/BrlAPIref/html/brlapi__protocol_8h.html @@ -99,6 +99,8 @@ Macros
+ + diff --git a/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html b/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html index f0e90acd07bd9d713362ccd544ad7209ee7d2c20..cc5a48c9dbec533fd999dbdf94ad5821a891d18c 100644 --- a/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html +++ b/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html @@ -54,7 +54,7 @@ Go to the documentation of this file.
1 /*
2  * libbrlapi - A library providing access to braille terminals for applications.
3  *
-
4  * Copyright (C) 2002-2017 by
+
4  * Copyright (C) 2002-2018 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
@@ -94,95 +94,96 @@
58 #define BRLAPI_PACKET_VERSION 'v'
59 #define BRLAPI_PACKET_AUTH 'a'
60 #define BRLAPI_PACKET_GETDRIVERNAME 'n'
-
61 #define BRLAPI_PACKET_GETDISPLAYSIZE 's'
-
62 #define BRLAPI_PACKET_ENTERTTYMODE 't'
-
63 #define BRLAPI_PACKET_SETFOCUS 'F'
-
64 #define BRLAPI_PACKET_LEAVETTYMODE 'L'
-
65 #define BRLAPI_PACKET_KEY 'k'
-
66 #define BRLAPI_PACKET_IGNOREKEYRANGES 'm'
-
67 #define BRLAPI_PACKET_ACCEPTKEYRANGES 'u'
-
68 #define BRLAPI_PACKET_WRITE 'w'
-
69 #define BRLAPI_PACKET_ENTERRAWMODE '*'
-
70 #define BRLAPI_PACKET_LEAVERAWMODE '#'
-
71 #define BRLAPI_PACKET_PACKET 'p'
-
72 #define BRLAPI_PACKET_ACK 'A'
-
73 #define BRLAPI_PACKET_ERROR 'e'
-
74 #define BRLAPI_PACKET_EXCEPTION 'E'
-
75 #define BRLAPI_PACKET_SUSPENDDRIVER 'S'
-
76 #define BRLAPI_PACKET_RESUMEDRIVER 'R'
-
79 #define BRLAPI_DEVICE_MAGIC (0xdeadbeefL)
-
80 
-
82 typedef struct {
-
83  uint32_t size;
-
84  brlapi_packetType_t type;
-
85 } brlapi_header_t;
-
86 
-
88 #define BRLAPI_HEADERSIZE sizeof(brlapi_header_t)
-
89 
-
91 typedef struct {
-
92  uint32_t protocolVersion;
-
93 } brlapi_versionPacket_t;
-
94 
-
96 typedef struct {
-
97  uint32_t type;
-
98  unsigned char key;
-
99 } brlapi_authClientPacket_t;
-
100 
-
101 typedef struct {
-
102  uint32_t type[1];
-
103 } brlapi_authServerPacket_t;
-
104 
-
105 #define BRLAPI_AUTH_NONE 'N'
-
106 #define BRLAPI_AUTH_KEY 'K'
-
107 #define BRLAPI_AUTH_CRED 'C'
-
110 typedef struct {
-
111  uint32_t code;
-
112  brlapi_packetType_t type;
-
113  unsigned char packet;
-
114 } brlapi_errorPacket_t;
-
115 
-
117 typedef struct {
-
118  uint32_t magic;
-
119  unsigned char nameLength;
-
120  char name;
-
121 } brlapi_getDriverSpecificModePacket_t;
-
122 
-
124 #define BRLAPI_WF_DISPLAYNUMBER 0X01
-
125 #define BRLAPI_WF_REGION 0X02
-
126 #define BRLAPI_WF_TEXT 0X04
-
127 #define BRLAPI_WF_ATTR_AND 0X08
-
128 #define BRLAPI_WF_ATTR_OR 0X10
-
129 #define BRLAPI_WF_CURSOR 0X20
-
130 #define BRLAPI_WF_CHARSET 0X40
-
133 typedef struct {
-
134  uint32_t flags;
-
135  unsigned char data;
-
136 } brlapi_writeArgumentsPacket_t;
-
137 
-
140 typedef union {
-
141  unsigned char data[BRLAPI_MAXPACKETSIZE];
-
142  brlapi_versionPacket_t version;
-
143  brlapi_authClientPacket_t authClient;
-
144  brlapi_authServerPacket_t authServer;
-
145  brlapi_errorPacket_t error;
-
146  brlapi_getDriverSpecificModePacket_t getDriverSpecificMode;
-
147  brlapi_writeArgumentsPacket_t writeArguments;
-
148  uint32_t uint32;
-
149 } brlapi_packet_t;
-
150 
-
151 /* brlapi_writePacket */
-
167 ssize_t brlapi_writePacket(brlapi_fileDescriptor fd, brlapi_packetType_t type, const void *buf, size_t size);
-
168 
-
169 /* brlapi_readPacketHeader */
-
186 ssize_t brlapi_readPacketHeader(brlapi_fileDescriptor fd, brlapi_packetType_t *packetType);
-
187 
-
188 /* brlapi_readPacketContent */
-
209 ssize_t brlapi_readPacketContent(brlapi_fileDescriptor fd, size_t packetSize, void *buf, size_t bufSize);
-
210 
-
211 /* brlapi_readPacket */
-
233 ssize_t brlapi_readPacket(brlapi_fileDescriptor fd, brlapi_packetType_t *type, void *buf, size_t size);
-
234 
-
235 /* brlapi_fd_mutex */
+
61 #define BRLAPI_PACKET_GETMODELID 'd'
+
62 #define BRLAPI_PACKET_GETDISPLAYSIZE 's'
+
63 #define BRLAPI_PACKET_ENTERTTYMODE 't'
+
64 #define BRLAPI_PACKET_SETFOCUS 'F'
+
65 #define BRLAPI_PACKET_LEAVETTYMODE 'L'
+
66 #define BRLAPI_PACKET_KEY 'k'
+
67 #define BRLAPI_PACKET_IGNOREKEYRANGES 'm'
+
68 #define BRLAPI_PACKET_ACCEPTKEYRANGES 'u'
+
69 #define BRLAPI_PACKET_WRITE 'w'
+
70 #define BRLAPI_PACKET_ENTERRAWMODE '*'
+
71 #define BRLAPI_PACKET_LEAVERAWMODE '#'
+
72 #define BRLAPI_PACKET_PACKET 'p'
+
73 #define BRLAPI_PACKET_ACK 'A'
+
74 #define BRLAPI_PACKET_ERROR 'e'
+
75 #define BRLAPI_PACKET_EXCEPTION 'E'
+
76 #define BRLAPI_PACKET_SUSPENDDRIVER 'S'
+
77 #define BRLAPI_PACKET_RESUMEDRIVER 'R'
+
80 #define BRLAPI_DEVICE_MAGIC (0xdeadbeefL)
+
81 
+
83 typedef struct {
+
84  uint32_t size;
+
85  brlapi_packetType_t type;
+
86 } brlapi_header_t;
+
87 
+
89 #define BRLAPI_HEADERSIZE sizeof(brlapi_header_t)
+
90 
+
92 typedef struct {
+
93  uint32_t protocolVersion;
+
94 } brlapi_versionPacket_t;
+
95 
+
97 typedef struct {
+
98  uint32_t type;
+
99  unsigned char key;
+
100 } brlapi_authClientPacket_t;
+
101 
+
102 typedef struct {
+
103  uint32_t type[1];
+
104 } brlapi_authServerPacket_t;
+
105 
+
106 #define BRLAPI_AUTH_NONE 'N'
+
107 #define BRLAPI_AUTH_KEY 'K'
+
108 #define BRLAPI_AUTH_CRED 'C'
+
111 typedef struct {
+
112  uint32_t code;
+
113  brlapi_packetType_t type;
+
114  unsigned char packet;
+
115 } brlapi_errorPacket_t;
+
116 
+
118 typedef struct {
+
119  uint32_t magic;
+
120  unsigned char nameLength;
+
121  char name;
+
122 } brlapi_getDriverSpecificModePacket_t;
+
123 
+
125 #define BRLAPI_WF_DISPLAYNUMBER 0X01
+
126 #define BRLAPI_WF_REGION 0X02
+
127 #define BRLAPI_WF_TEXT 0X04
+
128 #define BRLAPI_WF_ATTR_AND 0X08
+
129 #define BRLAPI_WF_ATTR_OR 0X10
+
130 #define BRLAPI_WF_CURSOR 0X20
+
131 #define BRLAPI_WF_CHARSET 0X40
+
134 typedef struct {
+
135  uint32_t flags;
+
136  unsigned char data;
+
137 } brlapi_writeArgumentsPacket_t;
+
138 
+
141 typedef union {
+
142  unsigned char data[BRLAPI_MAXPACKETSIZE];
+
143  brlapi_versionPacket_t version;
+
144  brlapi_authClientPacket_t authClient;
+
145  brlapi_authServerPacket_t authServer;
+
146  brlapi_errorPacket_t error;
+
147  brlapi_getDriverSpecificModePacket_t getDriverSpecificMode;
+
148  brlapi_writeArgumentsPacket_t writeArguments;
+
149  uint32_t uint32;
+
150 } brlapi_packet_t;
+
151 
+
152 /* brlapi_writePacket */
+
168 ssize_t brlapi_writePacket(brlapi_fileDescriptor fd, brlapi_packetType_t type, const void *buf, size_t size);
+
169 
+
170 /* brlapi_readPacketHeader */
+
187 ssize_t brlapi_readPacketHeader(brlapi_fileDescriptor fd, brlapi_packetType_t *packetType);
+
188 
+
189 /* brlapi_readPacketContent */
+
210 ssize_t brlapi_readPacketContent(brlapi_fileDescriptor fd, size_t packetSize, void *buf, size_t bufSize);
+
211 
+
212 /* brlapi_readPacket */
+
234 ssize_t brlapi_readPacket(brlapi_fileDescriptor fd, brlapi_packetType_t *type, void *buf, size_t size);
+
235 
+
236 /* brlapi_fd_mutex */
262 #ifdef __MINGW32__
263 #include <windows.h>
264 extern HANDLE brlapi_fd_mutex;
diff --git a/Documents/BrlAPIref/html/globals.html b/Documents/BrlAPIref/html/globals.html index aba63abf2ee28402a9038cfd082658875471608d..58ae8e74a2dfc5632654875e2868382de459b81d 100644 --- a/Documents/BrlAPIref/html/globals.html +++ b/Documents/BrlAPIref/html/globals.html @@ -76,7 +76,7 @@ : brlapi.h
  • brlapi__acceptKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi__acceptKeys() : brlapi.h @@ -105,11 +105,14 @@
  • brlapi__getDriverName() : brlapi.h
    • +
  • brlapi__getModelIdentifier() +: brlapi.h +
  • brlapi__ignoreAllKeys : brlapi.h
  • brlapi__ignoreKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi__ignoreKeys() : brlapi.h @@ -163,7 +166,7 @@ : brlapi.h
  • brlapi_acceptKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi_acceptKeys() : brlapi.h @@ -195,6 +198,12 @@
  • BRLAPI_DEFAUTH : brlapi.h
    • +
  • BRLAPI_DEFAUTH_KEYFILE +: brlapi.h +
    • +
  • BRLAPI_DEFAUTH_POLKIT +: brlapi.h +
  • brlapi_describeKeyCode() : brlapi.h
    • @@ -342,6 +351,9 @@
  • brlapi_getHandleSize() : brlapi.h
    • +
  • brlapi_getModelIdentifier() +: brlapi.h +
  • brlapi_getPacketTypeName() : brlapi.h
    • @@ -364,7 +376,7 @@ : brlapi.h
  • brlapi_ignoreKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi_ignoreKeys() : brlapi.h @@ -1074,6 +1086,9 @@
  • BRLAPI_PACKET_GETDRIVERNAME : brlapi_protocol.h
    • +
  • BRLAPI_PACKET_GETMODELID +: brlapi_protocol.h +
  • BRLAPI_PACKET_IGNOREKEYRANGES : brlapi_protocol.h
    • diff --git a/Documents/BrlAPIref/html/globals_defs.html b/Documents/BrlAPIref/html/globals_defs.html index 831a089a96bc2edbf1c2098de8e38bdeeacf47b6..af506bc6f56402c2ef03bd8539521c7f522213a1 100644 --- a/Documents/BrlAPIref/html/globals_defs.html +++ b/Documents/BrlAPIref/html/globals_defs.html @@ -102,6 +102,12 @@
  • BRLAPI_DEFAUTH : brlapi.h
    • +
  • BRLAPI_DEFAUTH_KEYFILE +: brlapi.h +
    • +
  • BRLAPI_DEFAUTH_POLKIT +: brlapi.h +
  • BRLAPI_DEVICE_MAGIC : brlapi_protocol.h
    • @@ -915,6 +921,9 @@
  • BRLAPI_PACKET_GETDRIVERNAME : brlapi_protocol.h
    • +
  • BRLAPI_PACKET_GETMODELID +: brlapi_protocol.h +
  • BRLAPI_PACKET_IGNOREKEYRANGES : brlapi_protocol.h
    • diff --git a/Documents/BrlAPIref/html/globals_func.html b/Documents/BrlAPIref/html/globals_func.html index 8fea5cb116e8329cc77cee66aa6f2945cbe239d5..e55956345790e5607994eab4f562d642012c41f7 100644 --- a/Documents/BrlAPIref/html/globals_func.html +++ b/Documents/BrlAPIref/html/globals_func.html @@ -66,7 +66,7 @@ : brlapi.h
  • brlapi__acceptKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi__acceptKeys() : brlapi.h @@ -92,11 +92,14 @@
  • brlapi__getDriverName() : brlapi.h
    • +
  • brlapi__getModelIdentifier() +: brlapi.h +
  • brlapi__ignoreAllKeys() : brlapi.h
  • brlapi__ignoreKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi__ignoreKeys() : brlapi.h @@ -147,7 +150,7 @@ : brlapi.h
  • brlapi_acceptKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi_acceptKeys() : brlapi.h @@ -185,11 +188,14 @@
  • brlapi_getHandleSize() : brlapi.h
    • +
  • brlapi_getModelIdentifier() +: brlapi.h +
  • brlapi_getPacketTypeName() : brlapi.h
  • brlapi_ignoreKeyRanges() -: brlapi.h +: brlapi.h
  • brlapi_ignoreKeys() : brlapi.h diff --git a/Documents/BrlAPIref/html/group__brlapi__connection.html b/Documents/BrlAPIref/html/group__brlapi__connection.html index 797e001112c2a2638b0e0d49d8f2d8bda7b82db4..257dfde88fee3398373a7f6438910a54aa39b838 100644 --- a/Documents/BrlAPIref/html/group__brlapi__connection.html +++ b/Documents/BrlAPIref/html/group__brlapi__connection.html @@ -65,7 +65,11 @@ Macros
    • - + + + + + @@ -110,12 +114,36 @@ Functions

    Macros

    #define BRLAPI_RELEASE   "0.6.6"
    #define BRLAPI_RELEASE   "0.6.7"
     
    #define BRLAPI_MAJOR   0
     
    #define BRLAPI_MINOR   6
     
    #define BRLAPI_REVISION   6
    #define BRLAPI_REVISION   7
     
    #define BRLAPI_STDCALL
     
     
    #define BRLAPI_AUTHKEYFILE   "brlapi.key"
     
    #define BRLAPI_DEFAUTH   "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
    #define BRLAPI_DEFAUTH_KEYFILE   "keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
     
    #define BRLAPI_DEFAUTH_POLKIT   ""
     
    #define BRLAPI_DEFAUTH   BRLAPI_DEFAUTH_KEYFILE BRLAPI_DEFAUTH_POLKIT
     
    #define BRLAPI_SETTINGS_INITIALIZER   { NULL, NULL }
     
     
    int BRLAPI_STDCALL brlapi__getDriverName (brlapi_handle_t *handle, char *buffer, size_t size)
     
    int BRLAPI_STDCALL brlapi_getModelIdentifier (char *buffer, size_t size)
     
    int BRLAPI_STDCALL brlapi__getModelIdentifier (brlapi_handle_t *handle, char *buffer, size_t size)
     
    int BRLAPI_STDCALL brlapi_getDisplaySize (unsigned int *x, unsigned int *y)
     
    int BRLAPI_STDCALL brlapi__getDisplaySize (brlapi_handle_t *handle, unsigned int *x, unsigned int *y)
     
    int BRLAPI_STDCALL brlapi__acceptAllKeys (brlapi_handle_t *handle)
     
    int BRLAPI_STDCALL brlapi_ignoreKeyRanges (brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi__ignoreKeyRanges (brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi_acceptKeyRanges (brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi__acceptKeyRanges (brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi_ignoreKeyRanges (const brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi__ignoreKeyRanges (brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi_acceptKeyRanges (const brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi__acceptKeyRanges (brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count)
     
    int BRLAPI_STDCALL brlapi_enterRawMode (const char *driver)
     
    int BRLAPI_STDCALL brlapi__enterRawMode (brlapi_handle_t *handle, const char *driver)
     
    #define BRLAPI_PACKET_GETDRIVERNAME   'n'
     
    #define BRLAPI_PACKET_GETMODELID   'd'
     
    #define BRLAPI_PACKET_GETDISPLAYSIZE   's'
     
    #define BRLAPI_PACKET_ENTERTTYMODE   't'
     
    #define BRLAPI_AUTHKEYFILE   "brlapi.key"
     
    #define BRLAPI_DEFAUTH   "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
    #define BRLAPI_DEFAUTH_KEYFILE   "keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
     
    #define BRLAPI_DEFAUTH_POLKIT   ""
     
    #define BRLAPI_DEFAUTH   BRLAPI_DEFAUTH_KEYFILE BRLAPI_DEFAUTH_POLKIT
     
    #define BRLAPI_SETTINGS_INITIALIZER   { NULL, NULL }
     
    - + + +
    #define BRLAPI_DEFAUTH   "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE#define BRLAPI_DEFAUTH   BRLAPI_DEFAUTH_KEYFILE BRLAPI_DEFAUTH_POLKIT
    +
    + +
    + + +
    +
    + + +
    #define BRLAPI_DEFAUTH_KEYFILE   "keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE

    Default authorization setting

    +
    +
    + +
    +
    + + + + +
    #define BRLAPI_DEFAUTH_POLKIT   ""
    +
    +
    diff --git a/Documents/BrlAPIref/html/group__brlapi__info.html b/Documents/BrlAPIref/html/group__brlapi__info.html index a4281905643a3b3cf2a5acdac431840d4027b80e..f0c6877d7c6eae93ed4dc877d276c5846b4e1d61 100644 --- a/Documents/BrlAPIref/html/group__brlapi__info.html +++ b/Documents/BrlAPIref/html/group__brlapi__info.html @@ -59,6 +59,10 @@ Functions   int BRLAPI_STDCALL brlapi__getDriverName (brlapi_handle_t *handle, char *buffer, size_t size)   +int BRLAPI_STDCALL brlapi_getModelIdentifier (char *buffer, size_t size) +  +int BRLAPI_STDCALL brlapi__getModelIdentifier (brlapi_handle_t *handle, char *buffer, size_t size) +  int BRLAPI_STDCALL brlapi_getDisplaySize (unsigned int *x, unsigned int *y)   int BRLAPI_STDCALL brlapi__getDisplaySize (brlapi_handle_t *handle, unsigned int *x, unsigned int *y) @@ -144,6 +148,38 @@ Functions
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    int BRLAPI_STDCALL brlapi__getModelIdentifier (brlapi_handle_t * handle,
    char * buffer,
    size_t size 
    )
    +
    +
    @@ -197,15 +233,51 @@ Functions

    Return the complete name of the driver used by brltty

    -

    This function fills its argument with the whole name of the braille terminal if available, terminated with a '\0'.

    +

    This function fills its argument with the whole name of the braille driver if available, terminated with a '\0'.

    Parameters
    - +
    bufferis the buffer given by the application;
    bufferis the buffer provided by the application;
    sizeis the maximum size for the name buffer.
    -
    Returns
    -1 on error, or a positive value giving the size of the needed buffer, if the supplied one is to small (same as snprintf()).
    +
    Returns
    -1 on error, or a positive value giving the size of the needed buffer, if the supplied one is too small (same as snprintf()).
    + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + +
    int BRLAPI_STDCALL brlapi_getModelIdentifier (char * buffer,
    size_t size 
    )
    +
    +

    Return an identifier for the device model used by brltty

    +

    This function fills its argument with the whole identifier of the braille device model if available, terminated with a '\0'.

    +
    Parameters
    + + + +
    bufferis the buffer given by the application;
    sizeis the maximum size for the identifier buffer.
    +
    +
    +
    Returns
    -1 on error, or a positive value giving the size of the needed buffer, if the supplied one is too small (same as snprintf()).
    diff --git a/Documents/BrlAPIref/html/group__brlapi__keys.html b/Documents/BrlAPIref/html/group__brlapi__keys.html index 688209de896cb874310a0c6db63f3aa932468e1c..f4be75c81e2f326f7b30659856a9d0e9ea1510f5 100644 --- a/Documents/BrlAPIref/html/group__brlapi__keys.html +++ b/Documents/BrlAPIref/html/group__brlapi__keys.html @@ -107,14 +107,14 @@ Functions   int BRLAPI_STDCALL brlapi__acceptAllKeys (brlapi_handle_t *handle)   -int BRLAPI_STDCALL brlapi_ignoreKeyRanges (brlapi_range_t ranges[], unsigned int count) -  -int BRLAPI_STDCALL brlapi__ignoreKeyRanges (brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count) -  -int BRLAPI_STDCALL brlapi_acceptKeyRanges (brlapi_range_t ranges[], unsigned int count) -  -int BRLAPI_STDCALL brlapi__acceptKeyRanges (brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count) -  +int BRLAPI_STDCALL brlapi_ignoreKeyRanges (const brlapi_range_t ranges[], unsigned int count) +  +int BRLAPI_STDCALL brlapi__ignoreKeyRanges (brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count) +  +int BRLAPI_STDCALL brlapi_acceptKeyRanges (const brlapi_range_t ranges[], unsigned int count) +  +int BRLAPI_STDCALL brlapi__acceptKeyRanges (brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count) + 

    Detailed Description

    Once brlapi_enterTtyMode() has been called, the application can call brlapi_readKey() to read key presses. Either key codes (see Types and Defines fore BrlAPI Key Codes) or commands will be returned, depending on parameters given to brlapi_enterTtyMode().

    @@ -250,7 +250,7 @@ Functions - +
    @@ -263,7 +263,7 @@ Functions - + @@ -336,7 +336,7 @@ Functions - +
    brlapi_range_t const brlapi_range_t  ranges[],
    @@ -349,7 +349,7 @@ Functions - + @@ -438,14 +438,14 @@ Functions - +
    brlapi_range_t const brlapi_range_t  ranges[],
    - + @@ -587,14 +587,14 @@ Functions - +
    int BRLAPI_STDCALL brlapi_acceptKeyRanges (brlapi_range_t const brlapi_range_t  ranges[],
    - + diff --git a/Documents/BrlAPIref/html/group__brlapi__protocol.html b/Documents/BrlAPIref/html/group__brlapi__protocol.html index 41e9dba4fa1709bf421bad0c8bd0752e8615fdd5..f9719557ed7d53c14dda1832705bd08f12c6256c 100644 --- a/Documents/BrlAPIref/html/group__brlapi__protocol.html +++ b/Documents/BrlAPIref/html/group__brlapi__protocol.html @@ -81,6 +81,8 @@ Macros + + @@ -350,6 +352,19 @@ Variables

    Ask which driver is used

    +
    + + +
    +
    +
    int BRLAPI_STDCALL brlapi_ignoreKeyRanges (brlapi_range_t const brlapi_range_t  ranges[],
     
    #define BRLAPI_PACKET_GETDRIVERNAME   'n'
     
    #define BRLAPI_PACKET_GETMODELID   'd'
     
    #define BRLAPI_PACKET_GETDISPLAYSIZE   's'
     
    #define BRLAPI_PACKET_ENTERTTYMODE   't'
    + + + +
    #define BRLAPI_PACKET_GETMODELID   'd'
    +
    +

    Ask which model is used

    +
    @@ -770,7 +785,6 @@ Variables
  • brlapi_leaveRawMode()
  • brlapi_sendRaw()
  • brlapi_recvRaw()
    • -
  • brlapi_getDriverId()
  • brlapi_getDriverName()
  • brlapi_getDisplaySize()
  • brlapi_enterTtyMode()
    • diff --git a/Documents/BrlAPIref/html/group__brlapi__version.html b/Documents/BrlAPIref/html/group__brlapi__version.html index 9a2f50e40070182e24303041b72d112d9556af68..cf4e5fdd337ff25c8df6f660b73c427c4953c33b 100644 --- a/Documents/BrlAPIref/html/group__brlapi__version.html +++ b/Documents/BrlAPIref/html/group__brlapi__version.html @@ -46,13 +46,13 @@ - + - +

    Macros

    #define BRLAPI_RELEASE   "0.6.6"
    #define BRLAPI_RELEASE   "0.6.7"
     
    #define BRLAPI_MAJOR   0
     
    #define BRLAPI_MINOR   6
     
    #define BRLAPI_REVISION   6
    #define BRLAPI_REVISION   7
     

    Detailed Description

    @@ -88,7 +88,7 @@ Macros
    - +
    #define BRLAPI_RELEASE   "0.6.6"#define BRLAPI_RELEASE   "0.6.7"
    @@ -101,7 +101,7 @@ Macros
    - +
    #define BRLAPI_REVISION   6#define BRLAPI_REVISION   7
    diff --git a/Documents/BrlAPIref/html/group__brlapi__write.html b/Documents/BrlAPIref/html/group__brlapi__write.html index c41a804e980edd7f41bc50a775bb61979f75efbf..07d7bbd25abfea3a5e4f4103a007c853d385baa9 100644 --- a/Documents/BrlAPIref/html/group__brlapi__write.html +++ b/Documents/BrlAPIref/html/group__brlapi__write.html @@ -353,7 +353,7 @@ Text is translated by the server one to one, by just using a simple wchar_t to p

    Write the given \0-terminated string to the braille display

    -

    If the string is too long, it is truncated. If it's too short, it is padded with spaces. The text is assumed to be in the current locale charset, or latin1 if locales have not been initialized. To initialize locales, use setlocale(3).

    +

    If the string is too long, it is truncated. If it's too short, it is padded with spaces. The text is assumed to be in the current locale charset set by setlocale(3) if it was called, or the locale charset from the locale environment variables if setlocale(3) was not called.

    Parameters
    diff --git a/Documents/BrlAPIref/man/man3/BRLAPI_DEFAUTH_KEYFILE.3 b/Documents/BrlAPIref/man/man3/BRLAPI_DEFAUTH_KEYFILE.3 new file mode 100644 index 0000000000000000000000000000000000000000..246c55313f72699bc6fdccdfe90257e8c5514855 --- /dev/null +++ b/Documents/BrlAPIref/man/man3/BRLAPI_DEFAUTH_KEYFILE.3 @@ -0,0 +1 @@ +.so man3/brlapi_connection.3 diff --git a/Documents/BrlAPIref/man/man3/BRLAPI_DEFAUTH_POLKIT.3 b/Documents/BrlAPIref/man/man3/BRLAPI_DEFAUTH_POLKIT.3 new file mode 100644 index 0000000000000000000000000000000000000000..246c55313f72699bc6fdccdfe90257e8c5514855 --- /dev/null +++ b/Documents/BrlAPIref/man/man3/BRLAPI_DEFAUTH_POLKIT.3 @@ -0,0 +1 @@ +.so man3/brlapi_connection.3 diff --git a/Documents/BrlAPIref/man/man3/BRLAPI_PACKET_GETMODELID.3 b/Documents/BrlAPIref/man/man3/BRLAPI_PACKET_GETMODELID.3 new file mode 100644 index 0000000000000000000000000000000000000000..e44f63f4739d23755a70e3cee8f3ff9194b737a3 --- /dev/null +++ b/Documents/BrlAPIref/man/man3/BRLAPI_PACKET_GETMODELID.3 @@ -0,0 +1 @@ +.so man3/brlapi_protocol.3 diff --git a/Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 b/Documents/BrlAPIref/man/man3/_tmp_mktar.Mu3gIQ_brltty-5.6_Programs_.3 similarity index 82% rename from Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 rename to Documents/BrlAPIref/man/man3/_tmp_mktar.Mu3gIQ_brltty-5.6_Programs_.3 index dc800211f76a70740d9a574c4d43e200d7fc4cd5..bd87ef8b64342bdae33b3221054f77a8dd59ec00 100644 --- a/Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 +++ b/Documents/BrlAPIref/man/man3/_tmp_mktar.Mu3gIQ_brltty-5.6_Programs_.3 @@ -1,4 +1,4 @@ -.TH "Programs Directory Reference" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Programs Directory Reference" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi.h.3 b/Documents/BrlAPIref/man/man3/brlapi.h.3 index b193320b8c53eef0724df67730ca45623b7aad01..6ed0f9309d2f2ac0beee7b7ef7fcb71caa0f67a6 100644 --- a/Documents/BrlAPIref/man/man3/brlapi.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi.h" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -52,7 +52,7 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .in +1c .ti -1c -.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.6'" +.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.7'" .br .ti -1c .RI "#define \fBBRLAPI_MAJOR\fP 0" @@ -61,7 +61,7 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .RI "#define \fBBRLAPI_MINOR\fP 6" .br .ti -1c -.RI "#define \fBBRLAPI_REVISION\fP 6" +.RI "#define \fBBRLAPI_REVISION\fP 7" .br .ti -1c .RI "#define \fBBRLAPI_STDCALL\fP" @@ -82,7 +82,13 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .RI "#define \fBBRLAPI_AUTHKEYFILE\fP 'brlapi\&.key'" .br .ti -1c -.RI "#define \fBBRLAPI_DEFAUTH\fP 'polkit+keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" +.RI "#define \fBBRLAPI_DEFAUTH_KEYFILE\fP 'keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" +.br +.ti -1c +.RI "#define \fBBRLAPI_DEFAUTH_POLKIT\fP ''" +.br +.ti -1c +.RI "#define \fBBRLAPI_DEFAUTH\fP \fBBRLAPI_DEFAUTH_KEYFILE\fP \fBBRLAPI_DEFAUTH_POLKIT\fP" .br .ti -1c .RI "#define \fBBRLAPI_SETTINGS_INITIALIZER\fP { NULL, NULL }" @@ -344,6 +350,12 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__getDriverName\fP (\fBbrlapi_handle_t\fP *handle, char *buffer, size_t size)" .br .ti -1c +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_getModelIdentifier\fP (char *buffer, size_t size)" +.br +.ti -1c +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__getModelIdentifier\fP (\fBbrlapi_handle_t\fP *handle, char *buffer, size_t size)" +.br +.ti -1c .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_getDisplaySize\fP (unsigned int *x, unsigned int *y)" .br .ti -1c @@ -428,16 +440,16 @@ Types, defines and functions prototypes for \fIBrlAPI's\fP library\&. .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__acceptAllKeys\fP (\fBbrlapi_handle_t\fP *handle)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_ignoreKeyRanges\fP (\fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_ignoreKeyRanges\fP (const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__ignoreKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__ignoreKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_acceptKeyRanges\fP (\fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_acceptKeyRanges\fP (const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__acceptKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__acceptKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_enterRawMode\fP (const char *driver)" diff --git a/Documents/BrlAPIref/man/man3/brlapi__getModelIdentifier.3 b/Documents/BrlAPIref/man/man3/brlapi__getModelIdentifier.3 new file mode 100644 index 0000000000000000000000000000000000000000..5dcc662448ca1b1d77c31a117c3ce09f52762b95 --- /dev/null +++ b/Documents/BrlAPIref/man/man3/brlapi__getModelIdentifier.3 @@ -0,0 +1 @@ +.so man3/brlapi_info.3 diff --git a/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 index c0f263d927227ac61682cccd5660b75580fb7a41..8a77c421d17a33a9225aaf2e8c3a2fd7d1455004 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_authClientPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_authClientPacket_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 index 871319d1efac3ae62face4fc945e52e234217537..286b7b1301ec9c9725b02563cebe6773918892ff 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_authServerPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_authServerPacket_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_connection.3 b/Documents/BrlAPIref/man/man3/brlapi_connection.3 index aa6c95a2edd731414610055e535ff94c1fe0b442..1cc020620143800a5fec016c193924d361bea92b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_connection.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_connection.3 @@ -1,4 +1,4 @@ -.TH "Connecting to BrlAPI" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Connecting to BrlAPI" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,13 @@ Connecting to BrlAPI \- .RI "#define \fBBRLAPI_AUTHKEYFILE\fP 'brlapi\&.key'" .br .ti -1c -.RI "#define \fBBRLAPI_DEFAUTH\fP 'polkit+keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" +.RI "#define \fBBRLAPI_DEFAUTH_KEYFILE\fP 'keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" +.br +.ti -1c +.RI "#define \fBBRLAPI_DEFAUTH_POLKIT\fP ''" +.br +.ti -1c +.RI "#define \fBBRLAPI_DEFAUTH\fP \fBBRLAPI_DEFAUTH_KEYFILE\fP \fBBRLAPI_DEFAUTH_POLKIT\fP" .br .ti -1c .RI "#define \fBBRLAPI_SETTINGS_INITIALIZER\fP { NULL, NULL }" @@ -72,8 +78,12 @@ Before calling any other function of the library, calling \fBbrlapi_openConnecti Default name of the file containing \fIBrlAPI\fP 's authorization key .PP This name is relative to BRLAPI_ETCDIR -.SS "#define BRLAPI_DEFAUTH 'polkit+keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" +.SS "#define BRLAPI_DEFAUTH \fBBRLAPI_DEFAUTH_KEYFILE\fP \fBBRLAPI_DEFAUTH_POLKIT\fP" + +.SS "#define BRLAPI_DEFAUTH_KEYFILE 'keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" Default authorization setting +.SS "#define BRLAPI_DEFAUTH_POLKIT ''" + .SS "#define BRLAPI_ETCDIR '/etc'" \fIbrltty\fP 's settings directory .PP diff --git a/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 b/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 index 6bd27ea7b6b01e00ead09049bd57b3239982927e..ca5cf77ae3abe352f3d7e72cfae259df0164c68d 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_connectionSettings_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_connectionSettings_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 b/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 index bd3dc021fa8704c36ab3943bd3b50ff674bb6506..fd0ec72f95c030b3e2c4e95fecdc357e966094d8 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi_constants.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_constants.h" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 b/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 index 4bd7f6731422f99697ffcbc8bf416d372cf11cc2..8b11c49f693300b668814ac52c4970586a34e746 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 @@ -1,4 +1,4 @@ -.TH "Deprecated names" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Deprecated names" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 b/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 index fdba5378ae07566dc7d99335a3cb7d6b560aa287..e243c837366370d98c36d94bdf46eee6063a304b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_describedKeyCode_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_describedKeyCode_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 b/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 index 7b34c3da48d3b6776b064babe2de441cd00db111..2254e4427b8f0bf9bcbf80682fe7bbbfd48622bd 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 @@ -1,4 +1,4 @@ -.TH "Driver-Specific modes" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Driver-Specific modes" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_error.3 b/Documents/BrlAPIref/man/man3/brlapi_error.3 index 599b730397b8ad53513890294ef38c7467e787e8..05ef75f22ce20dffe9ed2f8a4aafcc491c57aa3a 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_error.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_error.3 @@ -1,4 +1,4 @@ -.TH "Error handling" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Error handling" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 index 76ea9293d2e37b7e182211a127438d40d8252f78..eb3a5c60439533a2a91ea2b2ceb4a27916e76050 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_errorPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_errorPacket_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_error_t.3 b/Documents/BrlAPIref/man/man3/brlapi_error_t.3 index f83a9b48ad4c25b05ec1a9743c83d2cd961d5574..c42fa557d32b4904ae12469e56e2f91d6ece290b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_error_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_error_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_error_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_error_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 b/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 index 37e438b45a38f285f9f05b7d104c47d2a60d4ad6..5b1e330815aea3e47bde125646d41db8a4271cd8 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_expandedKeyCode_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_expandedKeyCode_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 index 69b40429c7f7b7cbf66e397c50e4199bc1f0acc1..31190e4adfe101da1ff3a1a248d5aa40011fcf3b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_getDriverSpecificModePacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_getDriverSpecificModePacket_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_getModelIdentifier.3 b/Documents/BrlAPIref/man/man3/brlapi_getModelIdentifier.3 new file mode 100644 index 0000000000000000000000000000000000000000..5dcc662448ca1b1d77c31a117c3ce09f52762b95 --- /dev/null +++ b/Documents/BrlAPIref/man/man3/brlapi_getModelIdentifier.3 @@ -0,0 +1 @@ +.so man3/brlapi_info.3 diff --git a/Documents/BrlAPIref/man/man3/brlapi_handles.3 b/Documents/BrlAPIref/man/man3/brlapi_handles.3 index 31acad8244453140e7a120836c27e4f37ec30c05..24c23dfae11dee4c3538e37b2b6292dd2023a780 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_handles.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_handles.3 @@ -1,4 +1,4 @@ -.TH "BrlAPI handles" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "BrlAPI handles" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_header_t.3 b/Documents/BrlAPIref/man/man3/brlapi_header_t.3 index 8871c144537c7d5d804843c1c3bf211145b045c1..16360715380e4ad574b3c3143d3204db888bae94 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_header_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_header_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_header_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_header_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_info.3 b/Documents/BrlAPIref/man/man3/brlapi_info.3 index f495c99d86a3ddeb7e7507daaf39079a65ab5e7e..42fbe0119c96f5306636cbb751c3dce313ed2309 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_info.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_info.3 @@ -1,4 +1,4 @@ -.TH "Getting Terminal information" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Getting Terminal information" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -23,6 +23,12 @@ How to get information about the connected Terminal\&. .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__getDriverName\fP (\fBbrlapi_handle_t\fP *handle, char *buffer, size_t size)" .br .ti -1c +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_getModelIdentifier\fP (char *buffer, size_t size)" +.br +.ti -1c +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__getModelIdentifier\fP (\fBbrlapi_handle_t\fP *handle, char *buffer, size_t size)" +.br +.ti -1c .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_getDisplaySize\fP (unsigned int *x, unsigned int *y)" .br .ti -1c @@ -44,23 +50,43 @@ Maximum name length for names embeded in BrlAPI packets, not counting any termin .SS "int \fBBRLAPI_STDCALL\fP brlapi__getDriverName (\fBbrlapi_handle_t\fP *handle, char *buffer, size_tsize)" +.SS "int \fBBRLAPI_STDCALL\fP brlapi__getModelIdentifier (\fBbrlapi_handle_t\fP *handle, char *buffer, size_tsize)" + .SS "int \fBBRLAPI_STDCALL\fP brlapi_getDisplaySize (unsigned int *x, unsigned int *y)" Return the size of the braille display .SS "int \fBBRLAPI_STDCALL\fP brlapi_getDriverName (char *buffer, size_tsize)" Return the complete name of the driver used by \fIbrltty\fP .PP -This function fills its argument with the whole name of the braille terminal if available, terminated with a '\\0'\&. +This function fills its argument with the whole name of the braille driver if available, terminated with a '\\0'\&. .PP \fBParameters:\fP .RS 4 -\fIbuffer\fP is the buffer given by the application; +\fIbuffer\fP is the buffer provided by the application; .br \fIsize\fP is the maximum size for the name buffer\&. .RE .PP \fBReturns:\fP .RS 4 --1 on error, or a positive value giving the size of the needed buffer, if the supplied one is to small (same as snprintf())\&. +-1 on error, or a positive value giving the size of the needed buffer, if the supplied one is too small (same as snprintf())\&. +.RE +.PP + +.SS "int \fBBRLAPI_STDCALL\fP brlapi_getModelIdentifier (char *buffer, size_tsize)" +Return an identifier for the device model used by \fIbrltty\fP +.PP +This function fills its argument with the whole identifier of the braille device model if available, terminated with a '\\0'\&. +.PP +\fBParameters:\fP +.RS 4 +\fIbuffer\fP is the buffer given by the application; +.br +\fIsize\fP is the maximum size for the identifier buffer\&. +.RE +.PP +\fBReturns:\fP +.RS 4 +-1 on error, or a positive value giving the size of the needed buffer, if the supplied one is too small (same as snprintf())\&. .RE .PP diff --git a/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 b/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 index 4ed3911c128c571a547e99a58620d3968ef845fb..94f8bcc08b0b394499930372b46346aa4de293b6 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 @@ -1,4 +1,4 @@ -.TH "Types and Defines fore BrlAPI Key Codes" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Types and Defines fore BrlAPI Key Codes" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 b/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 index 0d097439f507a90b2998fae03f1021bca369a726..5ee555b7c29891e2042ff7b302812a90c0104bbc 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi_keycodes.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_keycodes.h" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_keys.3 b/Documents/BrlAPIref/man/man3/brlapi_keys.3 index 811cda1142e5641a47e0c7b2ef2d000c94ffe4eb..9c5366601099035566ff5a31e0285a7af039d338 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_keys.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_keys.3 @@ -1,4 +1,4 @@ -.TH "Reading key presses" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Reading key presses" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -79,16 +79,16 @@ How to read key presses from the braille terminal\&. .RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__acceptAllKeys\fP (\fBbrlapi_handle_t\fP *handle)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_ignoreKeyRanges\fP (\fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_ignoreKeyRanges\fP (const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__ignoreKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__ignoreKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_acceptKeyRanges\fP (\fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi_acceptKeyRanges\fP (const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .ti -1c -.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__acceptKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_range_t\fP ranges[], unsigned int count)" +.RI "int \fBBRLAPI_STDCALL\fP \fBbrlapi__acceptKeyRanges\fP (\fBbrlapi_handle_t\fP *handle, const \fBbrlapi_range_t\fP ranges[], unsigned int count)" .br .in -1c .SH "Detailed Description" @@ -140,19 +140,19 @@ a given key code .PP .SS "int \fBBRLAPI_STDCALL\fP brlapi__acceptAllKeys (\fBbrlapi_handle_t\fP *handle)" -.SS "int \fBBRLAPI_STDCALL\fP brlapi__acceptKeyRanges (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_range_t\fPranges[], unsigned intcount)" +.SS "int \fBBRLAPI_STDCALL\fP brlapi__acceptKeyRanges (\fBbrlapi_handle_t\fP *handle, const \fBbrlapi_range_t\fPranges[], unsigned intcount)" .SS "int \fBBRLAPI_STDCALL\fP brlapi__acceptKeys (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_rangeType_t\fPtype, const \fBbrlapi_keyCode_t\fPkeys[], unsigned intcount)" .SS "int \fBBRLAPI_STDCALL\fP brlapi__ignoreAllKeys (\fBbrlapi_handle_t\fP *handle)" -.SS "int \fBBRLAPI_STDCALL\fP brlapi__ignoreKeyRanges (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_range_t\fPranges[], unsigned intcount)" +.SS "int \fBBRLAPI_STDCALL\fP brlapi__ignoreKeyRanges (\fBbrlapi_handle_t\fP *handle, const \fBbrlapi_range_t\fPranges[], unsigned intcount)" .SS "int \fBBRLAPI_STDCALL\fP brlapi__ignoreKeys (\fBbrlapi_handle_t\fP *handle, \fBbrlapi_rangeType_t\fPtype, const \fBbrlapi_keyCode_t\fPkeys[], unsigned intcount)" .SS "int \fBBRLAPI_STDCALL\fP brlapi__readKey (\fBbrlapi_handle_t\fP *handle, intwait, \fBbrlapi_keyCode_t\fP *code)" -.SS "int \fBBRLAPI_STDCALL\fP brlapi_acceptKeyRanges (\fBbrlapi_range_t\fPranges[], unsigned intcount)" +.SS "int \fBBRLAPI_STDCALL\fP brlapi_acceptKeyRanges (const \fBbrlapi_range_t\fPranges[], unsigned intcount)" Accept some key presses from the braille keyboard .PP This function asks the server to return the provided key ranges (inclusive) to the application, and not give them to \fIbrltty\fP\&. @@ -222,7 +222,7 @@ Expand the components of a key code .RE .PP -.SS "int \fBBRLAPI_STDCALL\fP brlapi_ignoreKeyRanges (\fBbrlapi_range_t\fPranges[], unsigned intcount)" +.SS "int \fBBRLAPI_STDCALL\fP brlapi_ignoreKeyRanges (const \fBbrlapi_range_t\fPranges[], unsigned intcount)" Ignore some key presses from the braille keyboard .PP This function asks the server to give the provided key ranges to \fIbrltty\fP, rather than returning them to the application via \fBbrlapi_readKey()\fP\&. diff --git a/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 b/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 index aecb2859f9fa37ed3a395ffd0f0bb4ca340db475..aac79adaaa9739de2fb950304a7ca1f4a1b05198 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_packet_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_packet_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_protocol.3 b/Documents/BrlAPIref/man/man3/brlapi_protocol.3 index 68a813dd1543215dc585cf6227b70f5b53613d6a..a5e508879ebcb01cc6d81e22105a0058c72f3c5d 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_protocol.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_protocol.3 @@ -1,4 +1,4 @@ -.TH "BrlAPI's protocol" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "BrlAPI's protocol" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -53,6 +53,9 @@ Instructions and constants for \fIBrlAPI\fP 's protocol\&. .RI "#define \fBBRLAPI_PACKET_GETDRIVERNAME\fP 'n'" .br .ti -1c +.RI "#define \fBBRLAPI_PACKET_GETMODELID\fP 'd'" +.br +.ti -1c .RI "#define \fBBRLAPI_PACKET_GETDISPLAYSIZE\fP 's'" .br .ti -1c @@ -195,6 +198,8 @@ Exception Dimensions of brl display .SS "#define BRLAPI_PACKET_GETDRIVERNAME 'n'" Ask which driver is used +.SS "#define BRLAPI_PACKET_GETMODELID 'd'" +Ask which model is used .SS "#define BRLAPI_PACKET_IGNOREKEYRANGES 'm'" Mask key ranges .SS "#define BRLAPI_PACKET_KEY 'k'" @@ -335,8 +340,6 @@ In order to regulate concurrent access to the library's file descriptor and requ .IP "\(bu" 2 \fBbrlapi_recvRaw()\fP .IP "\(bu" 2 -brlapi_getDriverId() -.IP "\(bu" 2 \fBbrlapi_getDriverName()\fP .IP "\(bu" 2 \fBbrlapi_getDisplaySize()\fP diff --git a/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 b/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 index a2fcd52a170161275bf31f07c40690d42bf5463f..18a54069ea093cb253d4de41d786ac2a34f255c4 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 @@ -1,4 +1,4 @@ -.TH "brlapi_protocol.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_protocol.h" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -68,6 +68,9 @@ types and constants for \fIBrlAPI's\fP protocol .RI "#define \fBBRLAPI_PACKET_GETDRIVERNAME\fP 'n'" .br .ti -1c +.RI "#define \fBBRLAPI_PACKET_GETMODELID\fP 'd'" +.br +.ti -1c .RI "#define \fBBRLAPI_PACKET_GETDISPLAYSIZE\fP 's'" .br .ti -1c diff --git a/Documents/BrlAPIref/man/man3/brlapi_range_t.3 b/Documents/BrlAPIref/man/man3/brlapi_range_t.3 index 0e34821128478906621caea1ae917adc8c42955e..11979f8f24d41a36dac6ec20569c334a09b41c1c 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_range_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_range_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_range_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_range_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_tty.3 b/Documents/BrlAPIref/man/man3/brlapi_tty.3 index 24aff6a8ad8329ac1e15ffe22bc2cd4d65218f89..6bb51e859cd90949266d4bd3aa11613549d3c2db 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_tty.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_tty.3 @@ -1,4 +1,4 @@ -.TH "Entering & leaving tty mode" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Entering & leaving tty mode" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_version.3 b/Documents/BrlAPIref/man/man3/brlapi_version.3 index d60a30fa36e931e3653a648c3180ecde714e1c69..59fcd36838c6e3cad560e369950a4ab0b50c1c93 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_version.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_version.3 @@ -1,4 +1,4 @@ -.TH "Version of the BrlAPI library" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Version of the BrlAPI library" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -7,7 +7,7 @@ Version of the BrlAPI library \- .in +1c .ti -1c -.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.6'" +.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.7'" .br .ti -1c .RI "#define \fBBRLAPI_MAJOR\fP 0" @@ -16,7 +16,7 @@ Version of the BrlAPI library \- .RI "#define \fBBRLAPI_MINOR\fP 6" .br .ti -1c -.RI "#define \fBBRLAPI_REVISION\fP 6" +.RI "#define \fBBRLAPI_REVISION\fP 7" .br .in -1c .SH "Detailed Description" @@ -28,9 +28,9 @@ Version of the BrlAPI library \- Library major version\&. .SS "#define BRLAPI_MINOR 6" Library minor version\&. -.SS "#define BRLAPI_RELEASE '0\&.6\&.6'" +.SS "#define BRLAPI_RELEASE '0\&.6\&.7'" Library version\&. -.SS "#define BRLAPI_REVISION 6" +.SS "#define BRLAPI_REVISION 7" Library revision\&. .SH "Author" .PP diff --git a/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 index 2b9e6a0457fce8b4ca0a048eb9234b84adb56045..a1e61a36de8fd9391ab0b2c65aa35bbbfba96c36 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_versionPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_versionPacket_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_write.3 b/Documents/BrlAPIref/man/man3/brlapi_write.3 index 4607fc673062ebb7b38b9d56edb8e7ed87c13af9..3f03f90493510c943563ccfa2243f3a5426e4c9b 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_write.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_write.3 @@ -1,4 +1,4 @@ -.TH "Writing on the braille display" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "Writing on the braille display" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -170,7 +170,7 @@ Write the given dots array to the display .SS "int \fBBRLAPI_STDCALL\fP brlapi_writeText (intcursor, const char *text)" Write the given \\0-terminated string to the braille display .PP -If the string is too long, it is truncated\&. If it's too short, it is padded with spaces\&. The text is assumed to be in the current locale charset, or latin1 if locales have not been initialized\&. To initialize locales, use setlocale(3)\&. +If the string is too long, it is truncated\&. If it's too short, it is padded with spaces\&. The text is assumed to be in the current locale charset set by setlocale(3) if it was called, or the locale charset from the locale environment variables if setlocale(3) was not called\&. .PP \fBParameters:\fP .RS 4 diff --git a/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 b/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 index 3c700b3703b8ff77e9aef35b6f52fa9440335a59..9501a13d22114dd50640c3851e5956cfb6238773 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_writeArgumentsPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeArgumentsPacket_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 b/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 index da01c4d1eb35e42dd793ec92fe9e411fc7c465d1..608fbc0e2a8f4c8122fa099a93c8980d16ca4456 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 @@ -1,4 +1,4 @@ -.TH "brlapi_writeArguments_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeArguments_t" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 b/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 index 916ca7821f37c0f8855c3baed5ea9eb04b02ced2..1b2c249be6fe4df3ace53afb2f3d1527047f8d88 100644 --- a/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 +++ b/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 @@ -1,4 +1,4 @@ -.TH "brlapi_writeStruct" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeStruct" 3 "Mon Feb 5 2018" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/Documents/CONTRIBUTORS b/Documents/CONTRIBUTORS index 001a4d3fb773dc6164665fdaa0a624065cee9127..5a3af85b845d27484878ba79b0c22cfa9c221b1c 100644 --- a/Documents/CONTRIBUTORS +++ b/Documents/CONTRIBUTORS @@ -1,13 +1,15 @@ -Alan Coopersmith Adi Dascal Adi Kushnir +Alan Coopersmith Alex Bernier Andreas Gross Angela Engel +Arthur Breuneval Attila Hammer August Hörandl Boris Daix Cheryl Homiak +Chris Brannon Christian Comaschi Christoph-Simon Senjak Coscell Kao @@ -29,6 +31,7 @@ Jean-Philippe Mengual Joanmarie Diggs John J. Boyer Jozko Gregorc +Julian Sackmann Kazunori Minatani <99112004@gakushuin.ac.jp> Keith Wessel Lars Bjørndal @@ -44,15 +47,17 @@ Mike Gorse Mike Pedersen Nicolas Pitre Nikita Tseykovets +Ole Guldberg Olivier Bert Ollie Mallard Oscar Fernandez Pete De Vasto Peter Lundblad Petr Řehák +Raoul Megelas Regiane Mendonça Villela Rich Burridge -Raoul Megelas +Rimas Kudelis Rudolf Weeber Samuel Thibault Samuel Yang @@ -74,6 +79,8 @@ Tomoyuki Kudou Tony Hernandez Ulf Beckmann Victor Montalvao +Victor Tsaran +Vipul Kute Willi Lutzenberger William Hubbs Wolfgang Astleitner diff --git a/Documents/ChangeLog b/Documents/ChangeLog index b76641bfe14da3e056f21c1a44c8cd04af67e435..a20c07f69d02ff3321c7c50bfe56dfb774eb90ea 100644 --- a/Documents/ChangeLog +++ b/Documents/ChangeLog @@ -1,6 +1,55 @@ Note: this file is in reversed chronological order (bottom to top). +February 5, 2018: + - BRLTTY 5.6 released: + General updates: + BRLTTY has been relicensed to the LGPL (from the GPL). + Better cursor routing handling of status line updates and vertical scrolling. + The Track Screen Scroll setting has been added. + The Word Wrap setting has been added. + Panning left when using a contraction table now word wraps. + Typing dismisses an alert message. + The test for when INFO does text maximization instead has been fixed. + Overrides are now applied when the preferences haven't yet been saved. + The Inceptor braille driver (from Innovision) has been added. + The Baum braille driver: + On models with B9 and B10 by the joystick, both are interpreted as Space. + Input packet handling for Pronto! V3 models has been fixed. + The EuroBraille braille driver: + Improved autodetection when using Bluetooth. + The Esytime braille keyboard can be used over Bluetooth and USB. + For Esytime models, B5 has been renamed to B8. + The HIMS braille driver: + The Smart Beetle is now recognized when using Bluetooth. + The HumanWare braille driver: + The BrailleNote Touch is recognized when using USB. + BrlAPI changes: + The version is now 0.6.7 (it was 0.6.6). + The brlapi_getModelIdentifier() function has been added to the API. + The default character set is now based on the user's locale. + Sessions would occasionally hang when connecting. + PolKit authentication is no longer attempted when it isn't available. + Reading raw key codes no longer uses key ranges. + Text tables: + The lt (Lithuanian) table has been updated. + The uk (Ukrainian) table has been added. + Contraction tables: + The fr-abrege (French) table has been updated. + The lt (Lithuanian) table has been added. + Support has been added for LibLouis tables. + brltty-ctb's output is now UTF-8 (rather than ASCII). + Key tables: + The ifPlatform and ifNotPlatform directives have been added. + Systemd changes: + Path (rather than target) units are now used to manage BRLTTY instances. + Android changes: + Danish translations have been added. + Build features: + Add the reload target to the make files for Systemd and Udev. + A make file for install/uninstall of the AppStream rules has been added. + Python 3.6 is supported. + April 18, 2017: - BRLTTY 5.5 released: General changes: diff --git a/Documents/Makefile.in b/Documents/Makefile.in index 91c186632b9f7423596b70496f07f0189f9eed11..341ee07d243d2862e7834e636dc26791628cd9ac 100644 --- a/Documents/Makefile.in +++ b/Documents/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Documents/Manual-BRLTTY/English/BRLTTY-1.html b/Documents/Manual-BRLTTY/English/BRLTTY-1.html index e9eae259c62bfaba04434b78b106b9c2a19948df..21519c81bb4196f13b15bb732c7d4fb0748a7738 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY-1.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY-1.html @@ -21,12 +21,12 @@ Previous

    This program is free software. You may redistribute it and/or modify it under the terms of -The GNU General Public License +The GNU Lesser General Public License as published by The Free Software Foundation. -Version 2 (or any later version) of the license may be used.

    +Version 2.1 (or any later version) of the license may be used.

    You should have received a copy of the license along with this program. -It should be in the file LICENSE-GPL in the top-level directory. +It should be in the file LICENSE-LGPL in the top-level directory. If not, write to the Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

    diff --git a/Documents/Manual-BRLTTY/English/BRLTTY-10.html b/Documents/Manual-BRLTTY/English/BRLTTY-10.html index 34add61adf8de10e6a1f727f94e269ecac1f44a6..9ab0f20b1d412fe2905876f5fe9e7887e5bca7ed 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY-10.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY-10.html @@ -40,6 +40,7 @@ hd
    cursorgives the cursor position; if equal to BRLAPI_CURSOR_OFF, no cursor is shown at all; if cursor==BRLAPI_CURSOR_LEAVE, the cursor is left where it is
    Hedo
    hmHIMS
    htHandyTech
    hwHumanWare
    +icInceptor
    irIris
    lbLibbraille
    ltLogText
    diff --git a/Documents/Manual-BRLTTY/English/BRLTTY-6.html b/Documents/Manual-BRLTTY/English/BRLTTY-6.html index a5695e94e7a3462eb58cfa6ce9048b757962d3b8..470b9ad5aee7215e2ed8a09a9a43c3fe55e03a79 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY-6.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY-6.html @@ -118,6 +118,7 @@ swSwahili
    taTamil
    teTelugu
    trTurkish
    +ukUkrainian
    viVietnamese

    @@ -522,6 +523,7 @@ jaJapanese (uncontracted) ko-g1Korean (grade 1) ko-g2Korean (grade 2) koKorean (uncontracted) +ltLituanian mgMalagasy (contracted) munMunda (contracted) nlDutch (contracted) diff --git a/Documents/Manual-BRLTTY/English/BRLTTY-8.html b/Documents/Manual-BRLTTY/English/BRLTTY-8.html index f58573e13db90fd4b19f97d8c2d047066c4eff6b..53cec84162ac5bac2fbd01fb28bd57929794a38c 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY-8.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY-8.html @@ -85,7 +85,10 @@ HIMSBraille Sense SyncBraille Braille Edge Smart Beetle -HumanWareBrailliant 32/40/80 bi +HumanWareBrailliant BI 14/32/40 +Brailliant B 80 +BrailleNote Touch +InceptorBrailleMe Iris Libbraille LogText32 diff --git a/Documents/Manual-BRLTTY/English/BRLTTY.html b/Documents/Manual-BRLTTY/English/BRLTTY.html index b6a631f1a33861d2a5fcaad47a89d499eef31317..a169513e2025a9a3888dc11bc316fe91bb40c6fa 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY.html +++ b/Documents/Manual-BRLTTY/English/BRLTTY.html @@ -28,10 +28,10 @@ Contents

    Dave Mielke <dave@mielke.cc> -

    Version 5.5, April 2017 + Version 5.6, February 2018
    - Copyright © 1995-2017 by The BRLTTY Developers. + Copyright © 1995-2018 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/BRLTTY.sgml b/Documents/Manual-BRLTTY/English/BRLTTY.sgml index 4e6487ad9ca8ab1a04a467a1875891e1f13e3eb5..25c7dde2a83c2e45f6cd28a65ff31ffbab4a96eb 100644 --- a/Documents/Manual-BRLTTY/English/BRLTTY.sgml +++ b/Documents/Manual-BRLTTY/English/BRLTTY.sgml @@ -20,9 +20,9 @@ Stphane Doyon Dave Mielke - Version 5.5, April 2017 + Version 5.6, February 2018 - Copyright © 1995-2017 by The BRLTTY Developers. + Copyright © 1995-2018 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 @@ -41,12 +41,12 @@ License

    This program is free software. You may redistribute it and/or modify it under the terms of - + as published by . -Version 2 (or any later version) of the license may be used. +Version 2.1 (or any later version) of the license may be used. You should have received a copy of the license along with this program. -It should be in the file - Version 5.5, April 2017 + Version 5.6, February 2018 - Copyright 1995-2017 by The BRLTTY Developers. BRLTTY is free soft- + Copyright 1995-2018 by The BRLTTY Developers. BRLTTY is free soft- ware, and comes with ABSOLUTELY NO WARRANTY. It is placed under the terms of version 2 or later of The GNU General Public License as pub- lished by The Free Software Foundation. @@ -145,12 +145,12 @@ 1.1. License This program is free software. You may redistribute it and/or modify - it under the terms of The GNU General Public License as published by - The Free Software Foundation. Version 2 (or any later version) of the - license may be used. + it under the terms of The GNU Lesser General Public License as + published by The Free Software Foundation. Version 2.1 (or any later + version) of the license may be used. You should have received a copy of the license along with this - program. It should be in the file LICENSE-GPL in the top-level + program. It should be in the file LICENSE-LGPL in the top-level directory. If not, write to the Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -4331,6 +4331,7 @@ ta Tamil te Telugu tr Turkish + uk Ukrainian vi Vietnamese @@ -4711,6 +4712,7 @@ ko-g1 Korean (grade 1) ko-g2 Korean (grade 2) ko Korean (uncontracted) + lt Lituanian mg Malagasy (contracted) mun Munda (contracted) nl Dutch (contracted) @@ -5757,7 +5759,10 @@ SyncBraille Braille Edge Smart Beetle - HumanWare Brailliant 32/40/80 bi + HumanWare Brailliant BI 14/32/40 + Brailliant B 80 + BrailleNote Touch + Inceptor BrailleMe Iris Libbraille LogText 32 @@ -5851,6 +5856,7 @@ hm HIMS ht HandyTech hw HumanWare + ic Inceptor ir Iris lb Libbraille lt LogText diff --git a/Documents/Manual-BRLTTY/English/Makefile.in b/Documents/Manual-BRLTTY/English/Makefile.in index eb7f8846134e7acde91162bdecc515ec1cd4e8b9..0a39ca71c842bad55864a61cfdf60efb7eebbc17 100644 --- a/Documents/Manual-BRLTTY/English/Makefile.in +++ b/Documents/Manual-BRLTTY/English/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Documents/Manual-BRLTTY/English/braille-drivers.sgml b/Documents/Manual-BRLTTY/English/braille-drivers.sgml index 590fb0ab8ec8d429da127ab6a0abb5a5872be485..57a837a00caadde37f6900f09f7075f147bc50d0 100644 --- a/Documents/Manual-BRLTTY/English/braille-drivers.sgml +++ b/Documents/Manual-BRLTTY/English/braille-drivers.sgml @@ -81,7 +81,11 @@ HIMS |Braille Edge@ |Smart Beetle@ HumanWare - |Brailliant 32/40/80 bi@ + |Brailliant BI 14/32/40@ + |Brailliant B 80@ + |BrailleNote Touch@ +Inceptor + |BrailleMe@ Iris@ Libbraille@ LogText diff --git a/Documents/Manual-BRLTTY/English/contraction-tables.sgml b/Documents/Manual-BRLTTY/English/contraction-tables.sgml index f02907a26e3343a7b7a8aa5991aaa91df1cd9644..9cc08c9d50a16a623977ec79fd383af61bd11a5a 100644 --- a/Documents/Manual-BRLTTY/English/contraction-tables.sgml +++ b/Documents/Manual-BRLTTY/English/contraction-tables.sgml @@ -14,6 +14,7 @@ ja|Japanese (uncontracted)@ ko-g1|Korean (grade 1)@ ko-g2|Korean (grade 2)@ ko|Korean (uncontracted)@ +lt|Lituanian@ mg|Malagasy (contracted)@ mun|Munda (contracted)@ nl|Dutch (contracted)@ diff --git a/Documents/Manual-BRLTTY/English/driver-codes.sgml b/Documents/Manual-BRLTTY/English/driver-codes.sgml index 770c45a75603f0bcee3091297fe0f6bc1cdba713..09eae4039cd0aa5ca88ff20d601f995b92452b73 100644 --- a/Documents/Manual-BRLTTY/English/driver-codes.sgml +++ b/Documents/Manual-BRLTTY/English/driver-codes.sgml @@ -20,6 +20,7 @@ hd|Hedo@ hm|HIMS@ ht|HandyTech@ hw|HumanWare@ +ic|Inceptor@ ir|Iris@ lb|Libbraille@ lt|LogText@ diff --git a/Documents/Manual-BRLTTY/English/text-tables.sgml b/Documents/Manual-BRLTTY/English/text-tables.sgml index 0db84d850cfa6b795f98dfa8f16b52b4753afb7a..d7e350bb3f236dcb1aeaceba88cdef434b208acb 100644 --- a/Documents/Manual-BRLTTY/English/text-tables.sgml +++ b/Documents/Manual-BRLTTY/English/text-tables.sgml @@ -85,4 +85,5 @@ sw|Swahili@ ta|Tamil@ te|Telugu@ tr|Turkish@ +uk|Ukrainian@ vi|Vietnamese@ diff --git a/Documents/Manual-BRLTTY/French/BRLTTY-1.html b/Documents/Manual-BRLTTY/French/BRLTTY-1.html index a2a8b6183a8d2dca136b75cad63d54aead0dcfcf..fb5b839a99cd30a33a597383972874b0b6fbc824 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY-1.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY-1.html @@ -21,11 +21,11 @@ Page pr

    Ce programme est un logiciel libre. Vous pouvez le redistribuer et/ou le modifier sous les termes de la -GNU General Public License +GNU Lesser General Public License stipule par la -Free Software Foundation. Vous pouvez utiliser une version 2 (ou suprieure) de la licence.

    +Free Software Foundation. Vous pouvez utiliser une version 2,1 (ou suprieure) de la licence.

    Vous devriez avoir reu une copie de la licence avec le -programme. Elle devrait tre dans le fichier LICENSE-GPL du +programme. Elle devrait tre dans le fichier LICENSE-LGPL du rpertoire principal. Si ce n'est pas le cas, crivez la Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

    diff --git a/Documents/Manual-BRLTTY/French/BRLTTY-10.html b/Documents/Manual-BRLTTY/French/BRLTTY-10.html index 9dad01500f918df9ac3f64a67d6b0806136482bd..307da63135ff6ee619108358fa57355dd9d47000 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY-10.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY-10.html @@ -19,6 +19,7 @@
    CodeName
    alAlva
    +anAndroid
    atAlbatross
    baBrlAPI
    bcBrailComm
    @@ -39,11 +40,13 @@ hdHedo
    hmHIMS
    htHandyTech
    hwHumanWare
    +icInceptor
    irIris
    lbLibbraille
    ltLogText
    mbMultiBraille
    mdMDV
    +mmBrailleMemo
    mnMiniBraille
    mpMikropuhe
    mtMetec
    diff --git a/Documents/Manual-BRLTTY/French/BRLTTY-6.html b/Documents/Manual-BRLTTY/French/BRLTTY-6.html index 5049a2e61e494b99a642f980eecf531efdd79fd0..8273ab76f5781b1eddcac1b25f3cc6ad84c25017 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY-6.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY-6.html @@ -97,7 +97,7 @@ nl_BEAutrichien (Belge)
    nl_NLAutrichien (Pays-Bas)
    noNorvgien
    no-genericNorvgien (avec le support des autres langues)
    -no-oubNorvgien (Offentlig Utvalg for Blindeskrift)
    +no-oupNorvgien (Offentlig Utvalg for punktskrift)
    nwcNewari (ancien)
    orOriya
    paPanjabi
    @@ -110,6 +110,7 @@ saSanscrit
    satSantali
    sdSindhi
    skSlovaque
    +slSlovne
    svSudois
    sv-1989Sudois (standard 1989)
    sv-1996Sudois (standard 1996)
    @@ -117,6 +118,7 @@ swSwahili
    taTamoul
    teTelugu
    trTurc
    +ukUkrainien
    viVietnamien

    @@ -505,6 +507,7 @@ jaJaponeais (d ko-g1Coren (1er degr) ko-g2Coren (2me degr) koCoren (dsabrg) +ltLituanien mgMalagasky (abrg) munMunda (abrg) nlAutrichien (abrg) diff --git a/Documents/Manual-BRLTTY/French/BRLTTY-8.html b/Documents/Manual-BRLTTY/French/BRLTTY-8.html index 963fda2670f4c73651fb49995fca846b57717c63..8d5a94ccaf37c5b4a54a9248ad110d1cbdf0d639 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY-8.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY-8.html @@ -85,7 +85,10 @@ HIMSBraille Sense SyncBraille Braille Edge Smart Beetle -HumanWareBrailliant 32/40/80 bi +HumanWareBrailliant BI 14/32/40 +Brailliant B 80 +BrailleNote Touch +InceptorBrailleMe Iris Libbraille LogText32 diff --git a/Documents/Manual-BRLTTY/French/BRLTTY.html b/Documents/Manual-BRLTTY/French/BRLTTY.html index d687b20725d5645ce192cae0927c755c8307eac8..982d166e1ec9a65f732137d49ca8e66de8c16ad6 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY.html +++ b/Documents/Manual-BRLTTY/French/BRLTTY.html @@ -37,10 +37,10 @@ Table des mati pour Traduc.org - Version 5.5, Avril 2017 + Version 5.6, Fvrier 2018
    - Copyright © 1995-2017 by Les Dveloppeurs de BRLTTY. + Copyright © 1995-2018 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 GNU General Public License publie par diff --git a/Documents/Manual-BRLTTY/French/BRLTTY.sgml b/Documents/Manual-BRLTTY/French/BRLTTY.sgml index 610ad7ab01e0b2b8d075098558fe9abbbc9e0009..5fa37167154fa4934f253456e8afa281e142b32c 100644 --- a/Documents/Manual-BRLTTY/French/BRLTTY.sgml +++ b/Documents/Manual-BRLTTY/French/BRLTTY.sgml @@ -44,9 +44,9 @@ pour - Version 5.5, Avril 2017 + Version 5.6, Fvrier 2018 - Copyright © 1995-2017 by Les Dveloppeurs de BRLTTY. + Copyright © 1995-2018 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 GNU General Public License publie par @@ -62,11 +62,11 @@ Licence

    Ce programme est un logiciel libre. Vous pouvez le redistribuer et/ou -le modifier sous les termes de la -stipule par la . Vous pouvez utiliser une version 2 (ou suprieure) de la licence. +le modifier sous les termes de la +stipule par la . Vous pouvez utiliser une version 2,1 (ou suprieure) de la licence. Vous devriez avoir reu une copie de la licence avec le -programme. Elle devrait tre dans le fichier pour Traduc.org - Version 5.5, Avril 2017 + Version 5.6, Fvrier 2018 - Copyright 1995-2017 by Les Dveloppeurs de BRLTTY. BRLTTY est un + Copyright 1995-2018 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 GNU General Public License publie par The Free Software Foundation. @@ -150,14 +150,14 @@ 1.1. Licence Ce programme est un logiciel libre. Vous pouvez le redistribuer et/ou - le modifier sous les termes de la GNU General Public License stipule - par la Free Software Foundation. Vous pouvez utiliser une version 2 - (ou suprieure) de la licence. + le modifier sous les termes de la GNU Lesser General Public License + stipule par la Free Software Foundation. Vous pouvez utiliser une + version 2,1 (ou suprieure) de la licence. Vous devriez avoir reu une copie de la licence avec le programme. - Elle devrait tre dans le fichier LICENSE-GPL du rpertoire principal. - Si ce n'est pas le cas, crivez la Free Software Foundation Inc., - 675 Mass Ave, Cambridge, MA 02139, USA. + Elle devrait tre dans le fichier LICENSE-LGPL du rpertoire + principal. Si ce n'est pas le cas, crivez la Free Software + Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 1.2. Mise en garde @@ -4669,7 +4669,7 @@ nl_NL Autrichien (Pays-Bas) no Norvgien no-generic Norvgien (avec le support des autres langues) - no-oub Norvgien (Offentlig Utvalg for Blindeskrift) + no-oup Norvgien (Offentlig Utvalg for punktskrift) nwc Newari (ancien) or Oriya pa Panjabi @@ -4682,6 +4682,7 @@ sat Santali sd Sindhi sk Slovaque + sl Slovne sv Sudois sv-1989 Sudois (standard 1989) sv-1996 Sudois (standard 1996) @@ -4689,6 +4690,7 @@ ta Tamoul te Telugu tr Turc + uk Ukrainien vi Vietnamien @@ -5083,6 +5085,7 @@ ko-g1 Coren (1er degr) ko-g2 Coren (2me degr) ko Coren (dsabrg) + lt Lituanien mg Malagasky (abrg) mun Munda (abrg) nl Autrichien (abrg) @@ -6199,7 +6202,10 @@ SyncBraille Braille Edge Smart Beetle - HumanWare Brailliant 32/40/80 bi + HumanWare Brailliant BI 14/32/40 + Brailliant B 80 + BrailleNote Touch + Inceptor BrailleMe Iris Libbraille LogText 32 @@ -6271,6 +6277,7 @@ Code Name ____________________________________________________ al Alva + an Android at Albatross ba BrlAPI bc BrailComm @@ -6291,11 +6298,13 @@ hm HIMS ht HandyTech hw HumanWare + ic Inceptor ir Iris lb Libbraille lt LogText mb MultiBraille md MDV + mm BrailleMemo mn MiniBraille mp Mikropuhe mt Metec diff --git a/Documents/Manual-BRLTTY/French/Makefile.in b/Documents/Manual-BRLTTY/French/Makefile.in index a3b0843a343113e49e8be3702ffa43526e08ef7b..a493cb0fee49027606938bef5a9c87c0b45c8890 100644 --- a/Documents/Manual-BRLTTY/French/Makefile.in +++ b/Documents/Manual-BRLTTY/French/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Documents/Manual-BRLTTY/French/braille-drivers.sgml b/Documents/Manual-BRLTTY/French/braille-drivers.sgml index 590fb0ab8ec8d429da127ab6a0abb5a5872be485..57a837a00caadde37f6900f09f7075f147bc50d0 100644 --- a/Documents/Manual-BRLTTY/French/braille-drivers.sgml +++ b/Documents/Manual-BRLTTY/French/braille-drivers.sgml @@ -81,7 +81,11 @@ HIMS |Braille Edge@ |Smart Beetle@ HumanWare - |Brailliant 32/40/80 bi@ + |Brailliant BI 14/32/40@ + |Brailliant B 80@ + |BrailleNote Touch@ +Inceptor + |BrailleMe@ Iris@ Libbraille@ LogText diff --git a/Documents/Manual-BRLTTY/French/contraction-tables.sgml b/Documents/Manual-BRLTTY/French/contraction-tables.sgml index c321607b5d47eb87f154e48685d5a5ee7293fd33..a28c2ce89410260b1a4fdc6b9195ee9cc1d51e15 100644 --- a/Documents/Manual-BRLTTY/French/contraction-tables.sgml +++ b/Documents/Manual-BRLTTY/French/contraction-tables.sgml @@ -14,6 +14,7 @@ ja|Japoneais (d ko-g1|Coren (1er degr)@ ko-g2|Coren (2me degr)@ ko|Coren (dsabrg)@ +lt|Lituanien@ mg|Malagasky (abrg)@ mun|Munda (abrg)@ nl|Autrichien (abrg)@ diff --git a/Documents/Manual-BRLTTY/French/driver-codes.sgml b/Documents/Manual-BRLTTY/French/driver-codes.sgml index 06478064b91f68ccc873d0e9ce63541933315b44..09eae4039cd0aa5ca88ff20d601f995b92452b73 100644 --- a/Documents/Manual-BRLTTY/French/driver-codes.sgml +++ b/Documents/Manual-BRLTTY/French/driver-codes.sgml @@ -1,4 +1,5 @@ al|Alva@ +an|Android@ at|Albatross@ ba|BrlAPI@ bc|BrailComm@ @@ -19,11 +20,13 @@ hd|Hedo@ hm|HIMS@ ht|HandyTech@ hw|HumanWare@ +ic|Inceptor@ ir|Iris@ lb|Libbraille@ lt|LogText@ mb|MultiBraille@ md|MDV@ +mm|BrailleMemo@ mn|MiniBraille@ mp|Mikropuhe@ mt|Metec@ diff --git a/Documents/Manual-BRLTTY/French/text-tables.sgml b/Documents/Manual-BRLTTY/French/text-tables.sgml index d25c0a9d3318a485f3320a8f389ca9efadb318ee..2a3e492d3226eabac309e633407d83e4ad637405 100644 --- a/Documents/Manual-BRLTTY/French/text-tables.sgml +++ b/Documents/Manual-BRLTTY/French/text-tables.sgml @@ -64,7 +64,7 @@ nl_BE|Autrichien (Belge)@ nl_NL|Autrichien (Pays-Bas)@ no|Norvgien@ no-generic|Norvgien (avec le support des autres langues)@ -no-oub|Norvgien (Offentlig Utvalg for Blindeskrift)@ +no-oup|Norvgien (Offentlig Utvalg for punktskrift)@ nwc|Newari (ancien)@ or|Oriya@ pa|Panjabi@ @@ -77,6 +77,7 @@ sa|Sanscrit@ sat|Santali@ sd|Sindhi@ sk|Slovaque@ +sl|Slovne@ sv|Sudois@ sv-1989|Sudois (standard 1989)@ sv-1996|Sudois (standard 1996)@ @@ -84,4 +85,5 @@ sw|Swahili@ ta|Tamoul@ te|Telugu@ tr|Turc@ +uk|Ukrainien@ vi|Vietnamien@ diff --git a/Documents/Manual-BrlAPI/English/BrlAPI-7.html b/Documents/Manual-BrlAPI/English/BrlAPI-7.html index 0b2d828ea237665b540ddfc5f6f975a650536e49..773c97df2ad060770065ead3681ca5406451bab7 100644 --- a/Documents/Manual-BrlAPI/English/BrlAPI-7.html +++ b/Documents/Manual-BrlAPI/English/BrlAPI-7.html @@ -102,7 +102,7 @@ client then doesn't need to send a BRLAPI_PACKET_AUTH packet.

  • normal mode: the client is authorized to use the server, but didn't ask for a tty or raw mode. The client can send either of these types of packet:
      -
    • BRLAPI_PACKET_GETDRIVERID, BRLAPI_PACKET_GETDRIVERNAME +
    • BRLAPI_PACKET_GETDRIVERNAME or BRLAPI_PACKET_GETDISPLAYSIZE to get pieces of information from the server,
    • BRLAPI_PACKET_ENTERTTYMODE to enter tty handling mode,
    • BRLAPI_PACKET_ENTERRAWMODE to enter raw mode,
      • @@ -121,7 +121,7 @@ normal mode,
    • BRLAPI_PACKET_IGNOREKEYRANGE and BRLAPI_PACKET_ACCEPTKEYRANGE to mask and unmask keys,
    • BRLAPI_PACKET_WRITE to display text on this tty,
    • BRLAPI_PACKET_ENTERRAWMODE to enter raw mode,
      • -
    • BRLAPI_PACKET_GETDRIVERID, BRLAPI_PACKET_GETDRIVERNAME +
    • BRLAPI_PACKET_GETDRIVERNAME or BRLAPI_PACKET_GETDISPLAYSIZE to get pieces of information from the server,
    @@ -188,16 +188,17 @@ the credentials sufficient.

    • Note: when the Operating system permits it, the server may use implicit credential check, and then advertise the none method.

    -

    BRLAPI_PACKET_GETDRIVERID (see brlapi_getDriverId())

    - -

    This should be sent by the client when it needs the 2-char identifier of -the current brltty driver. The returned string is \0 terminated.

    -

    BRLAPI_PACKET_GETDRIVERNAME (see brlapi_getDriverName())

    This should be sent by the client when it needs the full name of the current brltty driver. The returned string is \0 terminated.

    +

    BRLAPI_PACKET_GETMODELID (see brlapi_getModelIdentifier())

    + +

    This should be sent by the client when it needs to identify +which model of braille display is currently used by brltty. +The returned string is \0 terminated.

    +

    BRLAPI_PACKET_GETDISPLAYSIZE (see brlapi_getDisplaySize())

    This should be sent by the client when it needs to know the braille display diff --git a/Documents/Manual-BrlAPI/English/BrlAPI.sgml b/Documents/Manual-BrlAPI/English/BrlAPI.sgml index b02632875311706b78efcb71f84b758608ee0b9e..31dc21b9558e9db7a85623286108d2a147db3c40 100644 --- a/Documents/Manual-BrlAPI/English/BrlAPI.sgml +++ b/Documents/Manual-BrlAPI/English/BrlAPI.sgml @@ -1297,7 +1297,7 @@ client then doesn't need to send a normal mode: the client is authorized to use the server, but didn't ask for a tty or raw mode. The client can send either of these types of packet: - And the server might send -This should be sent by the client when it needs the 2-char identifier of -the current This should be sent by the client when it needs the full name of the current +This should be sent by the client when it needs to identify +which model of braille display is currently used by This should be sent by the client when it needs to know the braille display diff --git a/Documents/Manual-BrlAPI/English/BrlAPI.txt b/Documents/Manual-BrlAPI/English/BrlAPI.txt index dea47467007f8c64a8bc3e5271b61ad5c21c6f7c..4be8156fe5a4b11ec77be91c4bffac9bf1da075c 100644 --- a/Documents/Manual-BrlAPI/English/BrlAPI.txt +++ b/Documents/Manual-BrlAPI/English/BrlAPI.txt @@ -71,8 +71,8 @@ BRLAPI_ERROR_PROTOCOL_VERSION error packet is returned and the connection is closed. 7.4.2 BRLAPI_PACKET_AUTH - 7.4.3 BRLAPI_PACKET_GETDRIVERID (see brlapi_getDriverId() ) - 7.4.4 BRLAPI_PACKET_GETDRIVERNAME (see brlapi_getDriverName() ) + 7.4.3 BRLAPI_PACKET_GETDRIVERNAME (see brlapi_getDriverName() ) + 7.4.4 BRLAPI_PACKET_GETMODELID (see brlapi_getModelIdentifier() ) 7.4.5 BRLAPI_PACKET_GETDISPLAYSIZE (see brlapi_getDisplaySize() ) 7.4.6 BRLAPI_PACKET_ENTERTTYMODE (see brlapi_enterTtyMode() and brlapi_enterTtyModeWithPath() ) @@ -1362,9 +1362,8 @@ ask for a tty or raw mode. The client can send either of these types of packet: - BRLAPI_PACKET_GETDRIVERID, BRLAPI_PACKET_GETDRIVERNAME or - BRLAPI_PACKET_GETDISPLAYSIZE to get pieces of information from - the server, + BRLAPI_PACKET_GETDRIVERNAME or BRLAPI_PACKET_GETDISPLAYSIZE to + get pieces of information from the server, BRLAPI_PACKET_ENTERTTYMODE to enter tty handling mode, @@ -1390,9 +1389,8 @@ BRLAPI_PACKET_ENTERRAWMODE to enter raw mode, - BRLAPI_PACKET_GETDRIVERID, BRLAPI_PACKET_GETDRIVERNAME or - BRLAPI_PACKET_GETDISPLAYSIZE to get pieces of information from - the server, + BRLAPI_PACKET_GETDRIVERNAME or BRLAPI_PACKET_GETDISPLAYSIZE to + get pieces of information from the server, And the server might send BRLAPI_PACKET_KEY packets to signal key presses. @@ -1468,16 +1466,17 @@ Note: when the Operating system permits it, the server may use implicit credential check, and then advertise the none method. - 7.4.3. BRLAPI_PACKET_GETDRIVERID (see brlapi_getDriverId() ) - - This should be sent by the client when it needs the 2-char identifier - of the current brltty driver. The returned string is \0 terminated. - - 7.4.4. BRLAPI_PACKET_GETDRIVERNAME (see brlapi_getDriverName() ) + 7.4.3. BRLAPI_PACKET_GETDRIVERNAME (see brlapi_getDriverName() ) This should be sent by the client when it needs the full name of the current brltty driver. The returned string is \0 terminated. + 7.4.4. BRLAPI_PACKET_GETMODELID (see brlapi_getModelIdentifier() ) + + This should be sent by the client when it needs to identify which + model of braille display is currently used by brltty. The returned + string is \0 terminated. + 7.4.5. BRLAPI_PACKET_GETDISPLAYSIZE (see brlapi_getDisplaySize() ) This should be sent by the client when it needs to know the braille diff --git a/Documents/Manual-BrlAPI/English/Makefile.in b/Documents/Manual-BrlAPI/English/Makefile.in index ef323086fc14b5ee8bc4dfc61b701df8aef1c77c..29c464ec3cd9ce1560a6b11b838d62ab6d1007b8 100644 --- a/Documents/Manual-BrlAPI/English/Makefile.in +++ b/Documents/Manual-BrlAPI/English/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Documents/README.Systemd b/Documents/README.Systemd index 52421e52020b64406a80504c6c9065a72d8032f1..27ed9daba96509e26bd5ff25507966a9141946ff 100644 --- a/Documents/README.Systemd +++ b/Documents/README.Systemd @@ -12,7 +12,7 @@ Using Systemd Service Management Initial Setup ============= -A set of Systemd service and target units needs to be installed +A set of Systemd service and path units needs to be installed into the |unit directory| directory, and a wrapper script needs to be installed into the |wrapper directory| directory. @@ -52,29 +52,29 @@ The Default Instance The default BRLTTY instance is the one that's configured via the file ``/etc/brltty.conf``. -It's managed by applying standard Systemd commands to BRLTTY's target unit. +It's managed by applying standard Systemd commands to BRLTTY's path unit. For example:: - systemctl enable brltty.target - systemctl start brltty.target - systemctl stop brltty.target - systemctl disable brltty.target + systemctl enable brltty.path + systemctl start brltty.path + systemctl stop brltty.path + systemctl disable brltty.path Additional Instances -------------------- -Additional BRLTTY instances can be managed via target instance references. +Additional BRLTTY instances can be managed via path instance references. Each of them has its own configuration file. If, for example, the name of an instance is ``iname``, then -its Systemd target name would be ``brltty@iname``, +its Systemd path name would be ``brltty@iname``, its configuration file would be ``/etc/brltty_iname.conf``, and it'd be managed via Systemd commands like these:: - systemctl enable brltty@iname.target - systemctl start brltty@iname.target - systemctl stop brltty@iname.target - systemctl disable brltty@iname.target + systemctl enable brltty@iname.path + systemctl start brltty@iname.path + systemctl stop brltty@iname.path + systemctl disable brltty@iname.path Any number of instances may be managed in this way. diff --git a/Documents/braille-driver.csv b/Documents/braille-driver.csv index 66e85be12e950a8adcca2ce016fbb3cab9970f00..a8d1585456b626a6da14a99b70b4ca0377e2402c 100644 --- a/Documents/braille-driver.csv +++ b/Documents/braille-driver.csv @@ -17,6 +17,7 @@ "hm","HIMS" "ht","HandyTech" "hw","HumanWare" +"ic","Inceptor" "ir","Iris" "lb","Libbraille" "lt","LogText" diff --git a/Documents/brltty.1.in b/Documents/brltty.1.in index 296f8b677e36d309fc79741d3b4cb4c87e9bd8d5..ab7b3c1dbbc9768adebfe722458dc3e479dde127 100644 --- a/Documents/brltty.1.in +++ b/Documents/brltty.1.in @@ -3,20 +3,20 @@ .\" BRLTTY - A background process providing access to the console screen (when in .\" text mode) for a blind person using a refreshable braille display. .\" -.\" Copyright (C) 1995-2017 by The BRLTTY Developers. +.\" Copyright (C) 1995-2018 by The BRLTTY Developers. .\" .\" BRLTTY comes with ABSOLUTELY NO WARRANTY. .\" .\" This is free software, placed under the terms of the -.\" GNU General Public License, as published by the Free Software -.\" Foundation; either version 2 of the License, or (at your option) any -.\" later version. Please see the file LICENSE-GPL for details. +.\" 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.com/ .\" .\" This software is maintained by Dave Mielke . .\" -.TH "BRLTTY" "1" "2017-04-18" "brltty 5.5" "BRLTTY User's Manual" +.TH "BRLTTY" "1" "2018-02-01" "brltty 5.5" "BRLTTY User's Manual" .SH NAME brltty \- refreshable braille display driver for Linux/Unix .SH SYNOPSIS @@ -747,6 +747,9 @@ HumanWare .B ir Iris .TP 4 +.B ic +Inceptor +.TP 4 .B lb Libbraille .TP 4 diff --git a/Documents/brltty.conf.in b/Documents/brltty.conf.in index 0a9893b0224e7a9dd4807a4badb60d50c033510a..e112736746126ad580a38cc27c690d7a87c37a02 100644 --- a/Documents/brltty.conf.in +++ b/Documents/brltty.conf.in @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -73,6 +73,7 @@ #braille-driver hm # HIMS #braille-driver ht # HandyTech #braille-driver hw # HumanWare +#braille-driver ic # Inceptor #braille-driver ir # Iris #braille-driver lb # Libbraille #braille-driver lt # LogText @@ -214,6 +215,7 @@ #text-table ta # Tamil #text-table te # Telugu #text-table tr # Turkish +#text-table uk # Ukrainian #text-table vi # Vietnamese # The attributes-table directive specifies which attributes table to use. @@ -244,6 +246,7 @@ #contraction-table ko-g1 # Korean (grade 1) #contraction-table ko-g2 # Korean (grade 2) #contraction-table ko # Korean (uncontracted) +#contraction-table lt # Lithuanian (uncontracted) #contraction-table mg # Malagasy (contracted) #contraction-table mun # Munda (contracted) #contraction-table nl # Dutch (contracted) diff --git a/Documents/contraction-table.csv b/Documents/contraction-table.csv index 23d496f6e298148c48aded36dcfd17bd2999accb..65ed3ec8a76ad14e006f28349b37c52ff314f03e 100644 --- a/Documents/contraction-table.csv +++ b/Documents/contraction-table.csv @@ -5,6 +5,7 @@ "id","Indonesian (contracted)" "ja","Japanese (uncontracted)" "ko","Korean (uncontracted)" +"lt","Lithuanian (uncontracted)" "mg","Malagasy (contracted)" "mun","Munda (contracted)" "nl","Dutch (contracted)" diff --git a/Documents/mkcsvs b/Documents/mkcsvs index 1b63eb7e1f1eaaf9e3e5cbb003f4bed3a66cc74c..0d44be2d1136f2fc04e9b1fc8be4629f363ee38e 100755 --- a/Documents/mkcsvs +++ b/Documents/mkcsvs @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Documents/text-table.csv b/Documents/text-table.csv index 17df7691250924054e25bb8417c7b017a04b3fa9..e197bf9fc0d6d927e374a9ffe484189c2075f83c 100644 --- a/Documents/text-table.csv +++ b/Documents/text-table.csv @@ -74,4 +74,5 @@ "ta","Tamil" "te","Telugu" "tr","Turkish" +"uk","Ukrainian" "vi","Vietnamese" diff --git a/Documents/xbrlapi.1 b/Documents/xbrlapi.1 index a2aac5b9cf979455f840e3017f36b4274346e850..d10527b2bc46f988fab9351eda6f8f182a30ae65 100644 --- a/Documents/xbrlapi.1 +++ b/Documents/xbrlapi.1 @@ -1,4 +1,4 @@ -.TH "XBRLAPI" "1" "2017-04-18" "BrlAPI 0.6.6" "BrlAPI User's Manual" +.TH "XBRLAPI" "1" "2018-02-01" "BrlAPI 0.6.7" "BrlAPI 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 0ad95f83a38c2a7cceee153580b0915b21b244ea..47b329a95bb0922ed4a3a5fbf56d5bdb1ae0e00e 100644 --- a/Drivers/Braille/Albatross/Makefile.in +++ b/Drivers/Braille/Albatross/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Albatross/braille.c b/Drivers/Braille/Albatross/braille.c index f9975392c63c6f173b8493caf21fafcf7d173f56..ca2de0158bee978d9c5738d2c14b7e29d686d42b 100644 --- a/Drivers/Braille/Albatross/braille.c +++ b/Drivers/Braille/Albatross/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -439,12 +439,12 @@ refreshDisplay (BrailleDisplay *brl) { static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { - if (isSerialDevice(&device)) { + if (isSerialDeviceIdentifier(&device)) { io = &serialOperations; - } else if (isUsbDevice(&device)) { + } else if (isUsbDeviceIdentifier(&device)) { io = &usbOperations; } else { - unsupportedDevice(device); + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/Albatross/brldefs-at.h b/Drivers/Braille/Albatross/brldefs-at.h index d218b86cc1d24621c44d9ef0c52a6583bb15303f..ed808957b4fcad7c5c113a3ed41f3190863aceeb 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 247699d7f3031f44433b842f88ab4d98bf710f87..cbe3a3cd54a576dd8c89e87517f2cfe78c825ebe 100644 --- a/Drivers/Braille/Alva/Makefile.in +++ b/Drivers/Braille/Alva/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Alva/braille.c b/Drivers/Braille/Alva/braille.c index a0bd30d4cb3f4324193b510e5ed9c42e181fe446..3859391bdff8af86d6717ac4bb2d1174b7bbb1ea 100644 --- a/Drivers/Braille/Alva/braille.c +++ b/Drivers/Braille/Alva/braille.c @@ -2,23 +2,23 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * * This software is maintained by Dave Mielke . */ -/* Alva/brlmain.cc - Braille display library for Alva braille displays +/* Alva/braille.cc - Braille display library for Alva braille displays * Copyright (C) 1995-2002 by Nicolas Pitre - * See the GNU Public license for details in the LICENSE-GPL file + * See the GNU Lesser General Public License for details in the LICENSE-LGPL file * */ diff --git a/Drivers/Braille/Alva/braille.h b/Drivers/Braille/Alva/braille.h index 8af1590b3ba6e8c0f14895e645026364d75ace36..fdbe5616ab6c37d03280bf1ec4d5294562ba2fe3 100644 --- a/Drivers/Braille/Alva/braille.h +++ b/Drivers/Braille/Alva/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Alva/brldefs-al.h b/Drivers/Braille/Alva/brldefs-al.h index a212473e70e7ef3f2f2d25cf6bb12e7710a98436..0f0c70d4573eea5c48c763b3544af0b8d264de59 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 219d2bb65d4f6e56d73a5cd2b96a35c541e09bfa..854f3c4c39b4eb228ac0de7edb07472bdd207826 100644 --- a/Drivers/Braille/B2G/Makefile.in +++ b/Drivers/Braille/B2G/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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://mielke.cc/brltty/ # diff --git a/Drivers/Braille/B2G/braille.c b/Drivers/Braille/B2G/braille.c index a7d05c79c244b126a433d0ee19061deb5c83018c..33fb7ea7feb184a92915ff71cf4a7730e43b7fc8 100644 --- a/Drivers/Braille/B2G/braille.c +++ b/Drivers/Braille/B2G/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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://mielke.cc/brltty/ * diff --git a/Drivers/Braille/B2G/brldefs-bg.h b/Drivers/Braille/B2G/brldefs-bg.h index 18d755c38ee141647997d4af4262c8b4519495c0..59341561d820ed3b850af8164b98f188f475d35c 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 91218058787420f3c2525eaefbbd9bd6992c1e5b..76f13266a478ca54b8149100fe2ab04c1000038f 100644 --- a/Drivers/Braille/Baum/Makefile.in +++ b/Drivers/Braille/Baum/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Baum/braille.c b/Drivers/Braille/Baum/braille.c index 38e375756f1d6a0b4e4d039fe37c5dd249e63828..f7df9697aa51b77fe3a585f31cb0067657631b64 100644 --- a/Drivers/Braille/Baum/braille.c +++ b/Drivers/Braille/Baum/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -3030,14 +3030,14 @@ connectResource (BrailleDisplay *brl, const char *identifier) { .vendor=0X0904, .product=0X4004, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=2, - .data=&baumHid2Operations + .data=&baumHid1Operations }, { /* Pronto! V3 40 (40 cells) */ .vendor=0X0904, .product=0X4005, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=2, - .data=&baumHid2Operations + .data=&baumHid1Operations }, { /* Pronto! V4 18 (18 cells) */ diff --git a/Drivers/Braille/Baum/brldefs-bm.h b/Drivers/Braille/Baum/brldefs-bm.h index d70c78c32d73e37a0001c069732d57365372e184..b0cd55de77f5b0f86d8cde6520486a5f0e411138 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 c3bfc544c5e45d726dbf53d893c4cf8e4d06c68d..ebcc28ab9c1b6474bf37724fa0a281f0b14b16fb 100644 --- a/Drivers/Braille/BrailComm/Makefile.in +++ b/Drivers/Braille/BrailComm/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/BrailComm/braille.c b/Drivers/Braille/BrailComm/braille.c index 8c01c0219654b69f1260d1c2e6a21f8f6f813a5c..a3d3fff65c293fa6632d21f5d4eebb3641ed93e0 100644 --- a/Drivers/Braille/BrailComm/braille.c +++ b/Drivers/Braille/BrailComm/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -79,8 +79,8 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { serialBaud = baudTable[0]; } - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/BrailComm/brl-out.h b/Drivers/Braille/BrailComm/brl-out.h index 622bab918f34a9819b15ab273b6807c6f7fdc78a..931439122001350a207dcefce9e82a282d0de00e 100644 --- a/Drivers/Braille/BrailComm/brl-out.h +++ b/Drivers/Braille/BrailComm/brl-out.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/BrailleLite/Makefile.in b/Drivers/Braille/BrailleLite/Makefile.in index fec65a235a609e4712c535852c633e16df2ef67d..12343ed51b138f750bc4d31c25b3c9957868af16 100644 --- a/Drivers/Braille/BrailleLite/Makefile.in +++ b/Drivers/Braille/BrailleLite/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/BrailleLite/bindings.h b/Drivers/Braille/BrailleLite/bindings.h index 98b20c7685bfb95bf965441a7c46972bac100246..ce182aafaba14827e151adec7f63ea0d935a706a 100644 --- a/Drivers/Braille/BrailleLite/bindings.h +++ b/Drivers/Braille/BrailleLite/bindings.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/BrailleLite/braille.c b/Drivers/Braille/BrailleLite/braille.c index 66ca32057ab8b884bf7c9c4392fe5518ff61d64f..0b545ab997e547508e6ecf9078814008c848b8be 100644 --- a/Drivers/Braille/BrailleLite/braille.c +++ b/Drivers/Braille/BrailleLite/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -294,8 +294,8 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) logMessage(LOG_WARNING, "%s: %s", "invalid keyboard emulation setting", parameters[PARM_KBEMU]); kbemu = !!kbemu; - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/BrailleLite/braille.h b/Drivers/Braille/BrailleLite/braille.h index fdb71ae9e4e21e9e4d2849aa1246060edcc04ce9..8e291a7e228001b5bb621633ec12e0b9ff14427e 100644 --- a/Drivers/Braille/BrailleLite/braille.h +++ b/Drivers/Braille/BrailleLite/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/BrailleMemo/Makefile.in b/Drivers/Braille/BrailleMemo/Makefile.in index 2cf6d5a2b104b62bb5da622a8f6b160e730eb738..390141154ac32b18c2313a898d5d2a9754c96e7f 100644 --- a/Drivers/Braille/BrailleMemo/Makefile.in +++ b/Drivers/Braille/BrailleMemo/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/BrailleMemo/braille.c b/Drivers/Braille/BrailleMemo/braille.c index 35460526915670a286d150bed043219f693c6d0d..034e7176c52acd6443268f4c7abcfe5ca1f4ec0f 100644 --- a/Drivers/Braille/BrailleMemo/braille.c +++ b/Drivers/Braille/BrailleMemo/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/BrailleMemo/brldefs-mm.h b/Drivers/Braille/BrailleMemo/brldefs-mm.h index 5f5bcdf76f12dc4f228cdeecfa52cb03aaa561ca..54e28da8b8575aba3c3600f9d393b3c8ca8c6828 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 0e01d08ca9e1e9ed0d34b499369d9d67221ef0e0..086ae9d0c5d34228678943fb265295aca00fa0e2 100644 --- a/Drivers/Braille/BrailleNote/Makefile.in +++ b/Drivers/Braille/BrailleNote/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/BrailleNote/braille.c b/Drivers/Braille/BrailleNote/braille.c index 39f72f0faceb7c14574cc42f64b017bb178e9a78..9b7251c6447739295626861c40a43b81d20df941 100644 --- a/Drivers/Braille/BrailleNote/braille.c +++ b/Drivers/Braille/BrailleNote/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/BrailleNote/brldefs-bn.h b/Drivers/Braille/BrailleNote/brldefs-bn.h index 210429274cc0c752f5663b04d8a87f1b4cebb882..666eaed8bf8b0d3eee41fb6740fc616a96e057e0 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 040464f54658207045ed1bdcb04ffef54e82194a..d6d038c5e5f3c06808db1e3de75789b9a3c4e44b 100644 --- a/Drivers/Braille/Braudi/Makefile.in +++ b/Drivers/Braille/Braudi/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Braudi/braille.c b/Drivers/Braille/Braudi/braille.c index 565d9a7b05075aba084fc2e9d2e27df7c5d69073..50cfecc24fcd4f17ef872c549797f09cbae0559e 100644 --- a/Drivers/Braille/Braudi/braille.c +++ b/Drivers/Braille/Braudi/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -171,8 +171,8 @@ setTable (BrailleDisplay *brl, int table) { static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/BrlAPI/Makefile.in b/Drivers/Braille/BrlAPI/Makefile.in index 1070003accb5fe24f71a04ea13e68f5d6bb02ab3..fc9cf00e93c8354fae1e65f6d6587b966792bbbc 100644 --- a/Drivers/Braille/BrlAPI/Makefile.in +++ b/Drivers/Braille/BrlAPI/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/BrlAPI/braille.c b/Drivers/Braille/BrlAPI/braille.c index 1a9485eef15bd3ca3b0684884f93f6bab4ebf982..6c9d8420cb53425be7e4f16be9e19ac6cbfc0988 100644 --- a/Drivers/Braille/BrlAPI/braille.c +++ b/Drivers/Braille/BrlAPI/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Cebra/Makefile.in b/Drivers/Braille/Cebra/Makefile.in index 1a7d0da14ddcd8982ec93ebd007a4a5a2cb4e971..c31963e0171976f424c69036742325b0c9ab9fca 100644 --- a/Drivers/Braille/Cebra/Makefile.in +++ b/Drivers/Braille/Cebra/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Cebra/braille.c b/Drivers/Braille/Cebra/braille.c index 22ce1489b4e90768823e8af30f27b4bcc71388f9..aa4efe0c7f4c5e255adb6bbc1f917700c5c4567b 100644 --- a/Drivers/Braille/Cebra/braille.c +++ b/Drivers/Braille/Cebra/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Cebra/brldefs-ce.h b/Drivers/Braille/Cebra/brldefs-ce.h index 122545bdc1a3f5734dcc8a7eb1108b09e74faf9d..26a4f5029e6406b6fc676a90dcbae7d13f39bd11 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 24a20e54c0709ae28289c1337b68c482367eaac7..c9f672ba3c685ed460b34e71f5e6f1921e2a5c49 100644 --- a/Drivers/Braille/CombiBraille/Makefile.in +++ b/Drivers/Braille/CombiBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/CombiBraille/README b/Drivers/Braille/CombiBraille/README index 41736f1579534df5f3f2439df8eff08b348f31d8..6dc77dba914a111353fd1a0fda6719c4eb81a1dd 100644 --- a/Drivers/Braille/CombiBraille/README +++ b/Drivers/Braille/CombiBraille/README @@ -3,8 +3,8 @@ Driver for Tieman B.V.'s CombiBraille series Copyright (C) 1995, 1996 by Nikhil Nair. This driver is part of BRLTTY, and as such it is placed under the -terms of the GNU General Public License, as published by the Free -Software Foundation. Please see the file LICENSE-GPL in the top-level +terms of the GNU Lesser General Public License, as published by the Free +Software Foundation. Please see the file LICENSE-LGPL in the top-level directory for details. This driver was maintained by Nikhil Nair . diff --git a/Drivers/Braille/CombiBraille/braille.c b/Drivers/Braille/CombiBraille/braille.c index bacbc577d6368dd4e4dc4351a9cda4a59a3c6998..8aac07cb118ce258f56db4934829bd0704fc70e0 100644 --- a/Drivers/Braille/CombiBraille/braille.c +++ b/Drivers/Braille/CombiBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -78,8 +78,8 @@ static unsigned char oldstatus[MAX_STATUS_CELLS]; static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/CombiBraille/braille.h b/Drivers/Braille/CombiBraille/braille.h index 8c00828d1380e590e101477a15e8466ae97e0416..52aa2c6ce62b8eb1aa662ed02d98dbcce68893d1 100644 --- a/Drivers/Braille/CombiBraille/braille.h +++ b/Drivers/Braille/CombiBraille/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/CombiBraille/brldefs-cb.h b/Drivers/Braille/CombiBraille/brldefs-cb.h index 2e45121750ba14d08e57ca609e83f8c4870b938b..ecba1e2065a03d0a2614a02a935275c1223160f7 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Drivers/Braille/EcoBraille/LEEME b/Drivers/Braille/EcoBraille/LEEME index d345f21cba578bf0e4e8f8a8c4b3a0341e7a316e..41a7a6fe04a7d3410bd61516e25d527008144783 100644 --- a/Drivers/Braille/EcoBraille/LEEME +++ b/Drivers/Braille/EcoBraille/LEEME @@ -6,8 +6,9 @@ Version 1.01 (1 de Marzo de 2000) Licencia ======== -Este driver tiene la licencia GNU publica. Este software es gratuito. -Lease el fichero 'LICENSE-GPL' para mas detalles de la licencia. +Este software es gratuito. +Este driver se distrbuye bajo la Licencia Pública General Reducida de GNU. +Lease el fichero 'LICENSE-LGPL' para mas detalles de la licencia. Mandeme sus comentarios o errores encontrados al e-mail ofa@once.es puede hacerlo en castellano, catalan o en ingles. diff --git a/Drivers/Braille/EcoBraille/Makefile.in b/Drivers/Braille/EcoBraille/Makefile.in index d602cb92be240d226617b943be6e1b5f68279069..b6293d1a77e2f79f3a3a826b33485557c4fdfd8e 100644 --- a/Drivers/Braille/EcoBraille/Makefile.in +++ b/Drivers/Braille/EcoBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/EcoBraille/README b/Drivers/Braille/EcoBraille/README index c24d7dcddee6744d21a3ea366c78e8852836b54b..d9e94295b6d302aeeb71dedbb93c41d63705b374 100644 --- a/Drivers/Braille/EcoBraille/README +++ b/Drivers/Braille/EcoBraille/README @@ -6,9 +6,9 @@ Version 1.01 (March 1, 2000) Copyright ========= -This driver is copyrighted under the GNU Public License. It is free -software. See the file 'LICENSE-GPL' for more details. Feel free to send -your comments and to report bugs to me at ofa@once.es +This driver is copyrighted under the GNU Lesser General Public License. +It is free software. See the file 'LICENSE-LGPL' for more details. +Feel free to send your comments and to report bugs to me at ofa@once.es Can you write me in Spanish, catalonian or english. diff --git a/Drivers/Braille/EcoBraille/braille.c b/Drivers/Braille/EcoBraille/braille.c index fc06badaec69c2677c1bee03aa220787ad935a56..4b1f6bda6c99f133fb49508aea60e3034c04e629 100644 --- a/Drivers/Braille/EcoBraille/braille.c +++ b/Drivers/Braille/EcoBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -18,7 +18,7 @@ /* EcoBraille/braille.c - Braille display library for ECO Braille series * Copyright (C) 1999 by Oscar Fernandez - * See the GNU Public license for details in the LICENSE-GPL file + * See the GNU Lesser General Public license for details in the LICENSE-LGPL file * * For debuging define DEBUG variable */ @@ -151,8 +151,8 @@ static int brl_construct(BrailleDisplay *brl, char **parameters, const char *dev short ModelID = MODEL; unsigned char buffer[DIM_BRL_ID + 6]; - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/EcoBraille/braille.h b/Drivers/Braille/EcoBraille/braille.h index 54abf31553906acc24588773b2e376b68143af6d..32792f1e35a7dc2a36da0e44aed6532cd1bd0dc5 100644 --- a/Drivers/Braille/EcoBraille/braille.h +++ b/Drivers/Braille/EcoBraille/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in index 0500aa70e26f2c705ecf90945bddd46a0861a65a..fc606cbf403aca60a26566e9cd905dc9bef9d1ab 100644 --- a/Drivers/Braille/EuroBraille/Makefile.in +++ b/Drivers/Braille/EuroBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -28,7 +28,7 @@ SRC_FILES = eu_braille.c eu_clio.c eu_esysiris.c OBJ_FILES = $(SRC_FILES:.c=.$O) braille.$O: $(OBJ_FILES) - $(MKOBJ) $@ $(OBJ_FILES) + $(MKREL) $@ $(OBJ_FILES) %.$O: $(SRC_DIR)/%.c $(CC) $(BRL_CFLAGS) -o $@ -c $< diff --git a/Drivers/Braille/EuroBraille/README b/Drivers/Braille/EuroBraille/README index a90b5bd4f3a488d05378bccb501cf4ed8499cfe9..6a5ea6d7c23a7f53c8d7223a1c5ad9a47d400466 100644 --- a/Drivers/Braille/EuroBraille/README +++ b/Drivers/Braille/EuroBraille/README @@ -2,8 +2,8 @@ This is the EuroBraille family driver for BRLTTY, version 2.0.0 Initial writing by Nicolas Pitre , Copyright 1997-1998. -This code is copyrighted under the GNU Public License. See the file -LICENSE-GPL included with BRLTTY for details. +This code is copyrighted under the GNU Lesser General Public License. +See the file LICENSE-LGPL included with BRLTTY for details. This driver is currently maintained by * Yannick Plassiard diff --git a/Drivers/Braille/EuroBraille/brldefs-eu.h b/Drivers/Braille/EuroBraille/brldefs-eu.h index eae7f96b384e7e02ce376cb743ed04bc4f253aa7..4a8e516d05ae1dfcba8dcddaf604c187c12f8862 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 b0e2c256555b23ecd9e48088dfd2e0a1e256dd39..8d4b9ff8135b4069fc1a49086a0031dad81f4907 100644 --- a/Drivers/Braille/EuroBraille/eu_braille.c +++ b/Drivers/Braille/EuroBraille/eu_braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/EuroBraille/eu_clio.c b/Drivers/Braille/EuroBraille/eu_clio.c index fa9193dbe0aaaa33ef06506b210f4cd51ea428ee..a8038be7de42897df556e93ab0ec9af3577ef1cf 100644 --- a/Drivers/Braille/EuroBraille/eu_clio.c +++ b/Drivers/Braille/EuroBraille/eu_clio.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/EuroBraille/eu_esysiris.c b/Drivers/Braille/EuroBraille/eu_esysiris.c index 5d8c627f7f2f67bbda7575ca6d239df867f685e4..df210dbd53965f21669e36ebf66d8acbfcecbedf 100644 --- a/Drivers/Braille/EuroBraille/eu_esysiris.c +++ b/Drivers/Braille/EuroBraille/eu_esysiris.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -31,6 +31,7 @@ #include "ascii.h" #include "brldefs-eu.h" #include "eu_protocol.h" +#include "eu_protocoldef.h" #define MAXIMUM_DISPLAY_SIZE 80 @@ -48,11 +49,6 @@ BEGIN_KEY_NAME_TABLE(linear) COMMAND_KEY_ENTRY(L8, "L8"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLE(linear15) - COMMAND_KEY_ENTRY(L1, "L1"), - COMMAND_KEY_ENTRY(L5, "L5"), -END_KEY_NAME_TABLE - BEGIN_KEY_NAME_TABLE(arrow) COMMAND_KEY_ENTRY(Left, "Left"), COMMAND_KEY_ENTRY(Right, "Right"), @@ -167,7 +163,8 @@ END_KEY_NAME_TABLES BEGIN_KEY_NAME_TABLES(esytime) KEY_NAME_TABLE(joystick1), KEY_NAME_TABLE(joystick2), - KEY_NAME_TABLE(linear15), + KEY_NAME_TABLE(linear), + KEY_NAME_TABLE(keyboard), // For braille keyboard when not in usb-hid mode. KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -478,16 +475,16 @@ handleSystemInformation (BrailleDisplay *brl, unsigned char *packet) { enum {Unknown, End, String, Dec8, Dec16, Hex32} infoType; switch(packet[0]) { - case 'H': + case LP_SYSTEM_SHORTNAME: infoType = String; infoDescription = "Short Name"; break; - case 'I': + case LP_SYSTEM_IDENTITY: infoType = End; break; - case 'G': + case LP_SYSTEM_DISPLAY_LENGTH: if (haveSystemInformation) brl->resizeRequired = 1; brl->textColumns = packet[1]; @@ -495,12 +492,12 @@ handleSystemInformation (BrailleDisplay *brl, unsigned char *packet) { infoDescription = "Cell Count"; break; - case 'L': + case LP_SYSTEM_LANGUAGE: infoType = String; infoDescription = "Country Code"; break; - case 'M': + case LP_SYSTEM_FRAME_LENGTH: maximumFrameLength = (packet[1] << 8) | (packet[2] << 0) ; @@ -509,12 +506,12 @@ handleSystemInformation (BrailleDisplay *brl, unsigned char *packet) { infoDescription = "Maximum Frame Length"; break; - case 'N': + case LP_SYSTEM_NAME: infoType = String; infoDescription = "Long Name"; break; - case 'O': + case LP_SYSTEM_OPTION: deviceOptions = (packet[1] << 24) | (packet[2] << 16) | (packet[3] << 8) @@ -525,7 +522,7 @@ handleSystemInformation (BrailleDisplay *brl, unsigned char *packet) { infoDescription = "Device Options"; break; - case 'P': + case LP_SYSTEM_PROTOCOL: protocolVersion = ((packet[1] - '0') << 16) | ((packet[3] - '0') << 8) | ((packet[4] - '0') << 0) @@ -535,12 +532,12 @@ handleSystemInformation (BrailleDisplay *brl, unsigned char *packet) { infoDescription = "Protocol Version"; break; - case 'S': + case LP_SYSTEM_SERIAL: infoType = String; infoDescription = "Serial Number"; break; - case 'T': + case LP_SYSTEM_TYPE: { unsigned char identifier = packet[1]; @@ -553,7 +550,7 @@ handleSystemInformation (BrailleDisplay *brl, unsigned char *packet) { infoDescription = "Model Identifier"; break; - case 'W': + case LP_SYSTEM_SOFTWARE: firmwareVersion = ((packet[1] - '0') << 16) | ((packet[3] - '0') << 8) | ((packet[4] - '0') << 0) @@ -706,26 +703,25 @@ makeKeyboardCommand (BrailleDisplay *brl, const unsigned char *packet) { static int handleKeyEvent (BrailleDisplay *brl, unsigned char *packet) { switch (packet[0]) { - case 'B': { + case LP_KEY_BRAILLE: { KeyNumberSet keys = ((packet[1] << 8) | packet[2]) & 0X3Ff; - enqueueKeys(brl, keys, EU_GRP_BrailleKeys, 0); return 1; } - case 'I': { + case LP_KEY_INTERACTIVE: { unsigned char key = packet[2]; if ((key > 0) && (key <= brl->textColumns)) { key -= 1; switch (packet[1]) { - case 1: // single click + case INTERACTIVE_SINGLE_CLIC: // single click enqueueKey(brl, EU_GRP_RoutingKeys1, key); - case 2: // repeat + case INTERACTIVE_REPETITION: // repeat return 1; - case 3: // double click + case INTERACTIVE_DOUBLE_CLIC: // double click enqueueKey(brl, EU_GRP_RoutingKeys2, key); return 1; @@ -737,7 +733,7 @@ handleKeyEvent (BrailleDisplay *brl, unsigned char *packet) { break; } - case 'C': { + case LP_KEY_COMMAND: { KeyNumberSet keys; if (model->isIris) { @@ -755,7 +751,7 @@ handleKeyEvent (BrailleDisplay *brl, unsigned char *packet) { return 1; } - case 'Z': { + case LP_KEY_PC: { int command = makeKeyboardCommand(brl, packet); enqueueCommand(command); @@ -777,22 +773,22 @@ readCommand (BrailleDisplay *brl, KeyTableCommandContext ctx) { while ((length = readPacket(brl, packet, sizeof(packet))) > 0) { switch (packet[3]) { - case 'S': + case LP_SYSTEM: if (handleSystemInformation(brl, packet+4)) haveSystemInformation = 1; continue; - case 'K': + case LP_KEY: if (handleKeyEvent(brl, packet+4)) continue; break; - case 'R': - if (packet[4] == 'P') { + case LP_MODE: + if (packet[4] == LP_MODE_PILOT) { /* return from internal menu */ forceRewrite(); } continue; - case 'V': + case LP_VISU: /* ignore visualization */ continue; @@ -825,7 +821,7 @@ initializeDevice (BrailleDisplay *brl) { do { { - static const unsigned char packet[] = {'S', 'I'}; + static const unsigned char packet[] = {LP_SYSTEM, LP_SYSTEM_IDENTITY}; if (writePacket(brl, packet, sizeof(packet)) == -1) return 0; } @@ -866,8 +862,8 @@ writeWindow (BrailleDisplay *brl) { unsigned char data[size + 2]; unsigned char *byte = data; - *byte++ = 'B'; - *byte++ = 'S'; + *byte++ = LP_BRAILLE_DISPLAY; + *byte++ = LP_BRAILLE_DISPLAY_STATIC; byte = translateOutputCells(byte, brl->buffer, size); if (writePacket(brl, data, byte-data) == -1) return 0; @@ -892,8 +888,8 @@ writeVisual (BrailleDisplay *brl, const wchar_t *text) { unsigned char data[size + 2]; unsigned char *byte = data; - *byte++ = 'L'; - *byte++ = 'T'; + *byte++ = LP_LCD_DISPLAY; + *byte++ = LP_LCD_DISPLAY_TEXT; { const wchar_t *character = text; @@ -914,7 +910,7 @@ writeVisual (BrailleDisplay *brl, const wchar_t *text) { if (cursorHasChanged(&previousCursor, brl->cursor, &forceCursorRewrite )) { const unsigned char packet[] = { - 'L', 'C', ((brl->cursor != BRL_NO_CURSOR)? (brl->cursor + 1): 0) + LP_LCD_DISPLAY, LP_LCD_DISPLAY_CARET, ((brl->cursor != BRL_NO_CURSOR)? (brl->cursor + 1): 0) }; if (writePacket(brl, packet, sizeof(packet)) == -1) return 0; diff --git a/Drivers/Braille/EuroBraille/eu_protocol.h b/Drivers/Braille/EuroBraille/eu_protocol.h index 92e7bf872160f4ee3e9d4814444667fc6074b91b..d0f1b0cf40bfae4b5771f0e66baafe3a12aec469 100644 --- a/Drivers/Braille/EuroBraille/eu_protocol.h +++ b/Drivers/Braille/EuroBraille/eu_protocol.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/EuroBraille/eu_protocoldef.h b/Drivers/Braille/EuroBraille/eu_protocoldef.h new file mode 100644 index 0000000000000000000000000000000000000000..2bc72491039f90e616c1f8df607b96cdbae372db --- /dev/null +++ b/Drivers/Braille/EuroBraille/eu_protocoldef.h @@ -0,0 +1,178 @@ + +///////////////////////////////////////////////////////////////// +// LINK PROTOCOL - KEY + // this key is operational only if subkey is 'B','D' or 'B','S' (LP_BRAILLE_DISPLAY,LP_BRAILLE_DISPLAY_STATIC/LP_BRAILLE_DISPLAY_DYNAMIC +#define LP_SPECIFIC_PROTOCOL '1' + +#define LP_SYSTEM 'S' +#define LP_MODE 'R' +#define LP_KEY 'K' +#define LP_PARAMETER 'P' //specific esytime2 +#define LP_TRANSFERT 't' // Specific Esytime. +#define LP_ENCRYPTION_KEY 'Z' +#define LP_BRAILLE_DISPLAY 'B' +#define LP_LCD_DISPLAY 'L' +//#define LP_TEST 'T' +//#define LP_SOUND 'M' +//#define LP_DEBUG 'D' // Trame de Débug +#define LP_VISU 'V' // Trame de Visualisation + +// LINK PROTOCOL LP_ENCRYPTION_KEY +#define LP_ENCRYPTION_KEY_1 '1' +#define LP_ENCRYPTION_KEY_2 '2' +#define LP_ENCRYPTION_KEY_3 '3' +#define LP_EXT_KEY 'X' +#define LP_END_KEY 'E' + +// LINK PROTOCOL KEYBOARD - SUBKey +#define LP_KEY_INTERACTIVE 'I' +#define LP_KEY_COMMAND 'C' +#define LP_KEY_OPTICAL 'O' +#define LP_KEY_BRAILLE 'B' +#define LP_KEY_PC 'Z' +#define LP_KEY_FINGER 'F' +#define LP_KEY_USB_HID_MODE 'U' +#define LP_KEY_USB 'u' // Trame touche à générer via l'USB (Spécific Esytouch) + + +// LINK PROTOCOL BRAILLEDISPLAY - SUBKEY +#define LP_BRAILLE_DISPLAY_STATIC 'S' +#define LP_BRAILLE_DISPLAY_DYNAMIC 'C' +#define LP_BRAILLE_DISPLAY_BLINK 'B' +//#define LP_BRAILLE_DISPLAY_DEBUG_TEXT 'X' + +// LINK PROTOCOL BRAILLEDISPLAY - SUBKEY +#define LP_LCD_DISPLAY_TEXT 'T' +#define LP_LCD_DISPLAY_CARET 'C' + +// LINK PROTOCOL SYSTEM - SUBKEY +#define LP_SYSTEM_IDENTITY 'I' +#define LP_SYSTEM_NAME 'N' +#define LP_SYSTEM_SHORTNAME 'H' +#define LP_SYSTEM_SERIAL 'S' +#define LP_SYSTEM_LANGUAGE 'L' +#define LP_SYSTEM_LANGUAGE_OPTION 'l' +#define LP_SYSTEM_BATTERY 'B' +#define LP_SYSTEM_DISPLAY_LENGTH 'G' +#define LP_SYSTEM_TYPE 'T' +#define LP_SYSTEM_OPTION 'O' +#define LP_SYSTEM_SOFTWARE 'W' +#define LP_SYSTEM_PROTOCOL 'P' +#define LP_SYSTEM_FRAME_LENGTH 'M' +#define LP_SYSTEM_DATE_AND_TIME 'D' +#define LP_SYSTEM_OPTICAL_VALUE 'o' + +// LINK PROTOCOL PARAMETERS - SUBKEY +#define LP_PARAMETER_NAME 'N' +#define LP_PARAMETER_SHORT_NAME 'S' +#define LP_PARAMETER_SERIAL 'R' +#define LP_PARAMETER_OPTION 'O' + + +// LINK PROTOCOL TEST - SUBKEY +#define LP_TEST_LINK 'L' + +// LINK PROTOCOL MODE - SUBKEY +#define LP_MODE_PILOT 'P' +#define LP_MODE_INTERNAL 'I' +#define LP_MODE_MENU 'M' +#define LP_MODE_SPECIFIC_PROTOCOL 'S' + +// LINK PROTOCOL SOUND - SUBKEY +#define LP_SOUND_PLAY 'P' +#define LP_SOUND_STOP 'A' + +// LINK PROTOCOL DEBUG - SUBKey +#define LP_DEBUG_SIMU 'S' // FIX ME à supprimer dans quelques jours... +#define LP_DEBUG_TRACE 'T' // FIX ME à supprimer dans quelques jours... +#define LP_DEBUG_LOG 'L' +#define LP_DEBUG_WARN 'W' +#define LP_DEBUG_ERROR 'E' + +// LINK PROTOCOL VISU - SUBKey +#define LP_VISU_TEXT 'T' +#define LP_VISU_DOT 'D' + +// LINK PROTOCOL TRANSFERT - SUBKey +#define LP_TRANSFERT_PARAMETERS 'p' // Request to receive or send the assignment table. +//#define LP_TRANSFERT_TABLE 't' // Request to receive or send the assignment table. +#define LP_TRANSFERT_FIRMWARE 'f' // Request to send the assignment table. +#define LP_TRANSFERT_RECORD 'r' // A record in Intel Hexa format. +#define LP_TRANSFERT_NEXT_RECORD 'n' // Request to receive the next record. +#define LP_TRANSFERT_ASK_CHECKSUM 'c' // Ask the checksum on complete hex file. +#define LP_TRANSFERT_END 'e' // Notify the end of transfert. +#define LP_TRANSFERT_ERROR 'o' // Error + +///////////////////////////////////////////////////////////////// +// TYPE OF INTERACTIVE KEYS +#define INTERACTIVE_SINGLE_CLIC 0x01 +#define INTERACTIVE_REPETITION 0x02 +#define INTERACTIVE_DOUBLE_CLIC 0x03 + +///////////////////////////////////////////////////////////////// +// IRIS COMMANDS KEYBOARD +typedef enum { + IRIS_L1_KEY = 0x00000001, + IRIS_L2_KEY = 0x00000002, + IRIS_L3_KEY = 0x00000004, + IRIS_L4_KEY = 0x00000008, + IRIS_L5_KEY = 0x00000010, + IRIS_L6_KEY = 0x00000020, + IRIS_L7_KEY = 0x00000040, + IRIS_L8_KEY = 0x00000080, + IRIS_UP_KEY = 0x00000100, + IRIS_LEFT_KEY = 0x00000800, + IRIS_RIGHT_KEY = 0x00000400, + IRIS_DOWN_KEY = 0x00000200, +} IRIS_COMMAND, * PIRIS_COMMAND; + +///////////////////////////////////////////////////////////////// +// ESYS COMMANDS KEYBOARD +typedef enum { + ESYS_SCROLLER1_RIGHT_KEY = 0x00000001, + ESYS_SCROLLER1_LEFT_KEY = 0x00000002, + ESYS_SCROLLER2_RIGHT_KEY = 0x00000004, + ESYS_SCROLLER2_LEFT_KEY = 0x00000008, + ESYS_SCROLLER3_RIGHT_KEY = 0x00000010, + ESYS_SCROLLER3_LEFT_KEY = 0x00000020, + ESYS_SCROLLER4_RIGHT_KEY = 0x00000040, + ESYS_SCROLLER4_LEFT_KEY = 0x00000080, + ESYS_SCROLLER5_RIGHT_KEY = 0x00000100, + ESYS_SCROLLER5_LEFT_KEY = 0x00000200, + ESYS_SCROLLER6_RIGHT_KEY = 0x00000400, + ESYS_SCROLLER6_LEFT_KEY = 0x00000800, + ESYS_JOYSTICK1_UP_KEY = 0x00010000, + ESYS_JOYSTICK1_DOWN_KEY = 0x00020000, + ESYS_JOYSTICK1_RIGHT_KEY = 0x00040000, + ESYS_JOYSTICK1_LEFT_KEY = 0x00080000, + ESYS_JOYSTICK1_MIDDLE_KEY = 0x00100000, + ESYS_JOYSTICK2_UP_KEY = 0x01000000, + ESYS_JOYSTICK2_DOWN_KEY = 0x02000000, + ESYS_JOYSTICK2_RIGHT_KEY = 0x04000000, + ESYS_JOYSTICK2_LEFT_KEY = 0x08000000, + ESYS_JOYSTICK2_MIDDLE_KEY = 0x10000000 +} ESYS_COMMAND, * PESYS_COMMAND; + +///////////////////////////////////////////////////////////////// +// ESYTIME COMMANDS KEYBOARD +typedef enum { + ESYTIME_L1_KEY = 0x00000001, + ESYTIME_L2_KEY = 0x00000002, + ESYTIME_L3_KEY = 0x00000004, + ESYTIME_L4_KEY = 0x00000008, + ESYTIME_L5_KEY = 0x00000010, + ESYTIME_L6_KEY = 0x00000020, + ESYTIME_L7_KEY = 0x00000040, + ESYTIME_L8_KEY = 0x00000080, + ESYTIME_JOYSTICK1_UP_KEY = 0x00010000, + ESYTIME_JOYSTICK1_DOWN_KEY = 0x00020000, + ESYTIME_JOYSTICK1_RIGHT_KEY = 0x00040000, + ESYTIME_JOYSTICK1_LEFT_KEY = 0x00080000, + ESYTIME_JOYSTICK1_MIDDLE_KEY = 0x00100000, + ESYTIME_JOYSTICK2_UP_KEY = 0x01000000, + ESYTIME_JOYSTICK2_DOWN_KEY = 0x02000000, + ESYTIME_JOYSTICK2_RIGHT_KEY = 0x04000000, + ESYTIME_JOYSTICK2_LEFT_KEY = 0x08000000, + ESYTIME_JOYSTICK2_MIDDLE_KEY = 0x10000000 +} ESYTIME_COMMAND, * PESYSTIME_COMMAND; + diff --git a/Drivers/Braille/EuroBraille/reldeps.mk b/Drivers/Braille/EuroBraille/reldeps.mk index 7adacf18ec535e231241646f237e45165d277073..1a3cbc1defd083b299f4302be378e36d180c5050 100644 --- a/Drivers/Braille/EuroBraille/reldeps.mk +++ b/Drivers/Braille/EuroBraille/reldeps.mk @@ -74,6 +74,7 @@ eu_esysiris.$O: $(SRC_TOP)Headers/ktb_types.h eu_esysiris.$O: $(SRC_TOP)Headers/queue.h eu_esysiris.$O: $(SRC_TOP)Headers/serial_types.h eu_esysiris.$O: $(SRC_TOP)Headers/usb_types.h +eu_esysiris.$O: $(SRC_DIR)/eu_protocoldef.h # Dependencies for eutp_brl.$O: eutp_brl.$O: $(SRC_DIR)/eutp_brl.c diff --git a/Drivers/Braille/FreedomScientific/Makefile.in b/Drivers/Braille/FreedomScientific/Makefile.in index 974a656b1d0c8e937ab7bf09db9ce1343a1b11f0..3669a26b9a3175c6d7954f86c9970af065d64fab 100644 --- a/Drivers/Braille/FreedomScientific/Makefile.in +++ b/Drivers/Braille/FreedomScientific/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/FreedomScientific/braille.c b/Drivers/Braille/FreedomScientific/braille.c index 4cef7924ef80c35f379d2cb7df3efbc55679cc36..16efe33524fef35806ab721298e40ae09635bb14 100644 --- a/Drivers/Braille/FreedomScientific/braille.c +++ b/Drivers/Braille/FreedomScientific/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -479,7 +479,7 @@ ASYNC_ALARM_CALLBACK(handleMissingAcknowledgementAlarm) { static int setMissingAcknowledgementAlarm (BrailleDisplay *brl, int timeout) { if (!brl->data->missingAcknowledgementAlarm) { - if (!asyncSetAlarmIn(&brl->data->missingAcknowledgementAlarm, timeout, + if (!asyncNewRelativeAlarm(&brl->data->missingAcknowledgementAlarm, timeout, handleMissingAcknowledgementAlarm, brl)) { return 0; } diff --git a/Drivers/Braille/FreedomScientific/brldefs-fs.h b/Drivers/Braille/FreedomScientific/brldefs-fs.h index 180f8be930e76abd8d1d73e2f3540f58dbc6bf71..19265fdf515f8a3c63b78c35413bd7bdafc833d3 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 6d8eb287c2c12af6498667368787815468969009..b6fde8683a2f48a390623989be954bf691b1394d 100644 --- a/Drivers/Braille/HIMS/Makefile.in +++ b/Drivers/Braille/HIMS/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/HIMS/braille.c b/Drivers/Braille/HIMS/braille.c index cb174c49af271f2191d36ba582d6edbda3454ca5..876def075ac4a9baf028ca6f4767384d614bfb25 100644 --- a/Drivers/Braille/HIMS/braille.c +++ b/Drivers/Braille/HIMS/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/HIMS/brldefs-hm.h b/Drivers/Braille/HIMS/brldefs-hm.h index 3e18d459d1bc2c3753ed45b30d3d7803984a972a..dcc7764e34e74b47599a9db51da8062e54a8f406 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 2482b68e681be32acd7d059e9f1b20547c262c0b..b339f94eac2fce9f5e3daa1341bf643f2b318110 100644 --- a/Drivers/Braille/HandyTech/Makefile.in +++ b/Drivers/Braille/HandyTech/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c index ef95fd15b44a920ccf95d5d58f7eceae202bde0e..988104251b6200f26080eaaf68093a6b63b13434 100644 --- a/Drivers/Braille/HandyTech/braille.c +++ b/Drivers/Braille/HandyTech/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -1560,7 +1560,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) { case HT_EXTPKT_Scancode: { while (length--) enqueueCommand(BRL_CMD_BLK(PASSAT) | BRL_ARG_PUT(*bytes++)); - break; + continue; } case HT_EXTPKT_GetRTC: { diff --git a/Drivers/Braille/HandyTech/brldefs-ht.h b/Drivers/Braille/HandyTech/brldefs-ht.h index d94e3ba177c48e16d995eb1709940345815eda2a..9d7ce57d2db3509091f390b559e5f9cb18eb8636 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 602ba08b11e15a5afb48f3c0afb67a50ef1508a3..71b9dda7c26d8148fff0e674f8a58b6b1919a0db 100644 --- a/Drivers/Braille/Hedo/Makefile.in +++ b/Drivers/Braille/Hedo/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Hedo/braille.c b/Drivers/Braille/Hedo/braille.c index 686eecbcc3988179b1e381ba88cfa52559bc9bd5..7acd4c7644e3b66e3c8ed38b9886bee2e1da199e 100644 --- a/Drivers/Braille/Hedo/braille.c +++ b/Drivers/Braille/Hedo/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Hedo/brldefs-hd.h b/Drivers/Braille/Hedo/brldefs-hd.h index 5f1a01fc68ee8c8bb3dcede8dc1f8e72c9875593..9767cd1524741d35050effc53c152224c2e6e5d4 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 6d178a5ccf4dcea39530240f4476bff08814dff8..725e5fb763594a0e6c3f4eec53664e866c639d38 100644 --- a/Drivers/Braille/HumanWare/Makefile.in +++ b/Drivers/Braille/HumanWare/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -18,7 +18,7 @@ DRIVER_CODE = hw DRIVER_NAME = HumanWare -DRIVER_COMMENT = Brailliant 32/40/80 bi +DRIVER_COMMENT = Brailliant BI 14/32/40, Brailliant B 80, BrailleNote Touch DRIVER_VERSION = DRIVER_DEVELOPERS = Dave Mielke include $(SRC_TOP)braille.mk diff --git a/Drivers/Braille/HumanWare/braille.c b/Drivers/Braille/HumanWare/braille.c index c998d049a38e2e8ce90a2a3101a041e46156e736..2f06084292a26b8c29d2f7b0576a34b01bedb86c 100644 --- a/Drivers/Braille/HumanWare/braille.c +++ b/Drivers/Braille/HumanWare/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -30,25 +30,11 @@ #include "brl_driver.h" #include "brldefs-hw.h" -BEGIN_KEY_NAME_TABLE(nav) - KEY_NAME_ENTRY(HW_KEY_Reset, "Reset"), - - KEY_NAME_ENTRY(HW_KEY_Command1, "Display1"), - KEY_NAME_ENTRY(HW_KEY_Command2, "Display2"), - KEY_NAME_ENTRY(HW_KEY_Command3, "Display3"), - KEY_NAME_ENTRY(HW_KEY_Command4, "Display4"), - KEY_NAME_ENTRY(HW_KEY_Command5, "Display5"), - KEY_NAME_ENTRY(HW_KEY_Command6, "Display6"), - - KEY_NAME_ENTRY(HW_KEY_Thumb1, "Thumb1"), - KEY_NAME_ENTRY(HW_KEY_Thumb2, "Thumb2"), - KEY_NAME_ENTRY(HW_KEY_Thumb3, "Thumb3"), - KEY_NAME_ENTRY(HW_KEY_Thumb4, "Thumb4"), - +BEGIN_KEY_NAME_TABLE(routing) KEY_GROUP_ENTRY(HW_GRP_RoutingKeys, "RoutingKey"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLE(kbd) +BEGIN_KEY_NAME_TABLE(braille) KEY_NAME_ENTRY(HW_KEY_Dot1, "Dot1"), KEY_NAME_ENTRY(HW_KEY_Dot2, "Dot2"), KEY_NAME_ENTRY(HW_KEY_Dot3, "Dot3"), @@ -60,23 +46,115 @@ BEGIN_KEY_NAME_TABLE(kbd) KEY_NAME_ENTRY(HW_KEY_Space, "Space"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLES(mb1) - KEY_NAME_TABLE(nav), +BEGIN_KEY_NAME_TABLE(command) + KEY_NAME_ENTRY(HW_KEY_Command1, "Display1"), + KEY_NAME_ENTRY(HW_KEY_Command2, "Display2"), + KEY_NAME_ENTRY(HW_KEY_Command3, "Display3"), + KEY_NAME_ENTRY(HW_KEY_Command4, "Display4"), + KEY_NAME_ENTRY(HW_KEY_Command5, "Display5"), + KEY_NAME_ENTRY(HW_KEY_Command6, "Display6"), +END_KEY_NAME_TABLE + +BEGIN_KEY_NAME_TABLE(joystick) + KEY_NAME_ENTRY(HW_KEY_Up, "Up"), + KEY_NAME_ENTRY(HW_KEY_Down, "Down"), + KEY_NAME_ENTRY(HW_KEY_Left, "Left"), + KEY_NAME_ENTRY(HW_KEY_Right, "Right"), + KEY_NAME_ENTRY(HW_KEY_Action, "Action"), +END_KEY_NAME_TABLE + +BEGIN_KEY_NAME_TABLE(thumb) + KEY_NAME_ENTRY(HW_KEY_Thumb1, "Previous"), + KEY_NAME_ENTRY(HW_KEY_Thumb2, "Back"), + KEY_NAME_ENTRY(HW_KEY_Thumb3, "Advance"), + KEY_NAME_ENTRY(HW_KEY_Thumb4, "Next"), +END_KEY_NAME_TABLE + +BEGIN_KEY_NAME_TABLES(BI14) + KEY_NAME_TABLE(routing), + KEY_NAME_TABLE(thumb), + KEY_NAME_TABLE(braille), + KEY_NAME_TABLE(joystick), +END_KEY_NAME_TABLES + +BEGIN_KEY_NAME_TABLES(BI32) + KEY_NAME_TABLE(routing), + KEY_NAME_TABLE(thumb), + KEY_NAME_TABLE(braille), + KEY_NAME_TABLE(command), +END_KEY_NAME_TABLES + +BEGIN_KEY_NAME_TABLES(BI40) + KEY_NAME_TABLE(routing), + KEY_NAME_TABLE(thumb), + KEY_NAME_TABLE(braille), + KEY_NAME_TABLE(command), +END_KEY_NAME_TABLES + +BEGIN_KEY_NAME_TABLES(B80) + KEY_NAME_TABLE(routing), + KEY_NAME_TABLE(thumb), + KEY_NAME_TABLE(command), END_KEY_NAME_TABLES -BEGIN_KEY_NAME_TABLES(mb2) - KEY_NAME_TABLE(nav), - KEY_NAME_TABLE(kbd), +BEGIN_KEY_NAME_TABLES(touch) + KEY_NAME_TABLE(routing), + KEY_NAME_TABLE(thumb), + KEY_NAME_TABLE(braille), END_KEY_NAME_TABLES -DEFINE_KEY_TABLE(mb1) -DEFINE_KEY_TABLE(mb2) +DEFINE_KEY_TABLE(BI14) +DEFINE_KEY_TABLE(BI32) +DEFINE_KEY_TABLE(BI40) +DEFINE_KEY_TABLE(B80) +DEFINE_KEY_TABLE(touch) BEGIN_KEY_TABLE_LIST - &KEY_TABLE_DEFINITION(mb1), - &KEY_TABLE_DEFINITION(mb2), + &KEY_TABLE_DEFINITION(BI14), + &KEY_TABLE_DEFINITION(BI32), + &KEY_TABLE_DEFINITION(BI40), + &KEY_TABLE_DEFINITION(B80), + &KEY_TABLE_DEFINITION(touch), END_KEY_TABLE_LIST +typedef struct { + const KeyTableDefinition *keyTableDefinition; + unsigned hasBrailleKeys:1; + unsigned hasCommandKeys:1; + unsigned hasJoystick:1; + unsigned hasSecondThumbKeys:1; +} ModelEntry; + +static const ModelEntry modelEntry_BI14 = { + .hasBrailleKeys = 1, + .hasJoystick = 1, + .keyTableDefinition = &KEY_TABLE_DEFINITION(BI14) +}; + +static const ModelEntry modelEntry_BI32 = { + .hasBrailleKeys = 1, + .hasCommandKeys = 1, + .keyTableDefinition = &KEY_TABLE_DEFINITION(BI32) +}; + +static const ModelEntry modelEntry_BI40 = { + .hasBrailleKeys = 1, + .hasCommandKeys = 1, + .keyTableDefinition = &KEY_TABLE_DEFINITION(BI40) +}; + +static const ModelEntry modelEntry_B80 = { + .hasCommandKeys = 1, + .hasSecondThumbKeys = 1, + .keyTableDefinition = &KEY_TABLE_DEFINITION(B80) +}; + +static const ModelEntry modelEntry_touch = { + .hasBrailleKeys = 1, + .hasCommandKeys = 0, + .keyTableDefinition = &KEY_TABLE_DEFINITION(touch) +}; + #define OPEN_READY_DELAY 100 #define SERIAL_PROBE_RESPONSE_TIMEOUT 1000 @@ -93,6 +171,7 @@ END_KEY_TABLE_LIST #define BRAILLE_KEY_COUNT (8 + 1) #define COMMAND_KEY_COUNT 6 #define THUMB_KEY_COUNT 4 +#define JOYSTICK_KEY_COUNT 5 typedef struct { const char *name; @@ -104,7 +183,10 @@ typedef struct { struct BrailleDataStruct { const ProtocolEntry *protocol; + const ModelEntry *model; + uint32_t firmwareVersion; + unsigned isBrailleNoteTouch:1; unsigned isOffline:1; struct { @@ -130,22 +212,39 @@ struct BrailleDataStruct { } hid; }; +static const ModelEntry * +getModelEntry (BrailleDisplay *brl) { + if (brl->data->isBrailleNoteTouch) return &modelEntry_touch; + + switch (brl->textColumns) { + case 14: return &modelEntry_BI14; + case 32: return &modelEntry_BI32; + case 40: return &modelEntry_BI40; + case 80: return &modelEntry_B80; + default: return NULL; + } +} + +static void +setModel (BrailleDisplay *brl) { + brl->data->model = getModelEntry(brl); +} + static int getDecimalValue (const char *digits, unsigned int count) { + const char *end = digits + count; unsigned int result = 0; - const char zero = '0'; - const char nine = '9'; - const char *digit = digits; - const char *end = digit + count; + while (digits < end) { + char digit = *digits++; + if (digit >= zero) digit -= zero; - while (digit < end) { - if (*digit < zero) return 0; - if (*digit > nine) return 0; + if (digit < 0) return 0; + if (digit > 9) return 0; result *= 10; - result += *digit++ - zero; + result += digit; } return result; @@ -157,20 +256,6 @@ setFirmwareVersion (BrailleDisplay *brl, unsigned char major, unsigned char mino brl->data->firmwareVersion = (major << 16) | (minor << 8) << (build << 0); } -static int -hasBrailleKeyboard (BrailleDisplay *brl) { - if (brl->textColumns == 18) return 1; - if (brl->textColumns == 32) return 1; - if (brl->textColumns == 40) return 1; - return 0; -} - -static int -hasSecondThumbKeys (BrailleDisplay *brl) { - if (brl->textColumns == 80) return 1; - return 0; -} - static int handleKeyEvent (BrailleDisplay *brl, unsigned char key, int press) { KeyGroup group; @@ -363,7 +448,14 @@ probeSerialDisplay (BrailleDisplay *brl) { response.fields.data.init.modelIdentifier, response.fields.data.init.cellCount); + switch (response.fields.data.init.modelIdentifier) { + case HW_MODEL_BrailleNoteTouch: + brl->data->isBrailleNoteTouch = 1; + break; + } + brl->textColumns = response.fields.data.init.cellCount; + setModel(brl); writeSerialRequest(brl, HW_MSG_GET_FIRMWARE_VERSION); writeSerialRequest(brl, HW_MSG_GET_KEYS); @@ -540,12 +632,15 @@ probeHidDisplay (BrailleDisplay *brl) { getDecimalValue(&capabilities.version.build[0], 2)); brl->textColumns = capabilities.cellCount; + setModel(brl); { unsigned char *size = &brl->data->hid.pressedKeys.reportSize; - *size = 1 + THUMB_KEY_COUNT + COMMAND_KEY_COUNT + brl->textColumns; - if (hasBrailleKeyboard(brl)) *size += BRAILLE_KEY_COUNT; - if (hasSecondThumbKeys(brl)) *size += THUMB_KEY_COUNT; + *size = 1 + THUMB_KEY_COUNT + brl->textColumns; + if (brl->data->model->hasBrailleKeys) *size += BRAILLE_KEY_COUNT; + if (brl->data->model->hasCommandKeys) *size += COMMAND_KEY_COUNT; + if (brl->data->model->hasJoystick) *size += JOYSTICK_KEY_COUNT; + if (brl->data->model->hasSecondThumbKeys) *size += THUMB_KEY_COUNT; } return 1; @@ -612,6 +707,26 @@ static const ProtocolEntry hidProtocol = { .keepAwake = keepHidAwake }; +typedef struct { + const ProtocolEntry *protocol; + unsigned isTouch:1; +} ResourceData; + +static const ResourceData resourceData_serial = { + .isTouch = 0, // probing detects if it's a Touch or not + .protocol = &serialProtocol +}; + +static const ResourceData resourceData_HID = { + .isTouch = 0, // only for non-Touch models + .protocol = &hidProtocol +}; + +static const ResourceData resourceData_touch = { + .isTouch = 1, + .protocol = &hidProtocol +}; + static int connectResource (BrailleDisplay *brl, const char *identifier) { static const SerialParameters serialParameters = { @@ -626,21 +741,21 @@ connectResource (BrailleDisplay *brl, const char *identifier) { .configuration=1, .interface=1, .alternative=0, .inputEndpoint=2, .outputEndpoint=3, .serial = &serialParameters, - .data = &serialProtocol + .data = &resourceData_serial }, - { /* all models (HID protocol) */ + { /* non-Touch models (HID protocol) */ .vendor=0X1C71, .product=0XC006, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, - .data = &hidProtocol + .data = &resourceData_HID }, { /* BrailleNote Touch (HID protocol) */ .vendor=0X1C71, .product=0XC00A, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, - .data = &hidProtocol + .data = &resourceData_touch }, END_USB_CHANNEL_DEFINITIONS @@ -648,18 +763,20 @@ connectResource (BrailleDisplay *brl, const char *identifier) { gioInitializeDescriptor(&descriptor); descriptor.serial.parameters = &serialParameters; - descriptor.serial.options.applicationData = &serialProtocol; + descriptor.serial.options.applicationData = &resourceData_serial; descriptor.serial.options.readyDelay = OPEN_READY_DELAY; descriptor.usb.channelDefinitions = usbChannelDefinitions; descriptor.usb.options.readyDelay = OPEN_READY_DELAY; descriptor.bluetooth.channelNumber = 1; - descriptor.bluetooth.options.applicationData = &serialProtocol; + descriptor.bluetooth.options.applicationData = &resourceData_serial; descriptor.bluetooth.options.readyDelay = OPEN_READY_DELAY; if (connectBrailleResource(brl, identifier, &descriptor, NULL)) { - brl->data->protocol = gioGetApplicationData(brl->gioEndpoint); + const ResourceData *resourceData = gioGetApplicationData(brl->gioEndpoint); + brl->data->protocol = resourceData->protocol; + brl->data->isBrailleNoteTouch = resourceData->isTouch; return 1; } @@ -678,15 +795,7 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { if (connectResource(brl, device)) { if (brl->data->protocol->probeDisplay(brl)) { - { - const KeyTableDefinition *ktd = - hasBrailleKeyboard(brl)? - &KEY_TABLE_DEFINITION(mb2): - &KEY_TABLE_DEFINITION(mb1); - - setBrailleKeyTable(brl, ktd); - } - + setBrailleKeyTable(brl, brl->data->model->keyTableDefinition); makeOutputTable(dotsTable_ISO11548_1); brl->data->text.rewrite = 1; return 1; diff --git a/Drivers/Braille/HumanWare/brldefs-hw.h b/Drivers/Braille/HumanWare/brldefs-hw.h index 2adbd02ec5a5fd86702daeb69d2ccaa9b10ccf9e..9666e365210ca5f647787fd1a2ef033eb258fce4 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -39,6 +39,10 @@ typedef enum { HW_MSG_POWERING_OFF = 0X10 } HW_MessageType; +typedef enum { + HW_MODEL_BrailleNoteTouch = 0X10 +} HW_ModelIdentifier; + typedef union { unsigned char bytes[3 + 0XFF]; @@ -154,6 +158,12 @@ typedef enum { HW_KEY_Thumb3 = 19, HW_KEY_Thumb4 = 20, + HW_KEY_Up = 21, + HW_KEY_Down = 22, + HW_KEY_Left = 23, + HW_KEY_Right = 24, + HW_KEY_Action = 25, + HW_KEY_CAL_OK = 30, HW_KEY_CAL_FAIL = 31, HW_KEY_CAL_EMPTY = 32, diff --git a/Drivers/Braille/Inceptor/Makefile.in b/Drivers/Braille/Inceptor/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..365c83b92bab7d8c4c7674d977fc7e58d08132da --- /dev/null +++ b/Drivers/Braille/Inceptor/Makefile.in @@ -0,0 +1,28 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2016 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +DRIVER_CODE = ic +DRIVER_NAME = Inceptor +DRIVER_COMMENT = BrailleMe +DRIVER_VERSION = +DRIVER_DEVELOPERS = Dave Mielke , Vipul Kute +include $(SRC_TOP)braille.mk + +braille.$O: + $(CC) $(BRL_CFLAGS) -c $(SRC_DIR)/braille.c + diff --git a/Drivers/Braille/Inceptor/braille.c b/Drivers/Braille/Inceptor/braille.c new file mode 100644 index 0000000000000000000000000000000000000000..bd5bc70a4a02adb806078e5a194afa8493d28566 --- /dev/null +++ b/Drivers/Braille/Inceptor/braille.c @@ -0,0 +1,372 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2016 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.com/ + * + * This software is maintained by Dave Mielke . + */ + +#include "prologue.h" + +#include +#include + +#include "log.h" + +#include "brl_driver.h" +#include "brldefs-ic.h" + +#define PROBE_RETRY_LIMIT 2 +#define PROBE_INPUT_TIMEOUT 1000 +#define MAXIMUM_TEXT_CELLS 0XFF + +BEGIN_KEY_NAME_TABLE(navigation) + KEY_NAME_ENTRY(IC_KEY_Dot1, "Dot1"), + KEY_NAME_ENTRY(IC_KEY_Dot2, "Dot2"), + KEY_NAME_ENTRY(IC_KEY_Dot3, "Dot3"), + KEY_NAME_ENTRY(IC_KEY_Dot4, "Dot4"), + KEY_NAME_ENTRY(IC_KEY_Dot5, "Dot5"), + KEY_NAME_ENTRY(IC_KEY_Dot6, "Dot6"), + KEY_NAME_ENTRY(IC_KEY_Dot7, "Dot7"), + KEY_NAME_ENTRY(IC_KEY_Dot8, "Dot8"), + + KEY_NAME_ENTRY(IC_KEY_LeftUp, "LeftUp"), + KEY_NAME_ENTRY(IC_KEY_LeftDown, "LeftDown"), + KEY_NAME_ENTRY(IC_KEY_RightUp, "RightUp"), + KEY_NAME_ENTRY(IC_KEY_RightDown, "RightDown"), + + KEY_NAME_ENTRY(IC_KEY_Back, "Back"), + KEY_NAME_ENTRY(IC_KEY_Space, "Space"), + KEY_NAME_ENTRY(IC_KEY_Enter, "Enter"), + + KEY_GROUP_ENTRY(IC_GRP_RoutingKeys, "RoutingKey"), +END_KEY_NAME_TABLE + +BEGIN_KEY_NAME_TABLES(all) + KEY_NAME_TABLE(navigation), +END_KEY_NAME_TABLES + +DEFINE_KEY_TABLE(all) + +BEGIN_KEY_TABLE_LIST + &KEY_TABLE_DEFINITION(all), +END_KEY_TABLE_LIST + +struct BrailleDataStruct { + struct { + unsigned char rewrite; + unsigned char cells[MAXIMUM_TEXT_CELLS]; + } braille; + + struct { + unsigned char rewrite; + wchar_t characters[MAXIMUM_TEXT_CELLS]; + } text; + + struct { + unsigned char rewrite; + int position; + } cursor; +}; + +static int +writeBytes (BrailleDisplay *brl, const unsigned char *bytes, size_t count) { + return writeBraillePacket(brl, NULL, bytes, count); +} + +static int +writePacket ( + BrailleDisplay *brl, + unsigned char type, unsigned char mode, + const unsigned char *data1, size_t length1, + const unsigned char *data2, size_t length2 +) { + unsigned char packet[2 + 1 + 1 + 2 + length1 + 1 + 1 + 2 + length2 + 1 + 4 + 1 + 2]; + unsigned char *byte = packet; + unsigned char *checksum; + + /* DS */ + *byte++ = type; + *byte++ = type; + + /* M */ + *byte++ = mode; + + /* DS1 */ + *byte++ = 0XF0; + + /* Cnt1 */ + *byte++ = (length1 >> 0) & 0XFF; + *byte++ = (length1 >> 8) & 0XFF; + + /* D1 */ + if (data1) byte = mempcpy(byte, data1, length1); + + /* DE1 */ + *byte++ = 0XF1; + + /* DS2 */ + *byte++ = 0XF2; + + /* Cnt2 */ + *byte++ = (length2 >> 0) & 0XFF; + *byte++ = (length2 >> 8) & 0XFF; + + /* D2 */ + if (data2) byte = mempcpy(byte, data2, length2); + + /* DE2 */ + *byte++ = 0XF3; + + /* Reserved */ + { + int count = 4; + while (count--) *byte++ = 0; + } + + /* Chk */ + *(checksum = byte++) = 0; + + /* DE */ + *byte++ = 0XFD; + *byte++ = 0XFD; + + { + unsigned char sum = 0; + const unsigned char *ptr = packet; + + while (ptr != byte) sum += *ptr++; + *checksum = sum; + } + + return writeBytes(brl, packet, (byte - packet)); +} + +static BraillePacketVerifierResult +verifyPacket ( + BrailleDisplay *brl, + const unsigned char *bytes, size_t size, + size_t *length, void *data +) { + unsigned char byte = bytes[size-1]; + + switch (size) { + case 1: { + switch (byte) { + case 0XFA: + *length = 10; + break; + + default: + return BRL_PVR_INVALID; + } + + break; + } + + default: + break; + } + + if (size == *length) { + switch (bytes[0]) { + case 0XFA: { + if (byte != 0XFB) return BRL_PVR_INVALID; + + const InputPacket *packet = (const void *)bytes; + int checksum = -packet->fields.checksum; + for (size_t i=0; ibytes[i]; + + if ((checksum & 0XFF) != packet->fields.checksum) { + logInputProblem("incorrect input checksum", packet->bytes, size); + return BRL_PVR_INVALID; + } + + break; + } + + default: + break; + } + } + + return BRL_PVR_INCLUDE; +} + +static size_t +readPacket (BrailleDisplay *brl, void *packet, size_t size) { + return readBraillePacket(brl, NULL, packet, size, verifyPacket, NULL); +} + +static int +connectResource (BrailleDisplay *brl, const char *identifier) { + BEGIN_USB_CHANNEL_DEFINITIONS + { /* all models */ + .vendor=0X1209, .product=0XABC0, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=1, .outputEndpoint=2 + }, + END_USB_CHANNEL_DEFINITIONS + + GioDescriptor descriptor; + gioInitializeDescriptor(&descriptor); + + descriptor.usb.channelDefinitions = usbChannelDefinitions; + + descriptor.bluetooth.channelNumber = 1; + descriptor.bluetooth.discoverChannel = 1; + + if (connectBrailleResource(brl, identifier, &descriptor, NULL)) { + return 1; + } + + return 0; +} + +static int +writeIdentityRequest (BrailleDisplay *brl) { + static const unsigned char data1[20] = {0}; + return writePacket(brl, 0XFB, 0X01, data1, sizeof(data1), NULL, 0); +} + +static BrailleResponseResult +isIdentityResponse (BrailleDisplay *brl, const void *bytes, size_t size) { + const InputPacket *packet = bytes; + if (packet->fields.type != 0X02) return BRL_RSP_UNEXPECTED; + + brl->textColumns = packet->fields.data; + return BRL_RSP_DONE; +} + +static int +brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { + if ((brl->data = malloc(sizeof(*brl->data)))) { + memset(brl->data, 0, sizeof(*brl->data)); + + if (connectResource(brl, device)) { + InputPacket response; + + if (probeBrailleDisplay(brl, PROBE_RETRY_LIMIT, NULL, PROBE_INPUT_TIMEOUT, + writeIdentityRequest, + readPacket, &response, sizeof(response), + isIdentityResponse)) { + setBrailleKeyTable(brl, &KEY_TABLE_DEFINITION(all)); + makeOutputTable(dotsTable_ISO11548_1); + + brl->data->braille.rewrite = 1; + brl->data->text.rewrite = 1; + brl->data->cursor.rewrite = 1; + return 1; + } + + disconnectBrailleResource(brl, NULL); + } + + free(brl->data); + } else { + logMallocError(); + } + + return 0; +} + +static void +brl_destruct (BrailleDisplay *brl) { + disconnectBrailleResource(brl, NULL); + + if (brl->data) { + free(brl->data); + brl->data = NULL; + } +} + +static int +brl_writeWindow (BrailleDisplay *brl, const wchar_t *text) { + int cellCount = brl->textColumns; + + int newBraille = + cellsHaveChanged(brl->data->braille.cells, brl->buffer, cellCount, + NULL, NULL, &brl->data->braille.rewrite); + + int newText = + textHasChanged(brl->data->text.characters, text, cellCount, + NULL, NULL, &brl->data->text.rewrite); + + int newCursor = + cursorHasChanged(&brl->data->cursor.position, brl->cursor, + &brl->data->cursor.rewrite); + + if (newBraille || newText || newCursor) { + unsigned char cells[cellCount]; + unsigned char attributes[cellCount]; + int cursor; + + translateOutputCells(cells, brl->data->braille.cells, cellCount); + memset(attributes, 0, sizeof(attributes)); + cursor = 0; + + for (int i=0; icursor >= 0) && (brl->cursor < cellCount)) { + cursor = brl->cursor + 1; + } + + if (!writePacket(brl, 0XFC, cursor, + cells, sizeof(cells), + attributes, sizeof(attributes))) return 0; + } + + return 1; +} + +static int +brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) { + InputPacket packet; + size_t size; + + while ((size = readPacket(brl, &packet, sizeof(packet)))) { + switch (packet.fields.type) { + case 0X00: { + unsigned char key = packet.fields.data; + + enqueueKey(brl, IC_GRP_RoutingKeys, key); + continue; + } + + case 0X01: { + KeyNumberSet bits = (packet.fields.reserved[0] << 0X00) + | (packet.fields.reserved[1] << 0X08) + | (packet.fields.reserved[2] << 0X10) + | (packet.fields.reserved[3] << 0X18); + + enqueueKeys(brl, bits, IC_GRP_NavigationKeys, 0); + continue; + } + + default: + break; + } + + logUnexpectedPacket(&packet, size); + } + + return (errno == EAGAIN)? EOF: BRL_CMD_RESTARTBRL; +} diff --git a/Drivers/Braille/Inceptor/brldefs-ic.h b/Drivers/Braille/Inceptor/brldefs-ic.h new file mode 100644 index 0000000000000000000000000000000000000000..98dfb2d107d173479d5185727163e8ec34d92ac2 --- /dev/null +++ b/Drivers/Braille/Inceptor/brldefs-ic.h @@ -0,0 +1,61 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2016 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.com/ + * + * This software is maintained by Dave Mielke . + */ + +#ifndef BRLTTY_INCLUDED_IC_BRLDEFS +#define BRLTTY_INCLUDED_IC_BRLDEFS + +typedef union { + unsigned char bytes[10]; + + struct { + unsigned char start; + unsigned char type; + unsigned char count; + unsigned char data; + unsigned char reserved[4]; + unsigned char checksum; + unsigned char end; + } PACKED fields; +} InputPacket; + +typedef enum { + IC_KEY_Dot1 = 0, + IC_KEY_Dot2 = 1, + IC_KEY_Dot3 = 2, + IC_KEY_Dot4 = 3, + IC_KEY_Dot5 = 4, + IC_KEY_Dot6 = 5, + IC_KEY_Dot7 = 6, + IC_KEY_Dot8 = 7, + + IC_KEY_Space = 8, + IC_KEY_LeftUp = 9, + IC_KEY_LeftDown = 10, + IC_KEY_RightUp = 11, + IC_KEY_RightDown = 12, + + IC_KEY_Back = 13, + IC_KEY_Enter = 14, +} IC_NavigationKey; + +typedef enum { + IC_GRP_NavigationKeys = 0, + IC_GRP_RoutingKeys +} IC_KeyGroup; + +#endif /* BRLTTY_INCLUDED_IC_BRLDEFS */ diff --git a/Drivers/Braille/Inceptor/reldeps.mk b/Drivers/Braille/Inceptor/reldeps.mk new file mode 100644 index 0000000000000000000000000000000000000000..ac59d56797fcdd2100440085cca5acfae30c992f --- /dev/null +++ b/Drivers/Braille/Inceptor/reldeps.mk @@ -0,0 +1,26 @@ +# Dependencies for braille.$O: +braille.$O: $(SRC_DIR)/braille.c +braille.$O: $(SRC_TOP)Headers/prologue.h +braille.$O: $(BLD_TOP)config.h +braille.$O: $(BLD_TOP)forbuild.h +braille.$O: $(SRC_TOP)Headers/log.h +braille.$O: $(SRC_TOP)Headers/api_types.h +braille.$O: $(SRC_TOP)Headers/async.h +braille.$O: $(SRC_TOP)Headers/async_io.h +braille.$O: $(SRC_TOP)Headers/brl_base.h +braille.$O: $(SRC_TOP)Headers/brl_cmds.h +braille.$O: $(SRC_TOP)Headers/brl_dots.h +braille.$O: $(SRC_TOP)Headers/brl_driver.h +braille.$O: $(SRC_TOP)Headers/brl_types.h +braille.$O: $(SRC_TOP)Headers/brl_utils.h +braille.$O: $(SRC_TOP)Headers/cmd_enqueue.h +braille.$O: $(SRC_TOP)Headers/driver.h +braille.$O: $(SRC_TOP)Headers/gio_types.h +braille.$O: $(SRC_TOP)Headers/io_generic.h +braille.$O: $(SRC_TOP)Headers/ktb_types.h +braille.$O: $(SRC_TOP)Headers/queue.h +braille.$O: $(SRC_TOP)Headers/serial_types.h +braille.$O: $(SRC_TOP)Headers/status_types.h +braille.$O: $(SRC_TOP)Headers/usb_types.h +braille.$O: $(SRC_DIR)/brldefs-ic.h + diff --git a/Drivers/Braille/Iris/Makefile.in b/Drivers/Braille/Iris/Makefile.in index e375b9cc7ad27004e0cf9f5a71f1ad5af0504df6..5fd4be9ba849b6fcd0db95c15c297abd03f274fe 100644 --- a/Drivers/Braille/Iris/Makefile.in +++ b/Drivers/Braille/Iris/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Iris/braille.c b/Drivers/Braille/Iris/braille.c index 554a139d90f5485189bfe7427150a8d6eac0576f..5f275aca5f6682093edec3baeecbefe577e53d19 100644 --- a/Drivers/Braille/Iris/braille.c +++ b/Drivers/Braille/Iris/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -1848,7 +1848,7 @@ startLatchMonitor (BrailleDisplay *brl) { if (brl->data->latch.monitor) return 1; if (!brl->data->latch.delay) return 1; - if (asyncSetAlarmIn(&brl->data->latch.monitor, 0, irMonitorLatch, brl)) { + if (asyncNewRelativeAlarm(&brl->data->latch.monitor, 0, irMonitorLatch, brl)) { if (asyncResetAlarmEvery(brl->data->latch.monitor, brl->data->latch.interval)) { brl->data->latch.pulled = 0; return 1; diff --git a/Drivers/Braille/Iris/brldefs-ir.h b/Drivers/Braille/Iris/brldefs-ir.h index 2007bacb9fb62e34930902be0eb3b1ccfeb3af50..a11b6a59970252cb3d1f15df94924858d1bcaa04 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 00301c3e982d8e14fb94c441578f2c401fcd7cd4..79d14db06b26ceb981f616beeb78b22780b8c500 100644 --- a/Drivers/Braille/Libbraille/Makefile.in +++ b/Drivers/Braille/Libbraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Libbraille/braille.c b/Drivers/Braille/Libbraille/braille.c index e0a7dd08d7e3f7da218cf1e8f8afc26d1b0505af..0f0b7f53f81c38c3c0908733cc957f2f304cc0ee 100644 --- a/Drivers/Braille/Libbraille/braille.c +++ b/Drivers/Braille/Libbraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/LogText/Makefile.in b/Drivers/Braille/LogText/Makefile.in index abfdbdc0e4a1209ef947f145410dbc9f5a37ec6c..be9eee5506a07c3ca0ddd7efed91e517228342a4 100644 --- a/Drivers/Braille/LogText/Makefile.in +++ b/Drivers/Braille/LogText/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/LogText/braille.c b/Drivers/Braille/LogText/braille.c index 6bfa2b8051d12ee43a4daa03ee96d06324de57d4..a00ed9b53aeb34f56b4ec0c5729b4a1c692ff58c 100644 --- a/Drivers/Braille/LogText/braille.c +++ b/Drivers/Braille/LogText/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -111,8 +111,8 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { } } - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/LogText/braille.h b/Drivers/Braille/LogText/braille.h index d50de7695edff409e144e2306846753ae882cd6d..141606414f81a9e2c983e1da6b549fe82128429c 100644 --- a/Drivers/Braille/LogText/braille.h +++ b/Drivers/Braille/LogText/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/LogText/brl-out.h b/Drivers/Braille/LogText/brl-out.h index 4c727ee4252b99a9df966cc6607108100fc6cee4..39607de35f27a63ad3ab9988944f9fb66c94c090 100644 --- a/Drivers/Braille/LogText/brl-out.h +++ b/Drivers/Braille/LogText/brl-out.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/MDV/Makefile.in b/Drivers/Braille/MDV/Makefile.in index 5160fa66448e1241bcfc26f379173d18bc0c8f58..b8a6fdb638325ed7a4be4f2f96e5b78578b502d9 100644 --- a/Drivers/Braille/MDV/Makefile.in +++ b/Drivers/Braille/MDV/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/MDV/braille.c b/Drivers/Braille/MDV/braille.c index 5f7a6a8ae61e6a77ac71b6fe0c6440f3ba515228..92278912d92ca8b1d98c23a1e10544b63363d33f 100644 --- a/Drivers/Braille/MDV/braille.c +++ b/Drivers/Braille/MDV/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/MDV/brldefs-md.h b/Drivers/Braille/MDV/brldefs-md.h index 99e6d04b62fd3661bbf09efedda040272084f879..eb9a2340d26fa9327a813bdb1e518c6afe2717ad 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 ca683e7dc5df5cfc0be2d89ff3123a9a0d3a34b8..63e92ee3b49cd6af6b1ed7ccb03c2901bbd32219 100644 --- a/Drivers/Braille/Metec/Makefile.in +++ b/Drivers/Braille/Metec/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Metec/braille.c b/Drivers/Braille/Metec/braille.c index 11fab3570d795754569a6a8eb9b71ccbcb6e016f..77b9138224e3a2a0744abe4fd75516735036496e 100644 --- a/Drivers/Braille/Metec/braille.c +++ b/Drivers/Braille/Metec/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -282,7 +282,7 @@ ASYNC_ALARM_CALLBACK(handleUsbStatusAlarm) { static int setUsbStatusAlarm (BrailleDisplay *brl) { - return asyncSetAlarmIn(&brl->data->proto.usb.statusAlarm, + return asyncNewRelativeAlarm(&brl->data->proto.usb.statusAlarm, BRAILLE_DRIVER_INPUT_POLL_INTERVAL, handleUsbStatusAlarm, brl); } diff --git a/Drivers/Braille/Metec/brldefs-mt.h b/Drivers/Braille/Metec/brldefs-mt.h index c7f5a48985871b03886696f32a87e8190251b8a3..8813dfb66093e8ac78ef6158b178f2e583953c5d 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 99e952e868a374fed3eb1718d895d78e08ada02f..f672eda0d22cb47671c3f348059ea93484138bcd 100644 --- a/Drivers/Braille/MiniBraille/Makefile.in +++ b/Drivers/Braille/MiniBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/MiniBraille/braille.c b/Drivers/Braille/MiniBraille/braille.c index 814d84ea876f4898a3bdb5f7505c8bcb8f16de45..02b921e50bf02b5f88b7a6df91b876f5e4d97aa0 100644 --- a/Drivers/Braille/MiniBraille/braille.c +++ b/Drivers/Braille/MiniBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -339,8 +339,8 @@ resetInputMode (void) { static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/MultiBraille/Makefile.in b/Drivers/Braille/MultiBraille/Makefile.in index 449f6cbca3504c56a2187e4a46ee7127355f75f8..c9804c7d13244959acd9524cf35eb811b72a67c5 100644 --- a/Drivers/Braille/MultiBraille/Makefile.in +++ b/Drivers/Braille/MultiBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/MultiBraille/README b/Drivers/Braille/MultiBraille/README index f3a6edf791057fc415f308639ff2d3e8bcd958bd..784d653806563f139dc50b26a9a18a797538537a 100644 --- a/Drivers/Braille/MultiBraille/README +++ b/Drivers/Braille/MultiBraille/README @@ -8,8 +8,8 @@ Copyright (C) 2000 by Wolfgang Astleitner. ) This driver is part of BRLTTY, and as such it is placed under the -terms of the GNU General Public License, as published by the Free -Software Foundation. Please see the file LICENSE-GPL in the top-level +terms of the GNU Lesser General Public License, as published by the Free +Software Foundation. Please see the file LICENSE-LGPL in the top-level directory for details. This driver is maintained by Wolfgang Astleitner . diff --git a/Drivers/Braille/MultiBraille/braille.c b/Drivers/Braille/MultiBraille/braille.c index 9dba9101df4f38a04fb10d1b76e9670485004f33..0af9ab1138f86d96a39711d4ece0087f8f74b11d 100644 --- a/Drivers/Braille/MultiBraille/braille.c +++ b/Drivers/Braille/MultiBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -98,8 +98,8 @@ static int brl_construct (BrailleDisplay *brl, char **parameters, const char *de unsigned char c; TimePeriod period; - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/MultiBraille/braille.h b/Drivers/Braille/MultiBraille/braille.h index 07c8a94c312a4b3d14049eddf498715647201ab0..163f3ba413decab8b1fad48f85bcc8aedde319dc 100644 --- a/Drivers/Braille/MultiBraille/braille.h +++ b/Drivers/Braille/MultiBraille/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/MultiBraille/tables.h b/Drivers/Braille/MultiBraille/tables.h index a719872a5cc73d3bcee30f3f0ca4153964a6f132..94af4e440b5c053108750e8b05c5627610907f91 100644 --- a/Drivers/Braille/MultiBraille/tables.h +++ b/Drivers/Braille/MultiBraille/tables.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/NinePoint/Makefile.in b/Drivers/Braille/NinePoint/Makefile.in index 17238cf625c9ae09e4eba1b14e8a6c69cfc0ed18..96321e27cb09e7d95e7661fd18aa8751c118d3ad 100644 --- a/Drivers/Braille/NinePoint/Makefile.in +++ b/Drivers/Braille/NinePoint/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/NinePoint/braille.c b/Drivers/Braille/NinePoint/braille.c index 0bc87a4bd5be3ed23e66d6f4837ec934bee62579..951f7f63d3bdc0e11d23abb0d4ff6f5f25f5a224 100644 --- a/Drivers/Braille/NinePoint/braille.c +++ b/Drivers/Braille/NinePoint/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/NinePoint/brldefs-np.h b/Drivers/Braille/NinePoint/brldefs-np.h index 5bfe1e3fa49f67b1179c600047db642228b0d97e..35a75a97e3ddd219a1927c8f951c78ee1111ff7f 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 fc6c441bc16bbdbfe41e64b4771f64aa16e04838..1d7c7d6a06cf0aaf0f7338ae822a6688fa5dc41f 100644 --- a/Drivers/Braille/Papenmeier/Makefile.in +++ b/Drivers/Braille/Papenmeier/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Papenmeier/README b/Drivers/Braille/Papenmeier/README index 9e70d2218798494a84b58c9d583dfc85eb052569..8c3f9748a2d26233638a50ef4b4bc1155770112c 100644 --- a/Drivers/Braille/Papenmeier/README +++ b/Drivers/Braille/Papenmeier/README @@ -6,9 +6,9 @@ Version 2.1 (October 2001) Copyright ========= -This driver is copyrighted under the GNU Public License. It is free -software. See the file 'LICENSE-GPL' for more details. Feel free to send -your comments and to report bugs (if any :)) to us at +This driver is copyrighted under the GNU Lesser General Public License. +It is free software. See the file 'LICENSE-LGPL' for more details. +Feel free to send your comments and to report bugs (if any :)) to us at august.hoerandl@gmx.at or heimo.schoen@gmx.at Supported Hardware diff --git a/Drivers/Braille/Papenmeier/braille.c b/Drivers/Braille/Papenmeier/braille.c index 83f8b04ba726112fdddf575b78904613dc07ce9a..263fdf92550c84e15e52672ce8e3520bd125826a 100644 --- a/Drivers/Braille/Papenmeier/braille.c +++ b/Drivers/Braille/Papenmeier/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Papenmeier/brldefs-pm.h b/Drivers/Braille/Papenmeier/brldefs-pm.h index 41fe07a77ee7387fd275e877c6b8b73a8e2d335a..4ee19bdb2214c576dff8d8104173548f830ad05a 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 03130d947cc99829d28eb5ee939f3666cd427ec3..64b77b7999ce914e05a20a119df2960ae5840832 100644 --- a/Drivers/Braille/Papenmeier/models.h +++ b/Drivers/Braille/Papenmeier/models.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Pegasus/Makefile.in b/Drivers/Braille/Pegasus/Makefile.in index c664450f0f558006e407a90a321d19aa548d69ef..ef89775892ebcdedbfe9941ff8d23393820254bb 100644 --- a/Drivers/Braille/Pegasus/Makefile.in +++ b/Drivers/Braille/Pegasus/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Pegasus/braille.c b/Drivers/Braille/Pegasus/braille.c index 27fb8dca61cef56b457f3a34910c5d86ca554dd0..123771ee05bdb06421037e5e6abaaafc3736b161 100644 --- a/Drivers/Braille/Pegasus/braille.c +++ b/Drivers/Braille/Pegasus/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -473,12 +473,12 @@ static const InputOutputOperations usbOperations = { static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { - if (isSerialDevice(&device)) { + if (isSerialDeviceIdentifier(&device)) { io = &serialOperations; - } else if (isUsbDevice(&device)) { + } else if (isUsbDeviceIdentifier(&device)) { io = &usbOperations; } else { - unsupportedDevice(device); + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/Pegasus/brldefs-pg.h b/Drivers/Braille/Pegasus/brldefs-pg.h index 30ec454a93afad27dbc9ebbf2a049b364c920f03..3d2d848665d65f88326d145baef7d22cd7df3ae8 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 006ee2774ffe94129174d33b1d2aed04253d775e..0be3b3b5984335280409f9127f40ca40458e4257 100644 --- a/Drivers/Braille/Seika/Makefile.in +++ b/Drivers/Braille/Seika/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Seika/braille.c b/Drivers/Braille/Seika/braille.c index 953e0a59be8c6f0989a06699f361e9783228f37f..7e1e0866de0b547dec976a9c5138e640c88654e7 100644 --- a/Drivers/Braille/Seika/braille.c +++ b/Drivers/Braille/Seika/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Seika/brldefs-sk.h b/Drivers/Braille/Seika/brldefs-sk.h index a1ab2fce62da5dede4bc81d425651edf7aaf5dde..c3ecb3db9def1c901a8fd0ed91a5b8ad85b88593 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 109f218b8640746afe24ca4cfd017a60f3f16d61..ceda518b269ef815c6e94076cb1b05177da00039 100644 --- a/Drivers/Braille/Skeleton/Makefile.in +++ b/Drivers/Braille/Skeleton/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Skeleton/braille.c b/Drivers/Braille/Skeleton/braille.c index 5ca2e0c8fe38a327f58cd55787b493e4ce12e896..e29a9e964fbf4632038f8b0092e2456bca4757de 100644 --- a/Drivers/Braille/Skeleton/braille.c +++ b/Drivers/Braille/Skeleton/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Skeleton/brldefs-xx.h b/Drivers/Braille/Skeleton/brldefs-xx.h index 475e9a3ad52dafeb45e7b964b3493ad33e67e6a2..398470b0c91681b1371ca9f6bf0651f45cdccef9 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 51d1698e99cf6346f72b7f040485f07007223b73..a2e38b5b10a086ea5dcfd600d17c604830a3673f 100644 --- a/Drivers/Braille/TSI/Makefile.in +++ b/Drivers/Braille/TSI/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/TSI/braille.c b/Drivers/Braille/TSI/braille.c index 4914f68187c5e41b1e5dcbed9ff940ab1863d399..13b488829a80e5a483a07eaf3d04803157d11fbe 100644 --- a/Drivers/Braille/TSI/braille.c +++ b/Drivers/Braille/TSI/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/TSI/braille.h b/Drivers/Braille/TSI/braille.h index 000d92a78a33d0f2972b51ebed2acdb92c968bc5..c745a30780c11ae9b66df41e0f4faf38d4a1c1a6 100644 --- a/Drivers/Braille/TSI/braille.h +++ b/Drivers/Braille/TSI/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/TSI/brldefs-ts.h b/Drivers/Braille/TSI/brldefs-ts.h index c0057f772a442374aafb306a6aa96ad6078db64a..fd225823b5e2f18b79175be8747c924a9a3a6ad5 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 261b3e7d65a884eed8f98157d34f8f7af1d43699..4b55346bd872f2f4ca8adf31e0db5c7e4c4a7900 100644 --- a/Drivers/Braille/TTY/Makefile.in +++ b/Drivers/Braille/TTY/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/TTY/braille.c b/Drivers/Braille/TTY/braille.c index eecbb7b3b2a6b3075c314d4ba50ced25a5f796ae..e9d355bfc05c2a9a7717f7668fb50142ae77f807 100644 --- a/Drivers/Braille/TTY/braille.c +++ b/Drivers/Braille/TTY/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -113,8 +113,8 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { const char *characterSet = getLocaleCharset(); #endif /* HAVE_ICONV_H */ - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/TTY/braille.h b/Drivers/Braille/TTY/braille.h index 8e63ff9087b8079c3b6a6bba14206fbcf256741d..df1860be0e4be4996a3cf07246cc371c7e9face2 100644 --- a/Drivers/Braille/TTY/braille.h +++ b/Drivers/Braille/TTY/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/TechniBraille/Makefile.in b/Drivers/Braille/TechniBraille/Makefile.in index ff7ea5fe0070a71733f255be82ff07252148654f..5feae3e5010567f21ad7abc46c7e9b24eec20f74 100644 --- a/Drivers/Braille/TechniBraille/Makefile.in +++ b/Drivers/Braille/TechniBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/TechniBraille/braille.c b/Drivers/Braille/TechniBraille/braille.c index 16827b3e5e28867671cc75df2efa523832a4ecc5..efc0698f0c79456f9bc88ef4741b2b63c4d92977 100644 --- a/Drivers/Braille/TechniBraille/braille.c +++ b/Drivers/Braille/TechniBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -139,8 +139,8 @@ clearVisualText (BrailleDisplay *brl) { static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } diff --git a/Drivers/Braille/VideoBraille/Makefile.in b/Drivers/Braille/VideoBraille/Makefile.in index 1d753f24c288e73bfde77008ad3c35f651cc3a4f..89f2144075d431dea2003a12880c484d3e1ade92 100644 --- a/Drivers/Braille/VideoBraille/Makefile.in +++ b/Drivers/Braille/VideoBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/VideoBraille/braille.c b/Drivers/Braille/VideoBraille/braille.c index 901be8f6b224cb1077a2215897f643327c83d377..5714fc2de4fd9bd63e850d61d517bc84da28db7e 100644 --- a/Drivers/Braille/VideoBraille/braille.c +++ b/Drivers/Braille/VideoBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/VideoBraille/braille.h b/Drivers/Braille/VideoBraille/braille.h index e268d5c9acd5889386591362facdf7c626d43227..4528fdf8683b5fbac43c2762c4acd3f5a8741c90 100644 --- a/Drivers/Braille/VideoBraille/braille.h +++ b/Drivers/Braille/VideoBraille/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Virtual/Makefile.in b/Drivers/Braille/Virtual/Makefile.in index d83cb80a095cee2b213161b6dc811b3ad40eda5a..94e5b66c7b506999c3d82c1dc01b82ac5d2b980b 100644 --- a/Drivers/Braille/Virtual/Makefile.in +++ b/Drivers/Braille/Virtual/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Virtual/braille.c b/Drivers/Braille/Virtual/braille.c index e5647cff393dfd9f954f75e58aa2f1c155921774..db2604d3f966bc6559b788c1b8dc96c941bc8c51 100644 --- a/Drivers/Braille/Virtual/braille.c +++ b/Drivers/Braille/Virtual/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -57,7 +57,6 @@ #include "log.h" #include "io_misc.h" -#include "device.h" #include "parse.h" #include "async_wait.h" #include "charset.h" @@ -958,7 +957,7 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { inputEnd = 0; outputLength = 0; - if (isQualifiedDevice(&device, "client")) { + if (hasQualifier(&device, "client")) { static const ModeEntry clientModeEntry = { #ifdef AF_LOCAL requestLocalConnection, @@ -971,7 +970,7 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { requestInetConnection }; mode = &clientModeEntry; - } else if (isQualifiedDevice(&device, "server")) { + } else if (hasQualifier(&device, "server")) { static const ModeEntry serverModeEntry = { #ifdef AF_LOCAL acceptLocalConnection, @@ -985,7 +984,7 @@ brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { }; mode = &serverModeEntry; } else { - unsupportedDevice(device); + unsupportedDeviceIdentifier(device); goto failed; } if (!*device) device = VR_DEFAULT_SOCKET; diff --git a/Drivers/Braille/Virtual/braille.h b/Drivers/Braille/Virtual/braille.h index e540221ec1e7a7eba6d0d74192ad706b3a0ed3b1..c0cb413f5755f64c580c60967193d31d3c2db73b 100644 --- a/Drivers/Braille/Virtual/braille.h +++ b/Drivers/Braille/Virtual/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Virtual/reldeps.mk b/Drivers/Braille/Virtual/reldeps.mk index 8ef8815787a9f85e14921da66ce6b8b1b0f22e76..3c99b057eb7c9de50c9beaa147434e01313a99fe 100644 --- a/Drivers/Braille/Virtual/reldeps.mk +++ b/Drivers/Braille/Virtual/reldeps.mk @@ -7,7 +7,6 @@ braille.$O: $(SRC_TOP)Headers/system_windows.h braille.$O: $(SRC_TOP)Headers/log.h braille.$O: $(SRC_TOP)Headers/get_sockets.h braille.$O: $(SRC_TOP)Headers/io_misc.h -braille.$O: $(SRC_TOP)Headers/device.h braille.$O: $(SRC_TOP)Headers/parse.h braille.$O: $(SRC_TOP)Headers/async.h braille.$O: $(SRC_TOP)Headers/async_wait.h diff --git a/Drivers/Braille/VisioBraille/Makefile.in b/Drivers/Braille/VisioBraille/Makefile.in index 5cadf89faa22be66e1625bd3b1990e9f45baa433..1429f8ea08afa9996bb9df7df629888ad4f1ce22 100644 --- a/Drivers/Braille/VisioBraille/Makefile.in +++ b/Drivers/Braille/VisioBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/VisioBraille/braille.c b/Drivers/Braille/VisioBraille/braille.c index 004e22a62d77bee620846b1607cb64d76763ae77..16f02aa192e38106e0e4c45bb9ab47b6c921eeea 100644 --- a/Drivers/Braille/VisioBraille/braille.c +++ b/Drivers/Braille/VisioBraille/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -199,8 +199,8 @@ static int brl_construct(BrailleDisplay *brl, char **parameters, const char *dev } } - if (!isSerialDevice(&device)) { - unsupportedDevice(device); + if (!isSerialDeviceIdentifier(&device)) { + unsupportedDeviceIdentifier(device); return 0; } if (!(serialDevice = serialOpenDevice(device))) return 0; diff --git a/Drivers/Braille/VisioBraille/braille.h b/Drivers/Braille/VisioBraille/braille.h index ee95bd51a890ede84419d79855ae306f53e0ad52..9f278415bed78460ef70707b722d3deaf3d33dbb 100644 --- a/Drivers/Braille/VisioBraille/braille.h +++ b/Drivers/Braille/VisioBraille/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/VisioBraille/brl-out.h b/Drivers/Braille/VisioBraille/brl-out.h index 92f1435cef8bad8901cc3349414dadbdf6905939..8ae49360fe21226c2d27f2bddd1031c97dabdbd4 100644 --- a/Drivers/Braille/VisioBraille/brl-out.h +++ b/Drivers/Braille/VisioBraille/brl-out.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/VisioBraille/brldefs-vs.h b/Drivers/Braille/VisioBraille/brldefs-vs.h index 7bd95ee0053756d88327fb434ebe4d37ef61d71e..1ae4358d462fddae2a7e72349cf7c4bc1ecfc3d7 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 25e916e3b67ec7605555fa3c675508985ce380e9..be6435470f37a6b56babc266400e5f0793061e92 100644 --- a/Drivers/Braille/VisioBraille/vstp.h +++ b/Drivers/Braille/VisioBraille/vstp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2017 S&S + * Copyright (C) 2006-2018 S&S * Samuel Thibault * Sébastien Hinderer * diff --git a/Drivers/Braille/VisioBraille/vstp_main.c b/Drivers/Braille/VisioBraille/vstp_main.c index 57029c0fd5860022888a7855c8d3ae1a9ef3e1ff..bef484d263b4c6c0cc91049ba69e9431aab95bc6 100644 --- a/Drivers/Braille/VisioBraille/vstp_main.c +++ b/Drivers/Braille/VisioBraille/vstp_main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2017 S&S + * Copyright (C) 2006-2018 S&S * Samuel Thibault * Sébastien Hinderer * diff --git a/Drivers/Braille/VisioBraille/vstp_transfer.c b/Drivers/Braille/VisioBraille/vstp_transfer.c index e950b95da62713e0f15a563076102fed0f728f63..967cf50c276ceadebb377c0ab5a5ac5a8c477a51 100644 --- a/Drivers/Braille/VisioBraille/vstp_transfer.c +++ b/Drivers/Braille/VisioBraille/vstp_transfer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2017 S&S + * Copyright (C) 2006-2018 S&S * Samuel Thibault * Sébastien Hinderer * diff --git a/Drivers/Braille/Voyager/Makefile.in b/Drivers/Braille/Voyager/Makefile.in index a02c9545c8ccd9466bae23c4240b0749129b32e4..ed64bcd661900b1276a027c7bca34f073cce3516 100644 --- a/Drivers/Braille/Voyager/Makefile.in +++ b/Drivers/Braille/Voyager/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/Voyager/braille.c b/Drivers/Braille/Voyager/braille.c index 1b0a7d63959e93eff3f35f40ed53f2a22b62d793..23c908f612923a985bc4782831d2285f90683cde 100644 --- a/Drivers/Braille/Voyager/braille.c +++ b/Drivers/Braille/Voyager/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Braille/Voyager/brldefs-vo.h b/Drivers/Braille/Voyager/brldefs-vo.h index 6c08b8c80894b461e4bb775b20757ae5982f4624..6e97ca4be7d6e45a7b531c15f5da87d751cd7da9 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 d03fc1d7461d95414b032f8ea211e75f2f7cf454..771ab54f377624def734d53af45f1577f4fb780b 100644 --- a/Drivers/Braille/XWindow/Makefile.in +++ b/Drivers/Braille/XWindow/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Braille/XWindow/README b/Drivers/Braille/XWindow/README index 03c1bd8b4a6ac3faf20b9edb447908b8876a4f4d..5ca9fa68b7d3c80d16108aeb631e930e0430e01d 100644 --- a/Drivers/Braille/XWindow/README +++ b/Drivers/Braille/XWindow/README @@ -1,9 +1,15 @@ +Description +=========== + This driver lets use a Graphical User Interface as BrlTTY device: it behaves just like a real braille device, its cost excepted :) It is mostly intended for sighted developers who don't have access to a real device, but still want to have an idea of the accessiblity of their application. +How to run basically +==================== + Assuming you're under X, first launch brltty: $ brltty -b xw -x as -A auth=none @@ -20,12 +26,38 @@ will show up most of VisioBraille device's keys. You should configure your window manager not to let the BRLTTY window get keyboard focus, so as to be able to simulate keypresses by pressing buttons. -Or you may use the -display tkparameter option to display the emulated device -on another X server and add the input=on option so that keypresses in the -device window will get simulated in the original display. -*** Don't set input=on without using -display too on a different display, -because else emulated keypresses will just loop ! *** +Redirecting the output +====================== + +The output of this virtual braille device can be shown on another computer, by +redirecting the X output. Let's say you will run brltty on "mycomputer", with +the output on "othercomputer". First you have to let mycomputer connect to +othercomputer's X server: + +othercomputer$ xhost +mycomputer + +And then you can start brltty on mycomputer: + +mycomputer$ DISPLAY=othercomputer:0 brltty -b xw -B input=on + +More fine-grain access control can be achieved by using xauth. + +Another way, which might be easier depending on your configuration, is to +forward X through ssh: + +othercomputer$ ssh -X mycomputer +mycomputer$ brltty -b xw -B input=on + + +The input=on option makes the keypresses in the device window get simulated +on mycomputer, just like a real braille device. + +*** Don't set input=on without using DISPLAY with a different display, +because otherwise emulated keypresses will just loop ! *** + +Braille cells +============= If you want braille display as well, you'll need the ClearlyU font (included in recent xfonts-base packages) and a UTF-8 locale for @@ -34,6 +66,6 @@ prepended LC_CTYPE: LC_CTYPE=en_US.UTF-8 brltty ... -In order to use this driver on Windows, you need to copy the file UBraille.ttf -into the C:\Windows\Fonts\ folder. It can be found in this directory as well as -in the Fonts\ top-level folder of BRLTTY's Windows installed files hierarchy. +On windows, you need to copy the file UBraille.ttf into the C:\Windows\Fonts\ +folder. It can be found in this directory as well as in the Fonts\ top-level +folder of BRLTTY's Windows installed files hierarchy. diff --git a/Drivers/Braille/XWindow/braille.c b/Drivers/Braille/XWindow/braille.c index 5639840400aafa444c6695b90dad65a8486c5ff4..238577253521381f8c1e6ddebf415c95bb8851f4 100644 --- a/Drivers/Braille/XWindow/braille.c +++ b/Drivers/Braille/XWindow/braille.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -206,7 +206,7 @@ typedef enum { #include "braille.h" #define MAXLINES 3 -#define MAXCOLS 80 +#define MAXCOLS 88 #define WHOLESIZE (MAXLINES * MAXCOLS) static int cols,lines; static int input; diff --git a/Drivers/Braille/XWindow/braille.h b/Drivers/Braille/XWindow/braille.h index 8e63ff9087b8079c3b6a6bba14206fbcf256741d..df1860be0e4be4996a3cf07246cc371c7e9face2 100644 --- a/Drivers/Braille/XWindow/braille.h +++ b/Drivers/Braille/XWindow/braille.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/BrlAPI/WindowEyes/Makefile.in b/Drivers/BrlAPI/WindowEyes/Makefile.in index b0c2529681ced49ecb112ed4871bf580ec54a1f4..86979d5b969b4bb65011ccc93b2435fd503a9363 100644 --- a/Drivers/BrlAPI/WindowEyes/Makefile.in +++ b/Drivers/BrlAPI/WindowEyes/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/BrlAPI/WindowEyes/test.c b/Drivers/BrlAPI/WindowEyes/test.c index 7b4f83292048064125d5efb85ab4fd67b3328261..a46c21bdc5d8789d79479ac805b105720c22c89e 100644 --- a/Drivers/BrlAPI/WindowEyes/test.c +++ b/Drivers/BrlAPI/WindowEyes/test.c @@ -2,14 +2,14 @@ * BRLTTY - 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-2017 by The BRLTTY Developers. + * Copyright (C) 2009-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/BrlAPI/WindowEyes/webrloem.c b/Drivers/BrlAPI/WindowEyes/webrloem.c index 4d083104def50f8c1244266e88758544c0f2de65..e21e1d7948e9809f347685b4ca266c33b6aff402 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 c018d4982c1568e35ae2bfe1491501556600b349..d28e0ac1420a413e78cd71148127b58a639b7cbc 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 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 8442819c976fad68c7b323e63563df50d87b00ef..db7f8ed1d301dc4ec314be8ad9fbe734fe916f15 100644 --- a/Drivers/Screen/Android/Makefile.in +++ b/Drivers/Screen/Android/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Android/screen.c b/Drivers/Screen/Android/screen.c index f07d873ce18d973be618181fc051ede06e744d09..09f676b22e4c05546fdafd0946e8ab8bca2d5753 100644 --- a/Drivers/Screen/Android/screen.c +++ b/Drivers/Screen/Android/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/AtSpi/Makefile.in b/Drivers/Screen/AtSpi/Makefile.in index e9ecf39984d3118085cdd72353c7c26dd7b5b84d..db01424d4c9f314effd872cbe52d09fc717891fd 100644 --- a/Drivers/Screen/AtSpi/Makefile.in +++ b/Drivers/Screen/AtSpi/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/AtSpi/screen.c b/Drivers/Screen/AtSpi/screen.c index 16fb0634a8354df565231d9d3164b56cf95cfeee..f1cbaec4606ae50a73e3295831ec26deef33f15f 100644 --- a/Drivers/Screen/AtSpi/screen.c +++ b/Drivers/Screen/AtSpi/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/AtSpi2/Makefile.in b/Drivers/Screen/AtSpi2/Makefile.in index 75e208bdf9ceb64ed95cf17c8089293a493960f2..b80b44bff18e24570c0879353bfcb3c3b8090b8c 100644 --- a/Drivers/Screen/AtSpi2/Makefile.in +++ b/Drivers/Screen/AtSpi2/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/AtSpi2/screen.c b/Drivers/Screen/AtSpi2/screen.c index 3624d8ffa9dc13d4c12ba9315461e14cc8d13c37..ee98c6579529f12a20ee8409cbafdf7d848f2618 100644 --- a/Drivers/Screen/AtSpi2/screen.c +++ b/Drivers/Screen/AtSpi2/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -720,15 +720,19 @@ static int recurseFindTerm(const char *sender, const char *path, int active, int dbus_message_iter_recurse (&iter, &iter_array); while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID) { - const char *sender, *path; + const char *childsender, *childpath; dbus_message_iter_recurse (&iter_array, &iter_struct); - dbus_message_iter_get_basic (&iter_struct, &sender); + dbus_message_iter_get_basic (&iter_struct, &childsender); dbus_message_iter_next (&iter_struct); - dbus_message_iter_get_basic (&iter_struct, &path); - if (findTerm(sender, path, active, depth)) + dbus_message_iter_get_basic (&iter_struct, &childpath); + /* Make sure that the child is not the same as the parent, to avoid recursing indefinitely. */ + if (strcmp(path, childpath)) { - res = 1; - goto out; + if (findTerm(childsender, childpath, active, depth)) + { + res = 1; + goto out; + } } dbus_message_iter_next (&iter_array); } @@ -1089,7 +1093,7 @@ ASYNC_ALARM_CALLBACK(a2ProcessTimeout) a2Timeout->monitor = NULL; if (dbus_timeout_get_enabled(timeout)) /* Still enabled, requeue it */ - asyncSetAlarmIn(&a2Timeout->monitor, dbus_timeout_get_interval(timeout), a2ProcessTimeout, a2Timeout); + asyncNewRelativeAlarm(&a2Timeout->monitor, dbus_timeout_get_interval(timeout), a2ProcessTimeout, a2Timeout); } dbus_bool_t a2AddTimeout(DBusTimeout *timeout, void *data) @@ -1097,7 +1101,7 @@ dbus_bool_t a2AddTimeout(DBusTimeout *timeout, void *data) struct a2Timeout *a2Timeout = calloc(1, sizeof(*a2Timeout)); a2Timeout->timeout = timeout; if (dbus_timeout_get_enabled(timeout)) - asyncSetAlarmIn(&a2Timeout->monitor, dbus_timeout_get_interval(timeout), a2ProcessTimeout, a2Timeout); + asyncNewRelativeAlarm(&a2Timeout->monitor, dbus_timeout_get_interval(timeout), a2ProcessTimeout, a2Timeout); dbus_timeout_set_data(timeout, a2Timeout, NULL); return TRUE; } diff --git a/Drivers/Screen/Grub/Makefile.in b/Drivers/Screen/Grub/Makefile.in index 2b3cc9f773c51591dd88638bd20bca5817a3e81b..d362e5fd09a1435f105699b9d5e3a8ba887f47b5 100644 --- a/Drivers/Screen/Grub/Makefile.in +++ b/Drivers/Screen/Grub/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Grub/screen.c b/Drivers/Screen/Grub/screen.c index d8c7c15e791807c700e61cf5e9e40856d27c0442..916b7969c1b45d5b7d7ed8bf1e7017322a519d12 100644 --- a/Drivers/Screen/Grub/screen.c +++ b/Drivers/Screen/Grub/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Hurd/Makefile.in b/Drivers/Screen/Hurd/Makefile.in index 71cdbdea1226ae078937d5a32cfe64855cdbd7a1..b253e3fcfb6a100295ff47e441ed40e1e468869e 100644 --- a/Drivers/Screen/Hurd/Makefile.in +++ b/Drivers/Screen/Hurd/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Hurd/screen.c b/Drivers/Screen/Hurd/screen.c index ed05dabaf81378ef0db1da622c46eef1801e4528..d9a9d46def0ecf42d8690a988f71f3a7a30997e2 100644 --- a/Drivers/Screen/Hurd/screen.c +++ b/Drivers/Screen/Hurd/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Hurd/screen.h b/Drivers/Screen/Hurd/screen.h index c15ddae0d6ee3d8119102e7f4abe6ce1ecec45b0..4ea4d97ab0a57b81a902b794a5449fd603fc7e67 100644 --- a/Drivers/Screen/Hurd/screen.h +++ b/Drivers/Screen/Hurd/screen.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Linux/Makefile.in b/Drivers/Screen/Linux/Makefile.in index ed3352a19ba8badd7db5a2c5dbb79e64aeeaae18..50dcb858705b216194edb64257a71a6dbad04cd0 100644 --- a/Drivers/Screen/Linux/Makefile.in +++ b/Drivers/Screen/Linux/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Linux/screen.c b/Drivers/Screen/Linux/screen.c index 54a507fdf937e0b873ca81d39834d423fb06bd16..9e999b5e2809df70b8bf9f6f95b4265fddb2d23f 100644 --- a/Drivers/Screen/Linux/screen.c +++ b/Drivers/Screen/Linux/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Linux/screen.h b/Drivers/Screen/Linux/screen.h index 46241eaa708e90cd58b9514fa8717e51028cce04..0550f3d3a8cb5e241c5a00435d70f3d1d0ae92fb 100644 --- a/Drivers/Screen/Linux/screen.h +++ b/Drivers/Screen/Linux/screen.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/PcBios/Makefile.in b/Drivers/Screen/PcBios/Makefile.in index 6e262e9c06bfd5677521f7954fed83bcf8220f91..ebb5dd7e9598b8f6026a2bb7708aa5a92ba82274 100644 --- a/Drivers/Screen/PcBios/Makefile.in +++ b/Drivers/Screen/PcBios/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/PcBios/screen.c b/Drivers/Screen/PcBios/screen.c index d96ef76715adcd1dab2d404289e1525d7082d874..91632d15123e89f2333886776e674c5cd0698d8a 100644 --- a/Drivers/Screen/PcBios/screen.c +++ b/Drivers/Screen/PcBios/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Screen/Makefile.in b/Drivers/Screen/Screen/Makefile.in index 80d6b1c8ee5b0dcd39fc52b6d52e4f964369986e..4915e7225409c2d164830e7956656673f09dd9da 100644 --- a/Drivers/Screen/Screen/Makefile.in +++ b/Drivers/Screen/Screen/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Screen/screen.c b/Drivers/Screen/Screen/screen.c index d5cf90d40d2b1db8c9df377bb53bdc4117b41e5b..50b158db2a76ffdc094bd7c24356a153d5b96ffd 100644 --- a/Drivers/Screen/Screen/screen.c +++ b/Drivers/Screen/Screen/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Screen/screen.h b/Drivers/Screen/Screen/screen.h index fca02e44e08c8ae5f7c48737ef95412fcca30896..2bd0644e0a3741eacd306f9890317c14cbecc2ca 100644 --- a/Drivers/Screen/Screen/screen.h +++ b/Drivers/Screen/Screen/screen.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Skeleton/Makefile.in b/Drivers/Screen/Skeleton/Makefile.in index b08e329073c921f162717ad7dd48c190267a4e60..cfc7465d259ef9f0679a5ee7089d48048172af74 100644 --- a/Drivers/Screen/Skeleton/Makefile.in +++ b/Drivers/Screen/Skeleton/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Skeleton/screen.c b/Drivers/Screen/Skeleton/screen.c index d8c7c15e791807c700e61cf5e9e40856d27c0442..916b7969c1b45d5b7d7ed8bf1e7017322a519d12 100644 --- a/Drivers/Screen/Skeleton/screen.c +++ b/Drivers/Screen/Skeleton/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Screen/Windows/Makefile.in b/Drivers/Screen/Windows/Makefile.in index d891877a0d77bbd4c26e2ea06eddc4836bac04fa..dd1dd8c8815cc92aed47c8d898dcc28915577c49 100644 --- a/Drivers/Screen/Windows/Makefile.in +++ b/Drivers/Screen/Windows/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Screen/Windows/screen.c b/Drivers/Screen/Windows/screen.c index 89916a775c763624453f5ef52f99eb5f0937c3b5..2da0815b62fdd57911a08cb6d951c0e56cd702a2 100644 --- a/Drivers/Screen/Windows/screen.c +++ b/Drivers/Screen/Windows/screen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Alva/Makefile.in b/Drivers/Speech/Alva/Makefile.in index a4485ef1429feecf3171d3a33bba0e28b374225a..8ab38a1c5af5f2b598531f8da504952b9b63b617 100644 --- a/Drivers/Speech/Alva/Makefile.in +++ b/Drivers/Speech/Alva/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Alva/speech.c b/Drivers/Speech/Alva/speech.c index c4e03993e0e7eaf204eb2cded5216f0c360ef472..516a5420c3d4b4133525f9fb5bbbed8509dfbabc 100644 --- a/Drivers/Speech/Alva/speech.c +++ b/Drivers/Speech/Alva/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Alva/speech.h b/Drivers/Speech/Alva/speech.h index 6b92d4806f47c4285eb696aea211b52372f23783..a9e8fd4daa18890aa84bf0dd14e390abcd6dc6a2 100644 --- a/Drivers/Speech/Alva/speech.h +++ b/Drivers/Speech/Alva/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Android/Makefile.in b/Drivers/Speech/Android/Makefile.in index c3066d15a10cfdeadf63873ea083644f7a4db813..91c76e7928200b8592100ecd02f258add166b2dc 100644 --- a/Drivers/Speech/Android/Makefile.in +++ b/Drivers/Speech/Android/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Android/speech.c b/Drivers/Speech/Android/speech.c index fbda64806070fb370ac34efb06322bf112fadbd9..e42d02dd569ebfd46b3b246590d6002ecd7c10bf 100644 --- a/Drivers/Speech/Android/speech.c +++ b/Drivers/Speech/Android/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/BrailleLite/Makefile.in b/Drivers/Speech/BrailleLite/Makefile.in index 883aad4338874a9710d89989c3c84c0fdd7b0361..8aeb87d1b7698a163e3af8deb8aa876f918a9613 100644 --- a/Drivers/Speech/BrailleLite/Makefile.in +++ b/Drivers/Speech/BrailleLite/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/BrailleLite/speech.c b/Drivers/Speech/BrailleLite/speech.c index 79f7d0830097acf02ee3cee8c8c0546f243b3fa3..55747aff4d6fb83c4a5329b3891ff0fc59aef5ad 100644 --- a/Drivers/Speech/BrailleLite/speech.c +++ b/Drivers/Speech/BrailleLite/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/BrailleLite/speech.h b/Drivers/Speech/BrailleLite/speech.h index 66266a22e13180775b63e99e8da8dab3c00d64f1..a336d4d04dd51778e8ad47939fe932831335540f 100644 --- a/Drivers/Speech/BrailleLite/speech.h +++ b/Drivers/Speech/BrailleLite/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/CombiBraille/Makefile.in b/Drivers/Speech/CombiBraille/Makefile.in index 75aa0493a296087150137cb5fee1203a30be7e8f..9f029622baf585d8ada42ecc3685abdc6e636a92 100644 --- a/Drivers/Speech/CombiBraille/Makefile.in +++ b/Drivers/Speech/CombiBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/CombiBraille/speech.c b/Drivers/Speech/CombiBraille/speech.c index 7048fa192c99a79c251fda8d7a39958a85ab8f32..d421180c476b739c1a11cbae0614c7e0a87beb3e 100644 --- a/Drivers/Speech/CombiBraille/speech.c +++ b/Drivers/Speech/CombiBraille/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/CombiBraille/speech.h b/Drivers/Speech/CombiBraille/speech.h index 03e3a22b5ca80fcf4517b3fb22d980758c6c8b03..b9b7799aa1a95909a9cc1125d7a5b6f41badca1d 100644 --- a/Drivers/Speech/CombiBraille/speech.h +++ b/Drivers/Speech/CombiBraille/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/ExternalSpeech/Makefile.in b/Drivers/Speech/ExternalSpeech/Makefile.in index ac3e49e4074fdd813fe5c236c4305ba3472f2a96..13c8940e242d916ff4437a7bb1a081ecb25cdc8c 100644 --- a/Drivers/Speech/ExternalSpeech/Makefile.in +++ b/Drivers/Speech/ExternalSpeech/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/ExternalSpeech/speech.c b/Drivers/Speech/ExternalSpeech/speech.c index 9f749e29f7b586858308cfa130101c5c9d50d01c..aadeeb86200b571ba102412d933fddbb3e742d68 100644 --- a/Drivers/Speech/ExternalSpeech/speech.c +++ b/Drivers/Speech/ExternalSpeech/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/ExternalSpeech/speech.h b/Drivers/Speech/ExternalSpeech/speech.h index 9845fa37b32b13baed6ca43f7053f6508b545c8c..fb353dae5bc6bafccf881bc41600465364a71c64 100644 --- a/Drivers/Speech/ExternalSpeech/speech.h +++ b/Drivers/Speech/ExternalSpeech/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Festival/Makefile.in b/Drivers/Speech/Festival/Makefile.in index d99757d85b3b0818c9c18a630c4f548317cbff31..cd4f6d532e3eff80569106af093bb20a4c42507a 100644 --- a/Drivers/Speech/Festival/Makefile.in +++ b/Drivers/Speech/Festival/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Festival/speech.c b/Drivers/Speech/Festival/speech.c index 7c445322c307aedb2c2462668877d8fab6ba11c8..2a6fd58fb579041623a58b3c89f3f34dd89477fd 100644 --- a/Drivers/Speech/Festival/speech.c +++ b/Drivers/Speech/Festival/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Festival/speech.h b/Drivers/Speech/Festival/speech.h index 2f26053b1c5c88fc4e542d7c41f206368c8493df..0b76ce0271ad488a2a39711f04f3e0ce23fff16d 100644 --- a/Drivers/Speech/Festival/speech.h +++ b/Drivers/Speech/Festival/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/FestivalLite/Makefile.in b/Drivers/Speech/FestivalLite/Makefile.in index fcfff03a9c7942030cd7d6c64ce296769943a839..f9c4d7dac5928a87d24f78c2f2ab36c7c00f278a 100644 --- a/Drivers/Speech/FestivalLite/Makefile.in +++ b/Drivers/Speech/FestivalLite/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/FestivalLite/speech.c b/Drivers/Speech/FestivalLite/speech.c index fc74d9a1de1b7ac6cb9a31e0b592edc0a91dd674..f18bc519b5bcf2b87b6e6a1b69c013cf6fdc5b5c 100644 --- a/Drivers/Speech/FestivalLite/speech.c +++ b/Drivers/Speech/FestivalLite/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/GenericSay/Makefile.in b/Drivers/Speech/GenericSay/Makefile.in index 52b4c8b6b41820d7e109a468961480beef1eadeb..098a42b433e6363047f6b1ac559ba8f092ea56fd 100644 --- a/Drivers/Speech/GenericSay/Makefile.in +++ b/Drivers/Speech/GenericSay/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/GenericSay/commands/AccentSA b/Drivers/Speech/GenericSay/commands/AccentSA index aa3963b5de0c29748afbe32e7bae0da0c2fdaf44..ea40aa8dd8a7d3a9bd6d23b974290081c37d5756 100755 --- a/Drivers/Speech/GenericSay/commands/AccentSA +++ b/Drivers/Speech/GenericSay/commands/AccentSA @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/GenericSay/commands/say b/Drivers/Speech/GenericSay/commands/say index 1da75e3181fe30adb6e095b97c2c01d602cf804d..dfc6cc1d0167b0f7f39c118a81b851d961c6ae51 100755 --- a/Drivers/Speech/GenericSay/commands/say +++ b/Drivers/Speech/GenericSay/commands/say @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/GenericSay/speech.c b/Drivers/Speech/GenericSay/speech.c index b84929b665929fd713b9be4913d8d830e807a22e..8a4db0d98072bac5aadf8cc55f1e4bd3b5c2f39f 100644 --- a/Drivers/Speech/GenericSay/speech.c +++ b/Drivers/Speech/GenericSay/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/GenericSay/speech.h b/Drivers/Speech/GenericSay/speech.h index a66c3575395c383d750e10afe853b6b4cd22626d..d99d5e8cf7357a8d8a4f8d22d328d48d465f6d26 100644 --- a/Drivers/Speech/GenericSay/speech.h +++ b/Drivers/Speech/GenericSay/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Mikropuhe/Makefile.in b/Drivers/Speech/Mikropuhe/Makefile.in index e9e0ef225f398f9533add450ca163d9b3979fd1e..3b5980d65e48af71fc4f23e679284fe74af37807 100644 --- a/Drivers/Speech/Mikropuhe/Makefile.in +++ b/Drivers/Speech/Mikropuhe/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Mikropuhe/speech.c b/Drivers/Speech/Mikropuhe/speech.c index 65d68a9f5c709180eb0221590a82c17ab0ecf529..c318947870f75eb6782d930c2485d42be2d70cd9 100644 --- a/Drivers/Speech/Mikropuhe/speech.c +++ b/Drivers/Speech/Mikropuhe/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/MultiBraille/Makefile.in b/Drivers/Speech/MultiBraille/Makefile.in index aaa9aa9aafd2a3ddf7865b92786d63f188bbaefa..72b1145c3680e7cf067043ce765b26d4638631c6 100644 --- a/Drivers/Speech/MultiBraille/Makefile.in +++ b/Drivers/Speech/MultiBraille/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/MultiBraille/speech.c b/Drivers/Speech/MultiBraille/speech.c index 93289aa88747e87217e58bde110bc2d95ac52ad0..c200b06680f2ef34ed02df5c3fbf2d2cb9ce1865 100644 --- a/Drivers/Speech/MultiBraille/speech.c +++ b/Drivers/Speech/MultiBraille/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/MultiBraille/speech.h b/Drivers/Speech/MultiBraille/speech.h index 3ef9f383d647aa9174761100e0aa9d46fc17f96a..9767e4575cbe30df9a4708437d9084c822d59f43 100644 --- a/Drivers/Speech/MultiBraille/speech.h +++ b/Drivers/Speech/MultiBraille/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Skeleton/Makefile.in b/Drivers/Speech/Skeleton/Makefile.in index df2f914516124bfd50385a3d04701e3519d3131d..426f33f8d6d4f9907947660835c0dee287986826 100644 --- a/Drivers/Speech/Skeleton/Makefile.in +++ b/Drivers/Speech/Skeleton/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Skeleton/speech.c b/Drivers/Speech/Skeleton/speech.c index 6eba4f2fe9c9c2b860b208bc0de7f384d32c0baa..0b8fc35aa7d62acb0f4ef9ab9004bd455ad91840 100644 --- a/Drivers/Speech/Skeleton/speech.c +++ b/Drivers/Speech/Skeleton/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/SpeechDispatcher/Makefile.in b/Drivers/Speech/SpeechDispatcher/Makefile.in index 2c354488ef24ba7126d610f0c5936b2d5407259c..2a983c2b831635a049ef471f32c545bcc5aa374f 100644 --- a/Drivers/Speech/SpeechDispatcher/Makefile.in +++ b/Drivers/Speech/SpeechDispatcher/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/SpeechDispatcher/speech.c b/Drivers/Speech/SpeechDispatcher/speech.c index 8158b721b035e029159b4d8f40e5c466714ce057..927a0ab337f2a721f6d7369342b1de4c84c774c3 100644 --- a/Drivers/Speech/SpeechDispatcher/speech.c +++ b/Drivers/Speech/SpeechDispatcher/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Swift/Makefile.in b/Drivers/Speech/Swift/Makefile.in index 3c95f5268ab43cf084e473b8269525b8d7e06fb7..617034aa902dfe831f6d2004ed60daf95ecf600d 100644 --- a/Drivers/Speech/Swift/Makefile.in +++ b/Drivers/Speech/Swift/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Swift/speech.c b/Drivers/Speech/Swift/speech.c index 4c9dde1235411c5ea99931f12a4b0b9a1f3a7ecb..8af836137a354abe7a508337cb54f848448c284a 100644 --- a/Drivers/Speech/Swift/speech.c +++ b/Drivers/Speech/Swift/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/Theta/Makefile.in b/Drivers/Speech/Theta/Makefile.in index 5e23ec3f9d29a34d843fd20b97fdb39092fd9647..e8e192c86737e732b3d1c9953c6b864eebf16039 100644 --- a/Drivers/Speech/Theta/Makefile.in +++ b/Drivers/Speech/Theta/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/Theta/speech.c b/Drivers/Speech/Theta/speech.c index 8dbfd3660bcb574691cad2127ba0e6e0ac015b19..0fe47599e4444ab1a70cd822c8ea449e61d9c944 100644 --- a/Drivers/Speech/Theta/speech.c +++ b/Drivers/Speech/Theta/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/ViaVoice/Makefile.in b/Drivers/Speech/ViaVoice/Makefile.in index e6011ffac05c30f7ff14a39c4dd25a34a18aa304..cc62a36cb51a75e47c386321d8fdfdc2ad55ff59 100644 --- a/Drivers/Speech/ViaVoice/Makefile.in +++ b/Drivers/Speech/ViaVoice/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/ViaVoice/speech.c b/Drivers/Speech/ViaVoice/speech.c index a7403a994280f49713f94fdaf4af98ee6eeca81a..6817abb9fe0b0088224d41fb5b650323c09769ef 100644 --- a/Drivers/Speech/ViaVoice/speech.c +++ b/Drivers/Speech/ViaVoice/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/ViaVoice/speech.h b/Drivers/Speech/ViaVoice/speech.h index 2629748882acc2ad4ab1f40995cc98ec6e8254e6..8e40ae6605bae5a3fad661f3ca254efd6b0de2a6 100644 --- a/Drivers/Speech/ViaVoice/speech.h +++ b/Drivers/Speech/ViaVoice/speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Drivers/Speech/eSpeak/Makefile.in b/Drivers/Speech/eSpeak/Makefile.in index e2b2b5ff62053aa7dd0db9c8d2a44cbd7f2a0905..d937afb5edab708feb6b5a3b4345a0de6e3990b6 100644 --- a/Drivers/Speech/eSpeak/Makefile.in +++ b/Drivers/Speech/eSpeak/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Drivers/Speech/eSpeak/speech.c b/Drivers/Speech/eSpeak/speech.c index 6c303c759396ebdba0f4b11d4da74bae918288b3..bf7b8b39b4d8e85ccdf059b2445daa7939fca912 100644 --- a/Drivers/Speech/eSpeak/speech.c +++ b/Drivers/Speech/eSpeak/speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/addresses.h b/Headers/addresses.h index 9e31b1ec6d490f57dcdf303986b841585359a306..9648573f61b5ec9a78ff71d4ca0da31aa039ba68 100644 --- a/Headers/addresses.h +++ b/Headers/addresses.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/alert.h b/Headers/alert.h index f92cef6e509c5e5436a77ff6023b3e419eb4e92d..e519f1178ae8fe2d6dbc4540bbd1ace9733b302e 100644 --- a/Headers/alert.h +++ b/Headers/alert.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -66,6 +66,8 @@ typedef enum { ALERT_CONSOLE_BELL, ALERT_KEYS_AUTORELEASED, + + ALERT_SCROLL_UP, } AlertIdentifier; extern void alert (AlertIdentifier identifier); diff --git a/Headers/api_types.h b/Headers/api_types.h index 062a9f14b6700a2b6ee79727f0562625b6cb761a..badb18c06f87ae410a0613aaf65ff9cfe09e109f 100644 --- a/Headers/api_types.h +++ b/Headers/api_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ascii.h b/Headers/ascii.h index 2bf9e051a5dacb43b9993acccea290c6d97ea1e3..fd89374419ddecc4c110b437dbd49b4913c697de 100644 --- a/Headers/ascii.h +++ b/Headers/ascii.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/async.h b/Headers/async.h index 0dd399ec487196795cc0d62a77d27a8acd34fa78..ec7ede51f7c8a0c9be1361499393cccdc0ba22f2 100644 --- a/Headers/async.h +++ b/Headers/async.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/async_alarm.h b/Headers/async_alarm.h index 26f3b993f8162549fff911f33523155fc8ef5d92..5e28faa3b82c8d81e5bbf92b3ac6d3f61356c8f5 100644 --- a/Headers/async_alarm.h +++ b/Headers/async_alarm.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -34,23 +34,23 @@ typedef struct { #define ASYNC_ALARM_CALLBACK(name) void name (const AsyncAlarmCallbackParameters *parameters) typedef ASYNC_ALARM_CALLBACK(AsyncAlarmCallback); -extern int asyncSetAlarmTo ( +extern int asyncNewAbsoluteAlarm ( AsyncHandle *handle, const TimeValue *time, AsyncAlarmCallback *callback, void *data ); -extern int asyncSetAlarmIn ( +extern int asyncNewRelativeAlarm ( AsyncHandle *handle, - int interval, + int milliseconds, AsyncAlarmCallback *callback, void *data ); extern int asyncResetAlarmTo (AsyncHandle handle, const TimeValue *time); -extern int asyncResetAlarmIn (AsyncHandle handle, int interval); -extern int asyncResetAlarmEvery (AsyncHandle handle, int interval); +extern int asyncResetAlarmIn (AsyncHandle handle, int milliseconds); +extern int asyncResetAlarmEvery (AsyncHandle handle, int milliseconds); #ifdef __cplusplus } diff --git a/Headers/async_event.h b/Headers/async_event.h index 64b8e0bfe357140912cf03bd58a6916810d963a2..180d4fa41c077d77bcd74635c092d6fed053a603 100644 --- a/Headers/async_event.h +++ b/Headers/async_event.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/async_io.h b/Headers/async_io.h index 9a3b3a4c50bd7746251bd69d3f6e805ec1e2290f..7b56f0a701ac600669dc5f450b85acb6d33eac95 100644 --- a/Headers/async_io.h +++ b/Headers/async_io.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/async_signal.h b/Headers/async_signal.h index a882e2bc409b2a848da15e8d9cc5419de679c023..9b028224b99c6982cf6b9a8ada74c4c5eeef233f 100644 --- a/Headers/async_signal.h +++ b/Headers/async_signal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/async_task.h b/Headers/async_task.h index c2751201672853bb3baa0dc7732471840c952bd9..0e64d34d3f3154dec523f4207dd6be8b7e1934f4 100644 --- a/Headers/async_task.h +++ b/Headers/async_task.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/async_wait.h b/Headers/async_wait.h index 88c11d9b1483afebe2a670027941a096678292c9..a182f7b2e9a5b8cb95235d4aa5bf1fb8be348fa4 100644 --- a/Headers/async_wait.h +++ b/Headers/async_wait.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/atb.h b/Headers/atb.h index 3ed0fe487f333cbca7db8055f7c8209ef8a0e64b..f91f64e27f36dbf50958ba9e72caec2855d78102 100644 --- a/Headers/atb.h +++ b/Headers/atb.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/auth.h b/Headers/auth.h index 4e8224bee2d75c28a22d32441805ed898b1c7cc9..c31aac57b93dfc7c28cd0281c069e76eb709813d 100644 --- a/Headers/auth.h +++ b/Headers/auth.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/beep.h b/Headers/beep.h index 4418d2420d3baf3c25241068a775e2d56caa8303..bfc3f089132aee7da4658d338e71f156892ddaf3 100644 --- a/Headers/beep.h +++ b/Headers/beep.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/bell.h b/Headers/bell.h index d88d300c58b31abe413c30a89b7bcb5310b7ba38..4ffa0d5798ee55fbd30854c134d390572c8031d4 100644 --- a/Headers/bell.h +++ b/Headers/bell.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/bitfield.h b/Headers/bitfield.h index 5d61c1ab0ce90bb5923371a37d4cce0cd42b8e3b..8cdf2a3c8bab68ab28aa0888db60f8613aa2e597 100644 --- a/Headers/bitfield.h +++ b/Headers/bitfield.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/bitmask.h b/Headers/bitmask.h index 8453d8dac19c545cf1ae9bd6a7ef67ad03754ac2..7f63a510ef87d5610e69c514c0e1bdea2f8bde67 100644 --- a/Headers/bitmask.h +++ b/Headers/bitmask.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_base.h b/Headers/brl_base.h index c1b0e03e7a16705874e2c4862c3e23b193b597d7..a798d7e8b6b5c2851cf1fe98014ce2d741507fbe 100644 --- a/Headers/brl_base.h +++ b/Headers/brl_base.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_cmds.h b/Headers/brl_cmds.h index f44f539ba36550d4bbd226d40d6cb9de63415a1d..ede24df8778ed9149272f8f10e8378aa3a195b48 100644 --- a/Headers/brl_cmds.h +++ b/Headers/brl_cmds.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_custom.h b/Headers/brl_custom.h index 5aadb4f3420485e657d8461e7be76cb67e0c3f44..74f0aacf28696ab71b66aacbd1fee661e78a220f 100644 --- a/Headers/brl_custom.h +++ b/Headers/brl_custom.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_dots.h b/Headers/brl_dots.h index a7703f8fdc2c96e47d2535b5448c5cc4b65a7c35..cac7c788f10f2a1fdb7e5fc39c70a856d4b7aa58 100644 --- a/Headers/brl_dots.h +++ b/Headers/brl_dots.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_driver.h b/Headers/brl_driver.h index f1af6f0e79068f78261aa0b97f3c80894e30680e..362896db8428b785f78502bb1336f95795305029 100644 --- a/Headers/brl_driver.h +++ b/Headers/brl_driver.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_types.h b/Headers/brl_types.h index e7ac6ca33fcba450194152252ef8100c0709f2cb..bb3a0fa28aacf063c6f7359b220854894e0d996a 100644 --- a/Headers/brl_types.h +++ b/Headers/brl_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/brl_utils.h b/Headers/brl_utils.h index 9c9c0cd399a00ecb9f82cda7a9e4d876e4cd7788..bd0d8d4b8697d2669f05cd8e85c4f387ae4b6c5c 100644 --- a/Headers/brl_utils.h +++ b/Headers/brl_utils.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/charset.h b/Headers/charset.h index 6071b5353072eca8d587df340abcbd7d967927ed..bdddc00260dc14502cd49e51db71a71c09375bc2 100644 --- a/Headers/charset.h +++ b/Headers/charset.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/cmd.h b/Headers/cmd.h index 08790dc7b7d0f1dfabbdbb15b32579563e125a58..1930a8a6a2358ce9b404a3b4cbc466b1eb3a5b1e 100644 --- a/Headers/cmd.h +++ b/Headers/cmd.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/cmd_enqueue.h b/Headers/cmd_enqueue.h index b529ede8aab9a98f2873282bc5aac65aa4992460..15145f8458dae81605069c020bceb8d7d8ec6499 100644 --- a/Headers/cmd_enqueue.h +++ b/Headers/cmd_enqueue.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/cmd_types.h b/Headers/cmd_types.h index f929e39269a9020bcbd2daee23256f3eae481675..9393cedba405ccb6ae5bdafb413bb159df9cbf18 100644 --- a/Headers/cmd_types.h +++ b/Headers/cmd_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ctb.h b/Headers/ctb.h index 8a81e32b4d1201df13696dabbabe0280bfaffe94..176e4c61510cb22168d176b308fddbba1ee41461 100644 --- a/Headers/ctb.h +++ b/Headers/ctb.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ctb_types.h b/Headers/ctb_types.h index e19ea252a7a957b55bfb018a30f975cac70567e0..29647b4f5f18b519402e2c218f27f9b591e12a77 100644 --- a/Headers/ctb_types.h +++ b/Headers/ctb_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/dataarea.h b/Headers/dataarea.h index 9c3d5d6e84a88898770adab9da81e9da0cb0d2d4..99d29512df9169fbda3dc1fabe3c35f1ba48f343 100644 --- a/Headers/dataarea.h +++ b/Headers/dataarea.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/datafile.h b/Headers/datafile.h index 20e54777c1ca92fe2378d3db988305eb131be36a..f22457eb74522e7e9f679b2067ad39e267e5d65c 100644 --- a/Headers/datafile.h +++ b/Headers/datafile.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/device.h b/Headers/device.h index 3698a7d3b352bceafbb5867c7dab9f37d07d56b8..bb05126995dbc0a786f07e48e5aaf8f6ebd38d75 100644 --- a/Headers/device.h +++ b/Headers/device.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -36,9 +36,6 @@ extern char *getDevicePath (const char *device); extern const char *resolveDeviceName (const char *const *names, const char *description); #define DEVICE_PARAMETER_SEPARATOR '+' - -extern int isQualifiedDevice (const char **identifier, const char *qualifier); -extern int isUnqualifiedDevice (const char *identifier); extern char **getDeviceParameters (const char *const *names, const char *identifier); #undef ALLOW_DOS_DEVICE_NAMES diff --git a/Headers/driver.h b/Headers/driver.h index 5cf49a48b2108d82d0a255c2d60cc6328ff84ec5..630611cf97b90f51f78642c3e5f0740a15aaf877 100644 --- a/Headers/driver.h +++ b/Headers/driver.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -48,7 +48,7 @@ typedef struct { #define DRIVER_VERSION_STRING PACKAGE_VERSION #define DRIVER_VERSION_DECLARATION(type) const char CONCATENATE(type##_version_,DRIVER_CODE)[] = DRIVER_VERSION_STRING -extern void unsupportedDevice (const char *identifier); +extern void unsupportedDeviceIdentifier (const char *identifier); extern void logOutputPacket (const void *packet, size_t size); extern void logInputPacket (const void *packet, size_t size); diff --git a/Headers/drivers.h b/Headers/drivers.h index 98e988ec7de28b70aa487c2aac9edf40b21a1e3f..e9117db883b19e7fdbaa6c5c9bc23db437a503bc 100644 --- a/Headers/drivers.h +++ b/Headers/drivers.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/dynld.h b/Headers/dynld.h index ef9eda6a1879d49c51e0b974cce44177cbdfeac1..0b388d652aa2273e12e0e690cb3672448adaf523 100644 --- a/Headers/dynld.h +++ b/Headers/dynld.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/embed.h b/Headers/embed.h index bfb829237e4d665cf29edcb994b785565354c616..d45c911b56dbe28c876c1b4763fb66f26b78bd1b 100644 --- a/Headers/embed.h +++ b/Headers/embed.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/file.h b/Headers/file.h index 1f6981e7ec93a25e296753c3caeaa877b689b688..b12498f5d6c34b2cf9bef05773b8938400749652 100644 --- a/Headers/file.h +++ b/Headers/file.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/fm.h b/Headers/fm.h index 8e8ae248d0f1cf9fd5e22eb104f2bc6ed739b16a..6cd811c02fddddcde34fcf33262cf31e9ad2e99d 100644 --- a/Headers/fm.h +++ b/Headers/fm.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/fm_adlib.h b/Headers/fm_adlib.h index 0a156d42d7814cfc129dd7f4ac581eaa1f0d5821..1d08bdc335e009168fa3c3263c33f9e205741b4d 100644 --- a/Headers/fm_adlib.h +++ b/Headers/fm_adlib.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/get_curses.h b/Headers/get_curses.h index 9862f27a1276167fbaea28e15f3756e8adca4968..df4cef1192dc9db47f388df03320eae7b6996258 100644 --- a/Headers/get_curses.h +++ b/Headers/get_curses.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/get_pthreads.h b/Headers/get_pthreads.h index bc457cc45a27aa51afad8090786118dacf61a464..09ae3632288c44ccb308d2e7f3adf4026b98115a 100644 --- a/Headers/get_pthreads.h +++ b/Headers/get_pthreads.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/get_select.h b/Headers/get_select.h index fa383f47f1696fe60c3e016bf61452c8d7a75f9a..20daa052bfc7a7efe4e02b5598f83594b412764e 100644 --- a/Headers/get_select.h +++ b/Headers/get_select.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/get_sockets.h b/Headers/get_sockets.h index 7cb571752755279b97c41153f7a1daa3668d9e4c..1b750779d7bdeab06f1060eae858c2a4947a190b 100644 --- a/Headers/get_sockets.h +++ b/Headers/get_sockets.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/gio_types.h b/Headers/gio_types.h index 11110d5c95707f69505f431a5e926c756b022095..5d75c2c96799c320fd8be357a9a20b93f5e84078 100644 --- a/Headers/gio_types.h +++ b/Headers/gio_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/hostcmd.h b/Headers/hostcmd.h index 603e3f1b5068b91f70a9d4ca3b1998e1661b8482..fd7b233c06eab94f6c297ce1ed53d5a4c2798717 100644 --- a/Headers/hostcmd.h +++ b/Headers/hostcmd.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/io_bluetooth.h b/Headers/io_bluetooth.h index 86ed293a5288b8aa9cd420d97daf6c48136ef261..2468458c2ccb2519e81fe85dba0d8b433c7aa9a5 100644 --- a/Headers/io_bluetooth.h +++ b/Headers/io_bluetooth.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -58,7 +58,7 @@ extern ssize_t bthReadData ( extern ssize_t bthWriteData (BluetoothConnection *connection, const void *buffer, size_t size); -extern int isBluetoothDevice (const char **identifier); +extern int isBluetoothDeviceIdentifier (const char **identifier); #ifdef __cplusplus } diff --git a/Headers/io_generic.h b/Headers/io_generic.h index 12a8b3a6fe67119aa2f58320b459b9ffa3d99b29..c2a1124664c4adea06a6b1cfb148d631f5187e0d 100644 --- a/Headers/io_generic.h +++ b/Headers/io_generic.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/io_misc.h b/Headers/io_misc.h index f0c839fa337a39b3cd47054aa20e0bd5075de5ef..8e6c900c13dc9c8d8040f5075f31ca382964482e 100644 --- a/Headers/io_misc.h +++ b/Headers/io_misc.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/io_serial.h b/Headers/io_serial.h index 0b97541dbc33df5ba4891832a4a4db5f711d0c8d..3bf2a15a193087713b39ebd28a2ec22ec953f0f8 100644 --- a/Headers/io_serial.h +++ b/Headers/io_serial.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -30,7 +30,7 @@ extern "C" { typedef struct SerialDeviceStruct SerialDevice; -extern int isSerialDevice (const char **identifier); +extern int isSerialDeviceIdentifier (const char **identifier); extern int serialValidateBaud (unsigned int *baud, const char *description, const char *word, const unsigned int *choices); extern SerialDevice *serialOpenDevice (const char *identifier); diff --git a/Headers/io_usb.h b/Headers/io_usb.h index 39373da345619f1ae4501ff5e6add6c88ff570e4..b3095590ddb944d552f1e3da607522ee28ca35a7 100644 --- a/Headers/io_usb.h +++ b/Headers/io_usb.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -311,7 +311,7 @@ typedef struct { extern UsbChannel *usbOpenChannel (const UsbChannelDefinition *definitions, const char *identifier); extern void usbCloseChannel (UsbChannel *channel); -extern int isUsbDevice (const char **identifier); +extern int isUsbDeviceIdentifier (const char **identifier); #ifdef __cplusplus } diff --git a/Headers/kbd_keycodes.h b/Headers/kbd_keycodes.h index db3b6bdf0c42c2311f88e2c6a769e2b7e3d5b32e..f7b247c6ebfff80dfc2622bb61106ddf590fbc57 100644 --- a/Headers/kbd_keycodes.h +++ b/Headers/kbd_keycodes.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ktb.h b/Headers/ktb.h index 5253aa8ed0f2ec76116a7a7d2bc87308f8554e30..dbc58738de3e1bb35b64c2eeed972ada8e083401 100644 --- a/Headers/ktb.h +++ b/Headers/ktb.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ktb_types.h b/Headers/ktb_types.h index dc70484af62573db574a4c8f87639a947a10cc3f..9c1e9cef439c7b63d6173d2a9279605ab496a016 100644 --- a/Headers/ktb_types.h +++ b/Headers/ktb_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/leds.h b/Headers/leds.h index d60660937ec054727bf80530a14aa22c9f0cd214..10e4915bc33f869055b40612dd15bfb03c5a249d 100644 --- a/Headers/leds.h +++ b/Headers/leds.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/lock.h b/Headers/lock.h index 62c88aefc646a02fb20dedca250416f8b037575e..c9b1758df16977444f074d7c6a2196fde5729103 100644 --- a/Headers/lock.h +++ b/Headers/lock.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/log.h b/Headers/log.h index b22d2894bf2dd5b9298b6bfa98805052565f586b..ed0e2e70b5eaf6cfaa7875b24d92c282bff2d74b 100644 --- a/Headers/log.h +++ b/Headers/log.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/log_history.h b/Headers/log_history.h index 049226f838ca8204bbac199fdf3b8fca38f96a35..08d098204def88e0791daf04d97c70ea105ed553 100644 --- a/Headers/log_history.h +++ b/Headers/log_history.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/menu.h b/Headers/menu.h index 8130d4caab5bad412429032253961c1614b9785f..0d938ba3ed538885f7f9eb701fce91dcbd8169e4 100644 --- a/Headers/menu.h +++ b/Headers/menu.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/message.h b/Headers/message.h index b584009a19c2b8e4725a7ee4eab1ae13a461e872..36064b5a7d843c88a2100563c1c091e91158a827 100644 --- a/Headers/message.h +++ b/Headers/message.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/midi.h b/Headers/midi.h index a46be2fe4f9d278ba8a6ff13e3329d2317df18ce..8b5b8a49d7d22cb14d08adf95cb7d3c5041737fc 100644 --- a/Headers/midi.h +++ b/Headers/midi.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/mntfs.h b/Headers/mntfs.h index 2451f130b085de915605e4407971ea3a55f8ca1a..53f20bfab4b9b2c9b662dd580e876b091b22e090 100644 --- a/Headers/mntfs.h +++ b/Headers/mntfs.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/mntpt.h b/Headers/mntpt.h index d0f09b372317dcfb6dd7a710b850b45f71a0ce2b..a7ac5c0c8d52a2f0ac0ca798a6d4a22d6c67359f 100644 --- a/Headers/mntpt.h +++ b/Headers/mntpt.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/note_types.h b/Headers/note_types.h index 1c453ef427f6805c28a4df19bde59181eb7984ac..a8ae0b63ff8985e14f8de6b1a62ed7f89630ed4d 100644 --- a/Headers/note_types.h +++ b/Headers/note_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/notes.h b/Headers/notes.h index 6fcf129748f553f7da0a50bac8eba01c6876e44f..935ef52e169c9b284f73fe3c4f9f891bef3bb5e7 100644 --- a/Headers/notes.h +++ b/Headers/notes.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/options.h b/Headers/options.h index 47daec83bc8fef51169f4435757419b25ced9424..21aaab32b2688a8ff53fa9dfc75a45a366e9a06d 100644 --- a/Headers/options.h +++ b/Headers/options.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/params.h b/Headers/params.h index 749bd96edaf87391c43f74e9bdf4834cf3eb5512..360ca07e48b926a935a3fc1adfd0fa8631663164 100644 --- a/Headers/params.h +++ b/Headers/params.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/parse.h b/Headers/parse.h index 5c49b330365ecf8bbc059bac9877fe87fbb5b48f..7248d990a5d6e15f54d72684ac75184f038116cc 100644 --- a/Headers/parse.h +++ b/Headers/parse.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -85,10 +85,14 @@ extern int isFloat (float *value, const char *string); extern int validateFloat (float *value, const char *string, const float *minimum, const float *maximum); #endif /* NO_FLOAT */ +#define FILE_PATH_DELIMITER '/' #define PARAMETER_SEPARATOR_CHARACTER ',' #define PARAMETER_ASSIGNMENT_CHARACTER '=' #define PARAMETER_QUALIFIER_CHARACTER ':' +extern int hasQualifier (const char **identifier, const char *qualifier); +extern int hasNoQualifier (const char *identifier); + extern char **getParameters (const char *const *names, const char *qualifier, const char *parameters); extern void logParameters (const char *const *names, char **values, const char *description); diff --git a/Headers/pcm.h b/Headers/pcm.h index eca2f0e6bb82b3178e65940f8b9c2906a8ce7b1f..91e5b3f7fd5d3697e178963d83ae190776fc7dcf 100644 --- a/Headers/pcm.h +++ b/Headers/pcm.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/pgmpath.h b/Headers/pgmpath.h index 9aa385ca0a4edaa4f87e54223ced262e5741abb7..7cbc891bae7d56325dae4da3212eb7ae96f6a00b 100644 --- a/Headers/pgmpath.h +++ b/Headers/pgmpath.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/pid.h b/Headers/pid.h index 6e1d7c7964db906d93223bc917c860d125fe443a..66ee74eab632eb616ef5f55b2e6c0574d0296c34 100644 --- a/Headers/pid.h +++ b/Headers/pid.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ports.h b/Headers/ports.h index cc58556f2975b918a7b5e4de4a3bef7a1ad40567..0ae852674dcd324b3dab7d457695820efb7ca42f 100644 --- a/Headers/ports.h +++ b/Headers/ports.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/prefs.h b/Headers/prefs.h index 4b020a72a268e976dbedb9c98f1487854c4ca447..0415fcdb57ea2ea912a165e88792833ec96f6361 100644 --- a/Headers/prefs.h +++ b/Headers/prefs.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -209,7 +209,10 @@ typedef struct { unsigned char autoreleaseTime; unsigned char touchNavigation; + + unsigned char wordWrap; unsigned char cursorTrackingDelay; + unsigned char trackScreenScroll; unsigned char saveOnExit; unsigned char showSubmenuSizes; diff --git a/Headers/program.h b/Headers/program.h index d1f11b15d9e3f4855b48d2772bd12f5902db6cff..8edb148420842aef366f082e6d6e954b99794722 100644 --- a/Headers/program.h +++ b/Headers/program.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/prologue.h b/Headers/prologue.h index 01018eb0e8e382449c0f221140e09611185c158a..5c47538bd30ec96e1f6a5a18860bc26bf59d93fc 100644 --- a/Headers/prologue.h +++ b/Headers/prologue.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -23,7 +23,7 @@ extern "C" { #endif /* __cplusplus */ -#define PACKAGE_COPYRIGHT "Copyright (C) 1995-2017 by The BRLTTY Developers." +#define PACKAGE_COPYRIGHT "Copyright (C) 1995-2018 by The BRLTTY Developers." #undef HAVE_BUILTIN_POPCOUNT diff --git a/Headers/queue.h b/Headers/queue.h index cdfc9419aa2107dcf71d5ac8d9c7ae60b3d92fd1..48e755fd5a388c2c712b893fabb240acb86be91b 100644 --- a/Headers/queue.h +++ b/Headers/queue.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/report.h b/Headers/report.h index a661154eca9c90367bae7d56135662f5f1bfb8d7..e99db254bd23c7680e027f5184fa7c047c5ed544 100644 --- a/Headers/report.h +++ b/Headers/report.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/revision.h b/Headers/revision.h index 6312aba92e6377b436f642bdb2ea1461ac243e13..890f1dbf14809e7080dccccb6e1362ab3951df91 100644 --- a/Headers/revision.h +++ b/Headers/revision.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_base.h b/Headers/scr_base.h index 7e483803a72345f71244e0d321d98ec7f66c649a..8a5efbce54918654113404305fcacb42e459155e 100644 --- a/Headers/scr_base.h +++ b/Headers/scr_base.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_driver.h b/Headers/scr_driver.h index ecb17d7ef6365e5023344301e1b5a019517f08d5..2b1d452dfb6fa0120fa5584396b42fe040cd4a91 100644 --- a/Headers/scr_driver.h +++ b/Headers/scr_driver.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_gpm.h b/Headers/scr_gpm.h index caa4f94f6603a0a4ea20060b38d011c907d68323..3a16bb7f59a427220259bddc3341d2ef097e4f35 100644 --- a/Headers/scr_gpm.h +++ b/Headers/scr_gpm.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_main.h b/Headers/scr_main.h index 68a7e653b65121f600b12cfb0de4cd69c94e3ab4..a08361c1e217b3e0c8d7bd926f462c2c709f0f45 100644 --- a/Headers/scr_main.h +++ b/Headers/scr_main.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_real.h b/Headers/scr_real.h index 9e930e5b5e0433fab807efc3a1e9a860acccc03c..d6e0a0b0b74227e200db328360bfdc81c73bda96 100644 --- a/Headers/scr_real.h +++ b/Headers/scr_real.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_types.h b/Headers/scr_types.h index f8d4b4f8a382d7bd7e59630ae89ad0fe4bd368f9..3be06503d15f74f6bd9328662774f062e178a6b3 100644 --- a/Headers/scr_types.h +++ b/Headers/scr_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/scr_utils.h b/Headers/scr_utils.h index 807ca65ffca33c9c5890aa9d7e041e97b09b9454..dd6895dfd8dba6bcb2c0475bef15000110919ac5 100644 --- a/Headers/scr_utils.h +++ b/Headers/scr_utils.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/serial_types.h b/Headers/serial_types.h index 9e01e3bb6fee24097c06ddd93a5a8b570d4bf0a2..d3164a9aa333e556a8b86ca430bc54d29e9a95ee 100644 --- a/Headers/serial_types.h +++ b/Headers/serial_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/service.h b/Headers/service.h index 337b777e9c7a54a05f089238228cc84f25edc16e..bbd23db3395cae6d318abd4fe7c0bb945fff673f 100644 --- a/Headers/service.h +++ b/Headers/service.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/spk.h b/Headers/spk.h index 86441e2a6b195ef38daabdfb4aa6296e9f3cc3f1..0167387b9212fe4d20cf6cd849b514004e57f5b9 100644 --- a/Headers/spk.h +++ b/Headers/spk.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/spk_base.h b/Headers/spk_base.h index 8370e4cff00fa57a4cfc2fc549f8345bd4fb2ef9..50d10e6e6bcccad9e3ba8e9cfdaf5275102a8d93 100644 --- a/Headers/spk_base.h +++ b/Headers/spk_base.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/spk_driver.h b/Headers/spk_driver.h index f91ded253dbbd651cb08a8ae33acf173d5577eaa..8fa5107b9aba1b44496350c293ad4c9d7a8af6e6 100644 --- a/Headers/spk_driver.h +++ b/Headers/spk_driver.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/spk_types.h b/Headers/spk_types.h index 7a623640c618274a76f62c4669ce542e1b626a99..50cf0c675821778d162a9f7e95587cdd78387892 100644 --- a/Headers/spk_types.h +++ b/Headers/spk_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/status_types.h b/Headers/status_types.h index 91321686c8a9845c757162ef6561af7a60d42dc8..f5fc4cca7fcf0416f7d06c4a24baccea55f87270 100644 --- a/Headers/status_types.h +++ b/Headers/status_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/stdiox.h b/Headers/stdiox.h index efbbfd8ddbafd13ee03bbb7e5cd20d49f4f75505..1665cafb2a132c3b2c912b3007de31d7da1aaf82 100644 --- a/Headers/stdiox.h +++ b/Headers/stdiox.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/strfmt.h b/Headers/strfmt.h index b24910c791c74bbf4fc5db47d3ee17015cde4c4e..6b521b5bb89c4c4a551f541e6304146f0f37b1a5 100644 --- a/Headers/strfmt.h +++ b/Headers/strfmt.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/strfmth.h b/Headers/strfmth.h index cfa1f8439e87e4d1d5649122f1d19f712b07cf8c..fb3d06bf4710977cd4b0a408988646031e4ab2c9 100644 --- a/Headers/strfmth.h +++ b/Headers/strfmth.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/system.h b/Headers/system.h index fcea2a5c8fb3b57d43378eaac17a0f84f2547890..fa0e3684bad84464f11d5ba541a41408a140d56c 100644 --- a/Headers/system.h +++ b/Headers/system.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/system_darwin.h b/Headers/system_darwin.h index 3890de04a6867ede6fcfcf4479723910dd6e0a39..bca25147c85879363eec15d1dd547b9b9fd22092 100644 --- a/Headers/system_darwin.h +++ b/Headers/system_darwin.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/system_java.h b/Headers/system_java.h index 7d07bac55fa4cbe4bc5d9dbb4c2565e407f516fa..a5619ad5890e66320bcf6ba3a74a63671303ad75 100644 --- a/Headers/system_java.h +++ b/Headers/system_java.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/system_linux.h b/Headers/system_linux.h index bf548a17a8175b05b528f7ad89ff06570803e4f4..99f4a432aeb4c899e1bc4f75533dc74002b0c7fd 100644 --- a/Headers/system_linux.h +++ b/Headers/system_linux.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/system_msdos.h b/Headers/system_msdos.h index dc97e4ac3df4f39bc57b14b32fa8a34bc5c584c5..760abd5e0ed4ddd1d69e204989d7bf65c37e7ead 100644 --- a/Headers/system_msdos.h +++ b/Headers/system_msdos.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/system_windows.h b/Headers/system_windows.h index 4752483a31240633680ac477d593d2b0d325dcb2..34221b71ff752f0bf76fc84bf912e9902bfb6abb 100644 --- a/Headers/system_windows.h +++ b/Headers/system_windows.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/thread.h b/Headers/thread.h index 2bde26cec9112d29b884ba0a78b6ad7f00958fd4..eac1752b89777159d5749031f696e439e371cf44 100644 --- a/Headers/thread.h +++ b/Headers/thread.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/timing.h b/Headers/timing.h index 11a65ce059ca3c1f85d2dc0532965b9790963038..b50de9a47a5e7b15fda7ada68b089d7ef3644da5 100644 --- a/Headers/timing.h +++ b/Headers/timing.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/ttb.h b/Headers/ttb.h index 9e51c6131ab0407054c9f5fabe6bf9b813888de0..c8a18eaee2f9eb4ae88a2c0b79b956cf05ba837e 100644 --- a/Headers/ttb.h +++ b/Headers/ttb.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/tune.h b/Headers/tune.h index bf71235c25cfbeeb802e64d336a9e42d3e43be0f..1db8ca5b49bd36db1e69870d16342e4dc02fa100 100644 --- a/Headers/tune.h +++ b/Headers/tune.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/tune_build.h b/Headers/tune_build.h index 2d73a4b319e9d41a4c451ceb844f112a896fd390..309ef0054122a3253c027ed3451db5856d908cd1 100644 --- a/Headers/tune_build.h +++ b/Headers/tune_build.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/tune_types.h b/Headers/tune_types.h index d3313dc9dcf70d872c3a6eeaf3adacff879f78d5..a3d26ca7858fbf21adc89a755730bcdbd1703608 100644 --- a/Headers/tune_types.h +++ b/Headers/tune_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/tune_utils.h b/Headers/tune_utils.h index 958d4c596ed09d3c8ab010c4db0450b238545b89..d748592778274a15b64711fd9129e5487dd8d3d8 100644 --- a/Headers/tune_utils.h +++ b/Headers/tune_utils.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/unicode.h b/Headers/unicode.h index 2458aacf3fc0fd703cf912d12f547c3f53c077cb..f3227e2e50a035a2c59f11bb883a3ecff8a7d51e 100644 --- a/Headers/unicode.h +++ b/Headers/unicode.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/usb_types.h b/Headers/usb_types.h index dba27c4848f95a6706a08d3214bde65740acb576..79e6f9374d12a87e326fd9a63e493c2d36e377cf 100644 --- a/Headers/usb_types.h +++ b/Headers/usb_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/variables.h b/Headers/variables.h index 7e32f05780619be3e18a2950d1a08620f45a8912..3e54b5e839e2fd5b34da456ed37e72295fce2b21 100644 --- a/Headers/variables.h +++ b/Headers/variables.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Headers/win_errno.h b/Headers/win_errno.h index 2452e9af00484afbd434d2e8dc8bd0413af01039..7d6800eb116757bd7c57d103f13bb695c048ee09 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Headers/win_pthread.h b/Headers/win_pthread.h index 59b834883d93eb1a01478a5eeebeafb5cbe676d3..2b1739edf179c105e55b0f200ccaa07b51f57644 100644 --- a/Headers/win_pthread.h +++ b/Headers/win_pthread.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Makefile.in b/Makefile.in index 983eb438d394a8cb677b84974d93eb7a9258be63..d7222151ca4976539d8ce1535ea0fc532df9004c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -28,6 +28,9 @@ install-systemd uninstall-systemd: install-udev uninstall-udev: cd Autostart/Udev && $(MAKE) $(@:-udev=) +install-appstream uninstall-appstream: + cd Autostart/AppStream && $(MAKE) $(@:-appstream=) + ARCHIVE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) TAR_EXTENSION = tar GZIP_EXTENSION = gz @@ -94,6 +97,7 @@ ITERATE = \ $(MSG_DIR) \ Autostart/Systemd \ Autostart/Udev \ + Autostart/AppStream \ Android/Application \ ; do (cd $$directory && $(MAKE) $@); done diff --git a/Messages/Makefile.in b/Messages/Makefile.in index 4c88e4d489e66e5df261c90540b9cf1eda5d64ba..21f04bea784cbdadb541d9d486e20cd99cb4fd63 100644 --- a/Messages/Makefile.in +++ b/Messages/Makefile.in @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Messages/brltty.pot b/Messages/brltty.pot index 4bfda0d9bda7bc57b5001c9ba6efe57d7a324c9d..d94434879aa6619c6568454b65ca6d13791ba4e4 100644 --- a/Messages/brltty.pot +++ b/Messages/brltty.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: brltty 5.4\n" -"Report-Msgid-Bugs-To: brltty@mielke.cc\n" -"POT-Creation-Date: 2017-04-08 00:22+0200\n" +"Project-Id-Version: brltty 5.5\n" +"Report-Msgid-Bugs-To: brltty@brltty.com\n" +"POT-Creation-Date: 2018-01-04 14:10+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,15 +31,15 @@ msgstr "" msgid "1 cell" msgstr "" -#: Programs/menu_prefs.c:762 +#: Programs/menu_prefs.c:766 msgid "1 second" msgstr "" -#: Programs/menu_prefs.c:790 +#: Programs/menu_prefs.c:799 msgid "10 seconds" msgstr "" -#: Programs/menu_prefs.c:1111 +#: Programs/menu_prefs.c:1120 msgid "12 Hour" msgstr "" @@ -49,31 +49,31 @@ msgstr "" msgid "2 cells" msgstr "" -#: Programs/menu_prefs.c:763 +#: Programs/menu_prefs.c:767 msgid "2 seconds" msgstr "" -#: Programs/menu_prefs.c:791 +#: Programs/menu_prefs.c:800 msgid "20 seconds" msgstr "" -#: Programs/menu_prefs.c:1110 +#: Programs/menu_prefs.c:1119 msgid "24 Hour" msgstr "" -#: Programs/menu_prefs.c:760 +#: Programs/menu_prefs.c:764 msgid "250 milliseconds" msgstr "" -#: Programs/menu_prefs.c:792 +#: Programs/menu_prefs.c:801 msgid "40 seconds" msgstr "" -#: Programs/menu_prefs.c:789 +#: Programs/menu_prefs.c:798 msgid "5 seconds" msgstr "" -#: Programs/menu_prefs.c:761 +#: Programs/menu_prefs.c:765 msgid "500 milliseconds" msgstr "" @@ -124,7 +124,7 @@ msgstr "" msgid "Acoustic Guitar (steel)" msgstr "" -#: Programs/menu_prefs.c:1137 +#: Programs/menu_prefs.c:1146 msgid "After Time" msgstr "" @@ -132,23 +132,23 @@ msgstr "" msgid "Agogo" msgstr "" -#: Programs/menu_prefs.c:1327 +#: Programs/menu_prefs.c:1336 msgid "Alert" msgstr "" -#: Programs/menu_prefs.c:952 +#: Programs/menu_prefs.c:961 msgid "Alert Dots" msgstr "" -#: Programs/menu_prefs.c:957 +#: Programs/menu_prefs.c:966 msgid "Alert Messages" msgstr "" -#: Programs/menu_prefs.c:898 +#: Programs/menu_prefs.c:907 msgid "Alert Tunes" msgstr "" -#: Programs/menu_prefs.c:731 Programs/menu_prefs.c:991 +#: Programs/menu_prefs.c:735 Programs/menu_prefs.c:1000 msgid "All" msgstr "" @@ -172,7 +172,7 @@ msgstr "" msgid "April" msgstr "" -#: Programs/log.c:115 +#: Programs/log.c:116 msgid "Async Events" msgstr "" @@ -180,7 +180,7 @@ msgstr "" msgid "Attributes Invisible Time" msgstr "" -#: Programs/config.c:2666 Programs/menu_prefs.c:1233 +#: Programs/config.c:2667 Programs/menu_prefs.c:1242 msgid "Attributes Table" msgstr "" @@ -196,27 +196,27 @@ msgstr "" msgid "Autorelease" msgstr "" -#: Programs/menu_prefs.c:795 +#: Programs/menu_prefs.c:804 msgid "Autorelease Time" msgstr "" -#: Programs/menu_prefs.c:807 +#: Programs/menu_prefs.c:816 msgid "Autorepeat" msgstr "" -#: Programs/menu_prefs.c:819 +#: Programs/menu_prefs.c:828 msgid "Autorepeat Interval" msgstr "" -#: Programs/menu_prefs.c:813 +#: Programs/menu_prefs.c:822 msgid "Autorepeat Panning" msgstr "" -#: Programs/menu_prefs.c:1034 +#: Programs/menu_prefs.c:1043 msgid "Autospeak" msgstr "" -#: Programs/config.c:1656 +#: Programs/config.c:1657 msgid "BRLTTY stopped" msgstr "" @@ -240,11 +240,11 @@ msgstr "" msgid "Bassoon" msgstr "" -#: Programs/menu_prefs.c:904 +#: Programs/menu_prefs.c:913 msgid "Beeper" msgstr "" -#: Programs/menu_prefs.c:1136 +#: Programs/menu_prefs.c:1145 msgid "Before Time" msgstr "" @@ -264,11 +264,11 @@ msgstr "" msgid "Blinking Screen Cursor" msgstr "" -#: Programs/menu_prefs.c:1086 +#: Programs/menu_prefs.c:1095 msgid "Blinking Speech Cursor" msgstr "" -#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1196 +#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1205 msgid "Block" msgstr "" @@ -276,7 +276,7 @@ msgstr "" msgid "Blown Bottle" msgstr "" -#: Programs/log.c:139 +#: Programs/log.c:140 msgid "Bluetooth I/O" msgstr "" @@ -284,7 +284,7 @@ msgstr "" msgid "Braille Device" msgstr "" -#: Programs/menu_prefs.c:867 +#: Programs/menu_prefs.c:876 msgid "Braille Display Orientation" msgstr "" @@ -292,7 +292,7 @@ msgstr "" msgid "Braille Driver" msgstr "" -#: Programs/log.c:145 +#: Programs/log.c:146 msgid "Braille Driver Events" msgstr "" @@ -300,15 +300,15 @@ msgstr "" msgid "Braille Firmness" msgstr "" -#: Programs/menu_prefs.c:857 +#: Programs/menu_prefs.c:866 msgid "Braille Input Mode" msgstr "" -#: Programs/log.c:79 +#: Programs/log.c:80 msgid "Braille Key Events" msgstr "" -#: Programs/menu_prefs.c:847 +#: Programs/menu_prefs.c:856 msgid "Braille Keyboard Enabled" msgstr "" @@ -320,7 +320,7 @@ msgstr "" msgid "Braille Presentation" msgstr "" -#: Programs/menu_prefs.c:1223 +#: Programs/menu_prefs.c:1232 msgid "Braille Tables" msgstr "" @@ -332,7 +332,7 @@ msgstr "" msgid "Braille Window Coordinates" msgstr "" -#: Programs/menu_prefs.c:752 +#: Programs/menu_prefs.c:756 msgid "Braille Window Overlap" msgstr "" @@ -369,11 +369,11 @@ msgstr "" msgid "BrlAPI host and/or port to connect to" msgstr "" -#: Programs/menu_prefs.c:1279 +#: Programs/menu_prefs.c:1288 msgid "Bug Reports" msgstr "" -#: Programs/menu_prefs.c:1260 +#: Programs/menu_prefs.c:1269 msgid "Build Information" msgstr "" @@ -389,7 +389,7 @@ msgstr "" msgid "Capitals Visible Time" msgstr "" -#: Programs/menu_prefs.c:1350 +#: Programs/menu_prefs.c:1359 msgid "Category Log Level" msgstr "" @@ -426,15 +426,15 @@ msgstr "" msgid "Close" msgstr "" -#: Programs/menu_prefs.c:1120 +#: Programs/menu_prefs.c:1129 msgid "Colon" msgstr "" -#: Programs/menu_prefs.c:1284 +#: Programs/menu_prefs.c:1293 msgid "Configuration Directory" msgstr "" -#: Programs/config.c:2620 Programs/menu_prefs.c:1289 +#: Programs/config.c:2621 Programs/menu_prefs.c:1298 msgid "Configuration File" msgstr "" @@ -442,7 +442,7 @@ msgstr "" msgid "Console Bell" msgstr "" -#: Programs/menu_prefs.c:884 +#: Programs/menu_prefs.c:893 msgid "Console Bell Alert" msgstr "" @@ -454,7 +454,7 @@ msgstr "" msgid "Contracted Braille" msgstr "" -#: Programs/config.c:2673 Programs/menu_prefs.c:1241 +#: Programs/config.c:2674 Programs/menu_prefs.c:1250 msgid "Contraction Table" msgstr "" @@ -466,43 +466,43 @@ msgstr "" msgid "Contraction verification table." msgstr "" -#: Programs/menu_prefs.c:1328 +#: Programs/menu_prefs.c:1337 msgid "Critical" msgstr "" -#: Programs/log.c:97 +#: Programs/log.c:98 msgid "Cursor Routing" msgstr "" -#: Programs/log.c:91 +#: Programs/log.c:92 msgid "Cursor Tracking" msgstr "" -#: Programs/menu_prefs.c:766 +#: Programs/menu_prefs.c:770 msgid "Cursor Tracking Delay" msgstr "" -#: Programs/menu_prefs.c:1158 +#: Programs/menu_prefs.c:1167 msgid "Dash" msgstr "" -#: Programs/menu_prefs.c:1151 +#: Programs/menu_prefs.c:1160 msgid "Date Format" msgstr "" -#: Programs/menu_prefs.c:1140 +#: Programs/menu_prefs.c:1149 msgid "Date Position" msgstr "" -#: Programs/menu_prefs.c:1163 +#: Programs/menu_prefs.c:1172 msgid "Date Separator" msgstr "" -#: Programs/menu_prefs.c:1148 +#: Programs/menu_prefs.c:1157 msgid "Day Month Year" msgstr "" -#: Programs/menu_prefs.c:1333 +#: Programs/menu_prefs.c:1342 msgid "Debug" msgstr "" @@ -538,12 +538,12 @@ msgstr "" msgid "Done" msgstr "" -#: Programs/menu_prefs.c:1121 -#: Programs/menu_prefs.c:1160 +#: Programs/menu_prefs.c:1130 +#: Programs/menu_prefs.c:1169 msgid "Dot" msgstr "" -#: Programs/menu_prefs.c:854 +#: Programs/menu_prefs.c:863 msgid "Dots via Unicode Braille" msgstr "" @@ -552,7 +552,7 @@ msgstr "" msgid "Drawbar Organ" msgstr "" -#: Programs/config.c:2626 Programs/menu_prefs.c:1309 +#: Programs/config.c:2627 Programs/menu_prefs.c:1318 msgid "Drivers Directory" msgstr "" @@ -560,7 +560,7 @@ msgstr "" msgid "Dulcimer" msgstr "" -#: Programs/menu_prefs.c:746 +#: Programs/menu_prefs.c:750 msgid "Eager Sliding Braille Window" msgstr "" @@ -600,7 +600,7 @@ msgstr "" msgid "Electric Piano 2" msgstr "" -#: Programs/menu_prefs.c:1326 +#: Programs/menu_prefs.c:1335 msgid "Emergency" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "End" msgstr "" -#: Programs/menu_prefs.c:732 +#: Programs/menu_prefs.c:736 msgid "End of Line" msgstr "" @@ -616,7 +616,7 @@ msgstr "" msgid "English Horn" msgstr "" -#: Programs/menu_prefs.c:1026 +#: Programs/menu_prefs.c:1035 msgid "Enqueue" msgstr "" @@ -624,7 +624,7 @@ msgstr "" msgid "Ensemble" msgstr "" -#: Programs/menu_prefs.c:1329 +#: Programs/menu_prefs.c:1338 msgid "Error" msgstr "" @@ -632,7 +632,7 @@ msgstr "" msgid "Ethnic Instruments" msgstr "" -#: Programs/menu_prefs.c:881 +#: Programs/menu_prefs.c:890 msgid "Event Alerts" msgstr "" @@ -644,11 +644,11 @@ msgstr "" msgid "Explicit preference settings." msgstr "" -#: Programs/menu_prefs.c:907 +#: Programs/menu_prefs.c:916 msgid "FM" msgstr "" -#: Programs/menu_prefs.c:945 +#: Programs/menu_prefs.c:954 msgid "FM Volume" msgstr "" @@ -725,7 +725,7 @@ msgstr "" msgid "Generic" msgstr "" -#: Programs/log.c:61 +#: Programs/log.c:62 msgid "Generic Input" msgstr "" @@ -766,11 +766,11 @@ msgstr "" msgid "Help Screen" msgstr "" -#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:836 +#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:845 msgid "High" msgstr "" -#: Programs/menu_prefs.c:778 +#: Programs/menu_prefs.c:787 msgid "Highlight Braille Window Location" msgstr "" @@ -778,7 +778,7 @@ msgstr "" msgid "Honkytonk Piano" msgstr "" -#: Programs/menu_prefs.c:1025 +#: Programs/menu_prefs.c:1034 msgid "Immediate" msgstr "" @@ -790,15 +790,15 @@ msgstr "" msgid "Incompatible XKB server support\n" msgstr "" -#: Programs/menu_prefs.c:1332 +#: Programs/menu_prefs.c:1341 msgid "Information" msgstr "" -#: Programs/menu_prefs.c:784 +#: Programs/menu_prefs.c:793 msgid "Input Options" msgstr "" -#: Programs/log.c:67 +#: Programs/log.c:68 msgid "Input Packets" msgstr "" @@ -807,7 +807,7 @@ msgstr "" msgid "Install the %s service, and then exit." msgstr "" -#: Programs/menu_prefs.c:1336 +#: Programs/menu_prefs.c:1345 msgid "Internal Parameters" msgstr "" @@ -839,15 +839,15 @@ msgstr "" msgid "Key Table" msgstr "" -#: Programs/log.c:85 +#: Programs/log.c:86 msgid "Keyboard Key Events" msgstr "" -#: Programs/menu_prefs.c:891 +#: Programs/menu_prefs.c:900 msgid "Keyboard LED Alerts" msgstr "" -#: Programs/config.c:2680 Programs/menu_prefs.c:873 +#: Programs/config.c:2681 Programs/menu_prefs.c:882 msgid "Keyboard Table" msgstr "" @@ -855,7 +855,7 @@ msgstr "" msgid "Koto" msgstr "" -#: Programs/config.c:2810 +#: Programs/config.c:2811 msgid "Language" msgstr "" @@ -896,7 +896,7 @@ msgstr "" msgid "Learn Mode" msgstr "" -#: Programs/menu_prefs.c:1175 +#: Programs/menu_prefs.c:1184 msgid "Left" msgstr "" @@ -912,11 +912,11 @@ msgstr "" msgid "List key table in reStructuredText format." msgstr "" -#: Programs/menu_prefs.c:1319 +#: Programs/menu_prefs.c:1328 msgid "Locale Directory" msgstr "" -#: Programs/menu_prefs.c:1355 +#: Programs/menu_prefs.c:1364 msgid "Log Categories" msgstr "" @@ -924,7 +924,7 @@ msgstr "" msgid "Log Level" msgstr "" -#: Programs/menu_prefs.c:1416 +#: Programs/menu_prefs.c:1425 msgid "Log Messages" msgstr "" @@ -941,11 +941,11 @@ msgstr "" 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:801 +#: Programs/menu_prefs.c:810 msgid "Long Press Time" msgstr "" -#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:834 +#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:843 msgid "Low" msgstr "" @@ -957,7 +957,7 @@ msgstr "" msgid "Lower Right Dot" msgstr "" -#: Programs/menu_prefs.c:906 +#: Programs/menu_prefs.c:915 msgid "MIDI" msgstr "" @@ -965,11 +965,11 @@ msgstr "" msgid "MIDI (Musical Instrument Digital Interface) device specifier." msgstr "" -#: Programs/menu_prefs.c:936 +#: Programs/menu_prefs.c:945 msgid "MIDI Instrument" msgstr "" -#: Programs/menu_prefs.c:926 +#: Programs/menu_prefs.c:935 msgid "MIDI Volume" msgstr "" @@ -981,7 +981,7 @@ msgstr "" msgid "Marimba" msgstr "" -#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:837 +#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:846 msgid "Maximum" msgstr "" @@ -993,7 +993,7 @@ msgstr "" msgid "May" msgstr "" -#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:835 +#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:844 msgid "Medium" msgstr "" @@ -1009,11 +1009,11 @@ msgstr "" msgid "Message hold timeout (in 10ms units)." msgstr "" -#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:833 +#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:842 msgid "Minimum" msgstr "" -#: Programs/menu_prefs.c:1147 +#: Programs/menu_prefs.c:1156 msgid "Month Day Year" msgstr "" @@ -1021,7 +1021,7 @@ msgstr "" msgid "Music Box" msgstr "" -#: Programs/menu_prefs.c:906 +#: Programs/menu_prefs.c:915 msgid "Musical Instrument Digital Interface" msgstr "" @@ -1066,20 +1066,20 @@ msgstr "" msgid "No Capitalization" msgstr "" -#: Programs/menu_prefs.c:759 Programs/menu_prefs.c:989 -#: Programs/menu_prefs.c:1002 -#: Programs/menu_prefs.c:1015 -#: Programs/menu_prefs.c:1135 -#: Programs/menu_prefs.c:1174 -#: Programs/menu_prefs.c:1194 +#: Programs/menu_prefs.c:763 Programs/menu_prefs.c:998 +#: Programs/menu_prefs.c:1011 +#: Programs/menu_prefs.c:1024 +#: Programs/menu_prefs.c:1144 +#: Programs/menu_prefs.c:1183 +#: Programs/menu_prefs.c:1203 msgid "None" msgstr "" -#: Programs/menu_prefs.c:863 +#: Programs/menu_prefs.c:872 msgid "Normal" msgstr "" -#: Programs/menu_prefs.c:1331 +#: Programs/menu_prefs.c:1340 msgid "Notice" msgstr "" @@ -1099,7 +1099,7 @@ msgstr "" msgid "October" msgstr "" -#: Programs/menu_prefs.c:788 +#: Programs/menu_prefs.c:797 msgid "Off" msgstr "" @@ -1119,7 +1119,7 @@ msgstr "" msgid "Organ" msgstr "" -#: Programs/log.c:73 +#: Programs/log.c:74 msgid "Output Packets" msgstr "" @@ -1131,7 +1131,7 @@ msgstr "" msgid "PC mode" msgstr "" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:914 msgid "PCM" msgstr "" @@ -1139,7 +1139,7 @@ msgstr "" msgid "PCM (soundcard digital audio) device specifier." msgstr "" -#: Programs/menu_prefs.c:918 +#: Programs/menu_prefs.c:927 msgid "PCM Volume" msgstr "" @@ -1147,11 +1147,11 @@ msgstr "" msgid "PS/2 (set 3) keyboard scan code" msgstr "" -#: Programs/menu_prefs.c:1269 +#: Programs/menu_prefs.c:1278 msgid "Package Revision" msgstr "" -#: Programs/menu_prefs.c:1264 +#: Programs/menu_prefs.c:1273 msgid "Package Version" msgstr "" @@ -1283,11 +1283,11 @@ msgstr "" msgid "Pizzicato Strings" msgstr "" -#: Drivers/Braille/Baum/braille.c:1076 +#: Drivers/Braille/Baum/braille.c:1104 msgid "Powerdown" msgstr "" -#: Programs/config.c:2621 Programs/menu_prefs.c:1299 +#: Programs/config.c:2622 Programs/menu_prefs.c:1308 msgid "Preferences File" msgstr "" @@ -1303,7 +1303,7 @@ msgstr "" msgid "Print a usage summary (commonly used options only), and then exit." msgstr "" -#: Programs/menu_prefs.c:1250 +#: Programs/menu_prefs.c:1259 msgid "Profiles" msgstr "" @@ -1311,7 +1311,7 @@ msgstr "" msgid "Properties of eligible keyboards." msgstr "" -#: Programs/menu_prefs.c:1006 +#: Programs/menu_prefs.c:1015 msgid "Raise Pitch" msgstr "" @@ -1360,19 +1360,19 @@ msgstr "" msgid "Report the characters within the current screen font that aren't defined within the text table." msgstr "" -#: Programs/menu_prefs.c:733 +#: Programs/menu_prefs.c:737 msgid "Rest of Line" msgstr "" -#: Programs/menu_prefs.c:1398 +#: Programs/menu_prefs.c:1407 msgid "Restart Braille Driver" msgstr "" -#: Programs/menu_prefs.c:1410 +#: Programs/menu_prefs.c:1419 msgid "Restart Screen Driver" msgstr "" -#: Programs/menu_prefs.c:1404 +#: Programs/menu_prefs.c:1413 msgid "Restart Speech Driver" msgstr "" @@ -1380,7 +1380,7 @@ msgstr "" msgid "Reverse Cymbal" msgstr "" -#: Programs/menu_prefs.c:1176 +#: Programs/menu_prefs.c:1185 msgid "Right" msgstr "" @@ -1388,7 +1388,7 @@ msgstr "" msgid "Rock Organ" msgstr "" -#: Programs/menu_prefs.c:864 +#: Programs/menu_prefs.c:873 msgid "Rotated" msgstr "" @@ -1398,15 +1398,15 @@ 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:1005 +#: Programs/menu_prefs.c:1014 msgid "Say Cap" msgstr "" -#: Programs/menu_prefs.c:1029 +#: Programs/menu_prefs.c:1038 msgid "Say Line Mode" msgstr "" -#: Programs/menu_prefs.c:1016 +#: Programs/menu_prefs.c:1025 msgid "Say Space" msgstr "" @@ -1442,11 +1442,11 @@ msgstr "" msgid "Screen Cursor and Braille Window Row" msgstr "" -#: Programs/config.c:2112 +#: Programs/config.c:2113 msgid "Screen Driver" msgstr "" -#: Programs/log.c:157 +#: Programs/log.c:158 msgid "Screen Driver Events" msgstr "" @@ -1454,7 +1454,7 @@ msgstr "" msgid "Screen Number" msgstr "" -#: Programs/config.c:2118 +#: Programs/config.c:2119 msgid "Screen Parameter" msgstr "" @@ -1471,11 +1471,11 @@ msgstr "" msgid "September" msgstr "" -#: Programs/log.c:127 +#: Programs/log.c:128 msgid "Serial I/O" msgstr "" -#: Programs/log.c:121 +#: Programs/log.c:122 msgid "Server Events" msgstr "" @@ -1507,11 +1507,11 @@ msgstr "" msgid "Show Screen Cursor" msgstr "" -#: Programs/menu_prefs.c:1129 +#: Programs/menu_prefs.c:1138 msgid "Show Seconds" msgstr "" -#: Programs/menu_prefs.c:1075 +#: Programs/menu_prefs.c:1084 msgid "Show Speech Cursor" msgstr "" @@ -1524,15 +1524,15 @@ msgstr "" msgid "Sitar" msgstr "" -#: Programs/menu_prefs.c:725 +#: Programs/menu_prefs.c:729 msgid "Skip Blank Braille Windows" msgstr "" -#: Programs/menu_prefs.c:720 +#: Programs/menu_prefs.c:724 msgid "Skip Identical Lines" msgstr "" -#: Programs/menu_prefs.c:736 +#: Programs/menu_prefs.c:740 msgid "Skip Which Blank Braille Windows" msgstr "" @@ -1544,15 +1544,15 @@ msgstr "" msgid "Slap Bass 2" msgstr "" -#: Programs/menu_prefs.c:1159 +#: Programs/menu_prefs.c:1168 msgid "Slash" msgstr "" -#: Programs/menu_prefs.c:741 +#: Programs/menu_prefs.c:745 msgid "Sliding Braille Window" msgstr "" -#: Programs/menu_prefs.c:990 +#: Programs/menu_prefs.c:999 msgid "Some" msgstr "" @@ -1565,92 +1565,92 @@ msgstr "" msgid "Sound Effects" msgstr "" -#: Programs/menu_prefs.c:1195 +#: Programs/menu_prefs.c:1204 msgid "Space" msgstr "" -#: Programs/menu_prefs.c:1069 +#: Programs/menu_prefs.c:1078 msgid "Speak Completed Words" msgstr "" -#: Programs/menu_prefs.c:1057 +#: Programs/menu_prefs.c:1066 msgid "Speak Deleted Characters" msgstr "" -#: Programs/menu_prefs.c:1051 +#: Programs/menu_prefs.c:1060 msgid "Speak Inserted Characters" msgstr "" -#: Programs/menu_prefs.c:1063 +#: Programs/menu_prefs.c:1072 msgid "Speak Replaced Characters" msgstr "" -#: Programs/menu_prefs.c:1045 +#: Programs/menu_prefs.c:1054 msgid "Speak Selected Character" msgstr "" -#: Programs/menu_prefs.c:1039 +#: Programs/menu_prefs.c:1048 msgid "Speak Selected Line" msgstr "" -#: Programs/menu_prefs.c:1098 +#: Programs/menu_prefs.c:1107 msgid "Speech Cursor Invisible Time" msgstr "" -#: Programs/menu_prefs.c:1080 +#: Programs/menu_prefs.c:1089 msgid "Speech Cursor Style" msgstr "" -#: Programs/menu_prefs.c:1092 +#: Programs/menu_prefs.c:1101 msgid "Speech Cursor Visible Time" msgstr "" -#: Programs/config.c:1880 +#: Programs/config.c:1881 msgid "Speech Driver" msgstr "" -#: Programs/log.c:151 +#: Programs/log.c:152 msgid "Speech Driver Events" msgstr "" -#: Programs/log.c:109 +#: Programs/log.c:110 msgid "Speech Events" msgstr "" #. Create the file system object for speech input. -#: Programs/config.c:2720 +#: Programs/config.c:2721 msgid "Speech Input" msgstr "" -#: Programs/menu_prefs.c:964 +#: Programs/menu_prefs.c:973 msgid "Speech Options" msgstr "" -#: Programs/config.c:1883 +#: Programs/config.c:1884 msgid "Speech Parameter" msgstr "" -#: Programs/menu_prefs.c:981 +#: Programs/menu_prefs.c:990 msgid "Speech Pitch" msgstr "" -#: Programs/menu_prefs.c:994 +#: Programs/menu_prefs.c:1003 msgid "Speech Punctuation" msgstr "" -#: Programs/menu_prefs.c:974 +#: Programs/menu_prefs.c:983 msgid "Speech Rate" msgstr "" -#: Programs/menu_prefs.c:1009 +#: Programs/menu_prefs.c:1018 msgid "Speech Uppercase Indicator" msgstr "" -#: Programs/menu_prefs.c:967 +#: Programs/menu_prefs.c:976 msgid "Speech Volume" msgstr "" -#: Programs/menu_prefs.c:1019 +#: Programs/menu_prefs.c:1028 msgid "Speech Whitespace Indicator" msgstr "" @@ -1659,7 +1659,7 @@ msgstr "" msgid "Speech driver code (%s, %s, or one of {%s})." msgstr "" -#: Programs/menu_prefs.c:1345 +#: Programs/menu_prefs.c:1354 msgid "Standard Error Log Level" msgstr "" @@ -1671,11 +1671,11 @@ msgstr "" msgid "State Letter" msgstr "" -#: Programs/menu_prefs.c:1170 +#: Programs/menu_prefs.c:1179 msgid "Status Cells" msgstr "" -#: Programs/menu_prefs.c:1186 +#: Programs/menu_prefs.c:1195 msgid "Status Count" msgstr "" @@ -1683,15 +1683,15 @@ msgstr "" msgid "Status Field" msgstr "" -#: Programs/menu_prefs.c:1179 +#: Programs/menu_prefs.c:1188 msgid "Status Position" msgstr "" -#: Programs/menu_prefs.c:1201 +#: Programs/menu_prefs.c:1210 msgid "Status Separator" msgstr "" -#: Programs/menu_prefs.c:1197 +#: Programs/menu_prefs.c:1206 msgid "Status Side" msgstr "" @@ -1769,11 +1769,11 @@ msgstr "" msgid "SynthStrings 2" msgstr "" -#: Programs/menu_prefs.c:1340 +#: Programs/menu_prefs.c:1349 msgid "System Log Level" msgstr "" -#: Programs/config.c:2627 Programs/menu_prefs.c:1314 +#: Programs/config.c:2628 Programs/menu_prefs.c:1323 msgid "Tables Directory" msgstr "" @@ -1797,7 +1797,7 @@ msgstr "" msgid "Text Indicators" msgstr "" -#: Programs/menu_prefs.c:1198 +#: Programs/menu_prefs.c:1207 msgid "Text Side" msgstr "" @@ -1805,7 +1805,7 @@ msgstr "" msgid "Text Style" msgstr "" -#: Programs/config.c:2652 Programs/menu_prefs.c:1226 +#: Programs/config.c:2653 Programs/menu_prefs.c:1235 msgid "Text Table" msgstr "" @@ -1817,15 +1817,15 @@ msgstr "" msgid "Time" msgstr "" -#: Programs/menu_prefs.c:1114 +#: Programs/menu_prefs.c:1123 msgid "Time Format" msgstr "" -#: Programs/menu_prefs.c:1106 +#: Programs/menu_prefs.c:1115 msgid "Time Presentation" msgstr "" -#: Programs/menu_prefs.c:1124 +#: Programs/menu_prefs.c:1133 msgid "Time Separator" msgstr "" @@ -1838,23 +1838,27 @@ msgstr "" msgid "Tinkle Bell" msgstr "" -#: Programs/menu_prefs.c:1394 +#: Programs/menu_prefs.c:1403 msgid "Tools" msgstr "" -#: Programs/menu_prefs.c:826 +#: Programs/menu_prefs.c:835 msgid "Touch Navigation" msgstr "" -#: Programs/menu_prefs.c:840 +#: Programs/menu_prefs.c:849 msgid "Touch Sensitivity" msgstr "" -#: Programs/menu_prefs.c:772 +#: Programs/menu_prefs.c:781 msgid "Track Screen Pointer" msgstr "" -#: Programs/menu_prefs.c:853 +#: Programs/menu_prefs.c:775 +msgid "Track Screen Scroll" +msgstr "" + +#: Programs/menu_prefs.c:862 msgid "Translated via Text Table" msgstr "" @@ -1879,11 +1883,11 @@ msgstr "" msgid "Tubular Bells" msgstr "" -#: Programs/menu_prefs.c:910 +#: Programs/menu_prefs.c:919 msgid "Tune Device" msgstr "" -#: Programs/log.c:133 +#: Programs/log.c:134 msgid "USB I/O" msgstr "" @@ -1895,11 +1899,11 @@ msgstr "" msgid "Unfrozen" msgstr "" -#: Programs/config.c:2624 Programs/menu_prefs.c:1294 +#: Programs/config.c:2625 Programs/menu_prefs.c:1303 msgid "Updatable Directory" msgstr "" -#: Programs/log.c:103 +#: Programs/log.c:104 msgid "Update Events" msgstr "" @@ -1928,11 +1932,11 @@ msgstr "" msgid "Voice Oohs" msgstr "" -#: Programs/menu_prefs.c:1330 +#: Programs/menu_prefs.c:1339 msgid "Warning" msgstr "" -#: Programs/menu_prefs.c:1274 +#: Programs/menu_prefs.c:1283 msgid "Web Site" msgstr "" @@ -1944,11 +1948,15 @@ msgstr "" msgid "Woodblock" msgstr "" -#: Programs/config.c:2613 +#: Programs/menu_prefs.c:720 +msgid "Word Wrap" +msgstr "" + +#: Programs/config.c:2614 msgid "Working Directory" msgstr "" -#: Programs/config.c:2625 Programs/menu_prefs.c:1304 +#: Programs/config.c:2626 Programs/menu_prefs.c:1313 msgid "Writable Directory" msgstr "" @@ -1972,7 +1980,7 @@ msgstr "" msgid "Xylophone" msgstr "" -#: Programs/menu_prefs.c:1146 +#: Programs/menu_prefs.c:1155 msgid "Year Month Day" msgstr "" @@ -2008,7 +2016,7 @@ msgstr "" msgid "backspace key" msgstr "" -#: Drivers/Braille/Baum/braille.c:1067 +#: Drivers/Braille/Baum/braille.c:1095 #: Drivers/Braille/TSI/braille.c:869 msgid "battery low" msgstr "" @@ -2039,7 +2047,7 @@ msgstr "" msgid "blue" msgstr "" -#: Programs/config.c:2692 +#: Programs/config.c:2693 #, c-format msgid "braille device not specified" msgstr "" @@ -2121,7 +2129,7 @@ msgstr "" msgid "cannot determine program directory" msgstr "" -#: Programs/config.c:2616 Programs/menu.c:544 +#: Programs/config.c:2617 Programs/menu.c:544 msgid "cannot determine working directory" msgstr "" @@ -2198,11 +2206,11 @@ 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:888 +#: Programs/core.c:973 msgid "cap" msgstr "" -#: Programs/menu_prefs.c:753 Programs/menu_prefs.c:1187 +#: Programs/menu_prefs.c:757 Programs/menu_prefs.c:1196 msgid "cells" msgstr "" @@ -2231,7 +2239,7 @@ msgstr "" msgid "console not in use" msgstr "" -#: Programs/menu_prefs.c:904 +#: Programs/menu_prefs.c:913 msgid "console tone generator" msgstr "" @@ -2354,7 +2362,7 @@ msgstr "" msgid "dots 7 and 8" msgstr "" -#: Drivers/Braille/Baum/braille.c:1064 +#: Drivers/Braille/Baum/braille.c:1092 msgid "driver request" msgstr "" @@ -2677,7 +2685,7 @@ msgstr "" msgid "identifier,..." msgstr "" -#: Drivers/Braille/Baum/braille.c:1066 +#: Drivers/Braille/Baum/braille.c:1094 msgid "idle timeout" msgstr "" @@ -2717,11 +2725,11 @@ msgstr "" msgid "invalid flag setting" msgstr "" -#: Programs/config.c:2528 +#: Programs/config.c:2529 msgid "invalid message hold timeout" msgstr "" -#: Programs/brlapi_server.c:3129 +#: Programs/brlapi_server.c:3143 msgid "invalid thread stack size" msgstr "" @@ -2786,15 +2794,15 @@ msgstr "" msgid "missing operand" msgstr "" -#: Programs/parse.c:367 +#: Programs/parse.c:428 msgid "missing parameter name" msgstr "" -#: Programs/parse.c:353 +#: Programs/parse.c:414 msgid "missing parameter qualifier" msgstr "" -#: Programs/parse.c:329 +#: Programs/parse.c:390 msgid "missing parameter value" msgstr "" @@ -2840,7 +2848,7 @@ msgstr "" msgid "percentage" msgstr "" -#: Programs/config.c:2501 +#: Programs/config.c:2502 msgid "pid file not specified" msgstr "" @@ -2856,7 +2864,7 @@ msgstr "" msgid "place left end of braille window at character" msgstr "" -#: Drivers/Braille/Baum/braille.c:1065 +#: Drivers/Braille/Baum/braille.c:1093 msgid "power switch" msgstr "" @@ -2873,17 +2881,17 @@ msgstr "" msgid "red" msgstr "" -#: Programs/config.c:1701 +#: Programs/config.c:1702 #, c-format msgid "reinitializing braille driver" msgstr "" -#: Programs/config.c:2249 +#: Programs/config.c:2250 #, c-format msgid "reinitializing screen driver" msgstr "" -#: Programs/config.c:2030 +#: Programs/config.c:2031 #, c-format msgid "reinitializing speech driver" msgstr "" @@ -2927,7 +2935,7 @@ msgstr "" msgid "save preferences to disk" msgstr "" -#: Programs/config.c:2129 +#: Programs/config.c:2130 msgid "screen driver not loadable" msgstr "" @@ -3089,15 +3097,15 @@ msgstr "" msgid "show current date and time" msgstr "" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:914 msgid "soundcard digital audio" msgstr "" -#: Programs/menu_prefs.c:907 +#: Programs/menu_prefs.c:916 msgid "soundcard synthesizer" msgstr "" -#: Programs/cmd.c:277 Programs/core.c:869 +#: Programs/cmd.c:277 Programs/core.c:954 msgid "space" msgstr "" @@ -3125,7 +3133,7 @@ msgstr "" msgid "speak speech cursor location" msgstr "" -#: Programs/config.c:1894 +#: Programs/config.c:1895 msgid "speech driver not loadable" msgstr "" @@ -3225,7 +3233,7 @@ msgstr "" msgid "unknown option" msgstr "" -#: Programs/parse.c:396 +#: Programs/parse.c:457 msgid "unsupported parameter" msgstr "" diff --git a/Messages/de.po b/Messages/de.po index 291248d420b86ca9490bcb930dac3a666db04b14..5af2a91b1bac3140c5474265b3c0e909f3c2fe6f 100644 --- a/Messages/de.po +++ b/Messages/de.po @@ -1,14 +1,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: brltty 4.5\n" -"Report-Msgid-Bugs-To: brltty@mielke.cc\n" -"POT-Creation-Date: 2017-04-08 00:22+0200\n" -"PO-Revision-Date: 2017-04-08 00:38+0200\n" +"Report-Msgid-Bugs-To: brltty@brltty.com\n" +"POT-Creation-Date: 2018-01-04 14:10+0100\n" +"PO-Revision-Date: 2018-01-05 00:33+0100\n" "Last-Translator: Angela Engel \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -39,15 +39,15 @@ msgstr "\"%s\" gestartet als \"%s\"\n" msgid "1 cell" msgstr "1 Zelle" -#: Programs/menu_prefs.c:762 +#: Programs/menu_prefs.c:766 msgid "1 second" msgstr "1 Sekunde" -#: Programs/menu_prefs.c:790 +#: Programs/menu_prefs.c:799 msgid "10 seconds" msgstr "10 Sekunden" -#: Programs/menu_prefs.c:1111 +#: Programs/menu_prefs.c:1120 msgid "12 Hour" msgstr "12 Stunden" @@ -57,31 +57,31 @@ msgstr "12 Stunden" msgid "2 cells" msgstr "2 Zellen" -#: Programs/menu_prefs.c:763 +#: Programs/menu_prefs.c:767 msgid "2 seconds" msgstr "2 Sekunden" -#: Programs/menu_prefs.c:791 +#: Programs/menu_prefs.c:800 msgid "20 seconds" msgstr "20 Sekunden" -#: Programs/menu_prefs.c:1110 +#: Programs/menu_prefs.c:1119 msgid "24 Hour" msgstr "24 Stunden" -#: Programs/menu_prefs.c:760 +#: Programs/menu_prefs.c:764 msgid "250 milliseconds" msgstr "250 Millisekunden" -#: Programs/menu_prefs.c:792 +#: Programs/menu_prefs.c:801 msgid "40 seconds" msgstr "40 Sekunden" -#: Programs/menu_prefs.c:789 +#: Programs/menu_prefs.c:798 msgid "5 seconds" msgstr "5 Sekunden" -#: Programs/menu_prefs.c:761 +#: Programs/menu_prefs.c:765 msgid "500 milliseconds" msgstr "500 Millisekunden" @@ -132,7 +132,7 @@ msgstr "Akustische Gitarre (Nylonsaiten)" msgid "Acoustic Guitar (steel)" msgstr "Akustische Gitarre (Stahlsaiten)" -#: Programs/menu_prefs.c:1137 +#: Programs/menu_prefs.c:1146 msgid "After Time" msgstr "Nach Uhrzeit" @@ -140,23 +140,23 @@ msgstr "Nach Uhrzeit" msgid "Agogo" msgstr "Agogo" -#: Programs/menu_prefs.c:1327 +#: Programs/menu_prefs.c:1336 msgid "Alert" msgstr "Alarm" -#: Programs/menu_prefs.c:952 +#: Programs/menu_prefs.c:961 msgid "Alert Dots" msgstr "Warnpunkte" -#: Programs/menu_prefs.c:957 +#: Programs/menu_prefs.c:966 msgid "Alert Messages" msgstr "Warnmeldungen" -#: Programs/menu_prefs.c:898 +#: Programs/menu_prefs.c:907 msgid "Alert Tunes" msgstr "Warntöne" -#: Programs/menu_prefs.c:731 Programs/menu_prefs.c:991 +#: Programs/menu_prefs.c:735 Programs/menu_prefs.c:1000 msgid "All" msgstr "Alle" @@ -180,7 +180,7 @@ msgstr "Applaus" msgid "April" msgstr "April" -#: Programs/log.c:115 +#: Programs/log.c:116 msgid "Async Events" msgstr "Asynchrone Ereignisse" @@ -188,7 +188,7 @@ msgstr "Asynchrone Ereignisse" msgid "Attributes Invisible Time" msgstr "Attribute sind unsichtbar für" -#: Programs/config.c:2666 Programs/menu_prefs.c:1233 +#: Programs/config.c:2667 Programs/menu_prefs.c:1242 msgid "Attributes Table" msgstr "Attributtabelle" @@ -201,32 +201,30 @@ msgid "August" msgstr "August" #: Programs/alert.c:168 -#, fuzzy msgid "Autorelease" -msgstr "Automatische Wiederholung" +msgstr "Automatische Einrastbeendung" -#: Programs/menu_prefs.c:795 -#, fuzzy +#: Programs/menu_prefs.c:804 msgid "Autorelease Time" -msgstr "Automatische Wiederholung" +msgstr "Zeit bis zur automatischen Einrastbeendung" -#: Programs/menu_prefs.c:807 +#: Programs/menu_prefs.c:816 msgid "Autorepeat" msgstr "Automatische Wiederholung" -#: Programs/menu_prefs.c:819 +#: Programs/menu_prefs.c:828 msgid "Autorepeat Interval" msgstr "Wiederholungsintervall" -#: Programs/menu_prefs.c:813 +#: Programs/menu_prefs.c:822 msgid "Autorepeat Panning" msgstr "Automatische Wiederholung für Seitwertsbewegungen" -#: Programs/menu_prefs.c:1034 +#: Programs/menu_prefs.c:1043 msgid "Autospeak" msgstr "Automatisches Sprechen" -#: Programs/config.c:1656 +#: Programs/config.c:1657 msgid "BRLTTY stopped" msgstr "BRLTTY gestoppt" @@ -250,11 +248,11 @@ msgstr "Bass" msgid "Bassoon" msgstr "Fagott" -#: Programs/menu_prefs.c:904 +#: Programs/menu_prefs.c:913 msgid "Beeper" msgstr "PC-Piepser" -#: Programs/menu_prefs.c:1136 +#: Programs/menu_prefs.c:1145 msgid "Before Time" msgstr "Vor Uhrzeit" @@ -274,11 +272,11 @@ msgstr "Blinkende Großbuchstaben" msgid "Blinking Screen Cursor" msgstr "Blinkender Bildschirmcursor" -#: Programs/menu_prefs.c:1086 +#: Programs/menu_prefs.c:1095 msgid "Blinking Speech Cursor" msgstr "Blinkender Sprachcursor" -#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1196 +#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1205 msgid "Block" msgstr "Block" @@ -286,7 +284,7 @@ msgstr "Block" msgid "Blown Bottle" msgstr "Geblasene Flasche" -#: Programs/log.c:139 +#: Programs/log.c:140 msgid "Bluetooth I/O" msgstr "Bluetooth E/A" @@ -294,7 +292,7 @@ msgstr "Bluetooth E/A" msgid "Braille Device" msgstr "Braillegerät" -#: Programs/menu_prefs.c:867 +#: Programs/menu_prefs.c:876 msgid "Braille Display Orientation" msgstr "Braillezeilenausrichtung" @@ -302,7 +300,7 @@ msgstr "Braillezeilenausrichtung" msgid "Braille Driver" msgstr "Brailletreiber" -#: Programs/log.c:145 +#: Programs/log.c:146 msgid "Braille Driver Events" msgstr "Brailletreiberereignisse" @@ -310,15 +308,15 @@ msgstr "Brailletreiberereignisse" msgid "Braille Firmness" msgstr "Braille-Stärke" -#: Programs/menu_prefs.c:857 +#: Programs/menu_prefs.c:866 msgid "Braille Input Mode" msgstr "Brailleeingabe-Modus" -#: Programs/log.c:79 +#: Programs/log.c:80 msgid "Braille Key Events" msgstr "Tastenereignisse der Braillezeile" -#: Programs/menu_prefs.c:847 +#: Programs/menu_prefs.c:856 msgid "Braille Keyboard Enabled" msgstr "Brailletastatur aktiviert" @@ -330,7 +328,7 @@ msgstr "Braille-Parameter" msgid "Braille Presentation" msgstr "Brailledarstellung" -#: Programs/menu_prefs.c:1223 +#: Programs/menu_prefs.c:1232 msgid "Braille Tables" msgstr "Brailletabellen" @@ -342,7 +340,7 @@ msgstr "Braillezeilenspalte" msgid "Braille Window Coordinates" msgstr "Braillezeilenkoordinaten" -#: Programs/menu_prefs.c:752 +#: Programs/menu_prefs.c:756 msgid "Braille Window Overlap" msgstr "Braillezeilenüberlappung" @@ -379,14 +377,13 @@ msgstr "BrlAPI Authorisierungs-/Berechtigungs-Zeichenkette" msgid "BrlAPI host and/or port to connect to" msgstr "BrlAPI Host und/oder Port mit dem verbunden werden soll" -#: Programs/menu_prefs.c:1279 +#: Programs/menu_prefs.c:1288 msgid "Bug Reports" msgstr "Fehlerberichte" -#: Programs/menu_prefs.c:1260 -#, fuzzy +#: Programs/menu_prefs.c:1269 msgid "Build Information" -msgstr "Information" +msgstr "Build Informationen" #: Programs/menu_prefs.c:621 msgid "Capitalization Mode" @@ -400,9 +397,9 @@ msgstr "Großbuchstaben sind unsichtbar für" msgid "Capitals Visible Time" msgstr "Großbuchstaben sind sichtbar für" -#: Programs/menu_prefs.c:1350 +#: Programs/menu_prefs.c:1359 msgid "Category Log Level" -msgstr "" +msgstr "Protokollierungsausführlichkeit für Kategorien" #. Chromatic Percussion #: Programs/midi.c:53 @@ -437,15 +434,15 @@ msgstr "Clave" msgid "Close" msgstr "Schließen" -#: Programs/menu_prefs.c:1120 +#: Programs/menu_prefs.c:1129 msgid "Colon" msgstr "Doppelpunkt" -#: Programs/menu_prefs.c:1284 +#: Programs/menu_prefs.c:1293 msgid "Configuration Directory" msgstr "Konfigurationsverzeichnis" -#: Programs/config.c:2620 Programs/menu_prefs.c:1289 +#: Programs/config.c:2621 Programs/menu_prefs.c:1298 msgid "Configuration File" msgstr "Konfigurationsdatei" @@ -453,10 +450,9 @@ msgstr "Konfigurationsdatei" msgid "Console Bell" msgstr "Konsolenglöckchen" -#: Programs/menu_prefs.c:884 -#, fuzzy +#: Programs/menu_prefs.c:893 msgid "Console Bell Alert" -msgstr "Konsolen-Tongenerator" +msgstr "Konsolen-Tongenerator Hinweis" #: Programs/midi.c:92 msgid "Contrabass" @@ -466,7 +462,7 @@ msgstr "Kontrabass" msgid "Contracted Braille" msgstr "Braille-Kurzschrift" -#: Programs/config.c:2673 Programs/menu_prefs.c:1241 +#: Programs/config.c:2674 Programs/menu_prefs.c:1250 msgid "Contraction Table" msgstr "Kurzschrifttabelle" @@ -478,44 +474,43 @@ msgstr "Kurzschrifttabelle." msgid "Contraction verification table." msgstr "Kurzschriftverifikationstabelle" -#: Programs/menu_prefs.c:1328 +#: Programs/menu_prefs.c:1337 msgid "Critical" msgstr "Kritisch" -#: Programs/log.c:97 +#: Programs/log.c:98 msgid "Cursor Routing" msgstr "Cursorrouting" -#: Programs/log.c:91 +#: Programs/log.c:92 msgid "Cursor Tracking" msgstr "Cursorverfolgung" -#: Programs/menu_prefs.c:766 -#, fuzzy +#: Programs/menu_prefs.c:770 msgid "Cursor Tracking Delay" -msgstr "Cursorverfolgung" +msgstr "Zeitverzögerung für Cursorverfolgung" -#: Programs/menu_prefs.c:1158 +#: Programs/menu_prefs.c:1167 msgid "Dash" msgstr "Bindestrich" -#: Programs/menu_prefs.c:1151 +#: Programs/menu_prefs.c:1160 msgid "Date Format" msgstr "Format des Datums" -#: Programs/menu_prefs.c:1140 +#: Programs/menu_prefs.c:1149 msgid "Date Position" msgstr "Position des Datums" -#: Programs/menu_prefs.c:1163 +#: Programs/menu_prefs.c:1172 msgid "Date Separator" msgstr "Datum Trennzeichen" -#: Programs/menu_prefs.c:1148 +#: Programs/menu_prefs.c:1157 msgid "Day Month Year" msgstr "Tag Monat Jahr" -#: Programs/menu_prefs.c:1333 +#: Programs/menu_prefs.c:1342 msgid "Debug" msgstr "Debug" @@ -545,17 +540,17 @@ msgstr "Schreibe keinen Text auf die Braillezeile" #: Programs/brltty-trtxt.c:83 msgid "Don't fall back to the Unicode base character." -msgstr "" +msgstr "Nicht auf das Unicode Basiszeichen zurückfallen." #: Programs/alert.c:52 msgid "Done" msgstr "Fertig" -#: Programs/menu_prefs.c:1121 Programs/menu_prefs.c:1160 +#: Programs/menu_prefs.c:1130 Programs/menu_prefs.c:1169 msgid "Dot" msgstr "Punkt" -#: Programs/menu_prefs.c:854 +#: Programs/menu_prefs.c:863 msgid "Dots via Unicode Braille" msgstr "Punkte via Unicode Braille" @@ -564,7 +559,7 @@ msgstr "Punkte via Unicode Braille" msgid "Drawbar Organ" msgstr "Orgel mit Zugstange" -#: Programs/config.c:2626 Programs/menu_prefs.c:1309 +#: Programs/config.c:2627 Programs/menu_prefs.c:1318 msgid "Drivers Directory" msgstr "Treiber-Verzeichnis" @@ -572,10 +567,10 @@ msgstr "Treiber-Verzeichnis" msgid "Dulcimer" msgstr "Dulcimer" -#: Programs/menu_prefs.c:746 +#: Programs/menu_prefs.c:750 #, fuzzy msgid "Eager Sliding Braille Window" -msgstr "Erweiterte Braillezeilenverschiebung" +msgstr "Erweiterte Braillezeilenausschnittsüberlappung" #: Programs/brltty-ttb.c:158 msgid "Edit table." @@ -614,7 +609,7 @@ msgstr "Elektrisches Klavier 1" msgid "Electric Piano 2" msgstr "Elektrisches Klavier 2" -#: Programs/menu_prefs.c:1326 +#: Programs/menu_prefs.c:1335 msgid "Emergency" msgstr "Notfall" @@ -622,7 +617,7 @@ msgstr "Notfall" msgid "End" msgstr "Ende" -#: Programs/menu_prefs.c:732 +#: Programs/menu_prefs.c:736 msgid "End of Line" msgstr "Ende der Zeile" @@ -630,7 +625,7 @@ msgstr "Ende der Zeile" msgid "English Horn" msgstr "Englisches Horn" -#: Programs/menu_prefs.c:1026 +#: Programs/menu_prefs.c:1035 msgid "Enqueue" msgstr "Anhängen" @@ -638,7 +633,7 @@ msgstr "Anhängen" msgid "Ensemble" msgstr "Ensemble" -#: Programs/menu_prefs.c:1329 +#: Programs/menu_prefs.c:1338 msgid "Error" msgstr "Fehler" @@ -646,7 +641,7 @@ msgstr "Fehler" msgid "Ethnic Instruments" msgstr "Ethnische Instrumente" -#: Programs/menu_prefs.c:881 +#: Programs/menu_prefs.c:890 msgid "Event Alerts" msgstr "Warnungen bei Ereignissen" @@ -658,11 +653,11 @@ msgstr "Aktuelles Wort ausschreiben" msgid "Explicit preference settings." msgstr "" -#: Programs/menu_prefs.c:907 +#: Programs/menu_prefs.c:916 msgid "FM" msgstr "FM" -#: Programs/menu_prefs.c:945 +#: Programs/menu_prefs.c:954 msgid "FM Volume" msgstr "FM Lautstärke" @@ -739,7 +734,7 @@ msgstr "Eingefroren" msgid "Generic" msgstr "Allgemein" -#: Programs/log.c:61 +#: Programs/log.c:62 msgid "Generic Input" msgstr "allgemeine Eingaben" @@ -780,11 +775,11 @@ msgstr "Helikopter" msgid "Help Screen" msgstr "Hilfe-Schirm" -#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:836 +#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:845 msgid "High" msgstr "Hoch" -#: Programs/menu_prefs.c:778 +#: Programs/menu_prefs.c:787 msgid "Highlight Braille Window Location" msgstr "Hebe Braillezeilen Position hervor" @@ -792,7 +787,7 @@ msgstr "Hebe Braillezeilen Position hervor" msgid "Honkytonk Piano" msgstr "Honky-tonk Klavier" -#: Programs/menu_prefs.c:1025 +#: Programs/menu_prefs.c:1034 msgid "Immediate" msgstr "Sofort" @@ -804,15 +799,15 @@ msgstr "Inkompatible XKB Bibliothek\n" msgid "Incompatible XKB server support\n" msgstr "Inkompatible XKB Serverunterstützung\n" -#: Programs/menu_prefs.c:1332 +#: Programs/menu_prefs.c:1341 msgid "Information" msgstr "Information" -#: Programs/menu_prefs.c:784 +#: Programs/menu_prefs.c:793 msgid "Input Options" msgstr "Eingabeoptionen" -#: Programs/log.c:67 +#: Programs/log.c:68 msgid "Input Packets" msgstr "eingehende Datenpakete" @@ -821,7 +816,7 @@ msgstr "eingehende Datenpakete" msgid "Install the %s service, and then exit." msgstr "Installiere das Service %s und beende dann." -#: Programs/menu_prefs.c:1336 +#: Programs/menu_prefs.c:1345 msgid "Internal Parameters" msgstr "Interne Parameter" @@ -853,15 +848,15 @@ msgstr "Tastenhilfe" msgid "Key Table" msgstr "Tastentabelle" -#: Programs/log.c:85 +#: Programs/log.c:86 msgid "Keyboard Key Events" msgstr "Tastaturereignisse" -#: Programs/menu_prefs.c:891 +#: Programs/menu_prefs.c:900 msgid "Keyboard LED Alerts" msgstr "Tastaturer-LED Warnungen" -#: Programs/config.c:2680 Programs/menu_prefs.c:873 +#: Programs/config.c:2681 Programs/menu_prefs.c:882 msgid "Keyboard Table" msgstr "Tastaturtabelle" @@ -869,7 +864,7 @@ msgstr "Tastaturtabelle" msgid "Koto" msgstr "Koto" -#: Programs/config.c:2810 +#: Programs/config.c:2811 msgid "Language" msgstr "Sprache" @@ -910,7 +905,7 @@ msgstr "Hauptstimme 8 (Bass und Führung)" msgid "Learn Mode" msgstr "Lernmodus" -#: Programs/menu_prefs.c:1175 +#: Programs/menu_prefs.c:1184 msgid "Left" msgstr "Links" @@ -926,12 +921,11 @@ msgstr "Tastentabelle im Hilfe-Schirm Format auflisten." msgid "List key table in reStructuredText format." msgstr "Tastentabelle im reStructuredText-Format auflisten." -#: Programs/menu_prefs.c:1319 -#, fuzzy +#: Programs/menu_prefs.c:1328 msgid "Locale Directory" -msgstr "Tabellenverzeichnis" +msgstr "Lokalisierungsverzeichnis" -#: Programs/menu_prefs.c:1355 +#: Programs/menu_prefs.c:1364 msgid "Log Categories" msgstr "Protokollierungskategorien" @@ -939,10 +933,9 @@ msgstr "Protokollierungskategorien" msgid "Log Level" msgstr "Protokollierungsausführlichkeit" -#: Programs/menu_prefs.c:1416 -#, fuzzy +#: Programs/menu_prefs.c:1425 msgid "Log Messages" -msgstr "Warnmeldungen" +msgstr "Protokollierungsmeldungen" #: Programs/config.c:607 msgid "Log the versions of the core, API, and built-in drivers, and then exit." @@ -957,11 +950,11 @@ msgstr "Protokolliere via Standardfehlerausgabe anstatt System Log." 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:801 +#: Programs/menu_prefs.c:810 msgid "Long Press Time" msgstr "Zeit für einen langen Tastendruck" -#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:834 +#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:843 msgid "Low" msgstr "Niedrig" @@ -973,7 +966,7 @@ msgstr "Unterer linker Punkt" msgid "Lower Right Dot" msgstr "Unterer rechter Punkt" -#: Programs/menu_prefs.c:906 +#: Programs/menu_prefs.c:915 msgid "MIDI" msgstr "MIDI" @@ -981,11 +974,11 @@ msgstr "MIDI" msgid "MIDI (Musical Instrument Digital Interface) device specifier." msgstr "MIDI (Musical Instrument Digital Interface) Geräts-Angabe." -#: Programs/menu_prefs.c:936 +#: Programs/menu_prefs.c:945 msgid "MIDI Instrument" msgstr "MIDI Instrument" -#: Programs/menu_prefs.c:926 +#: Programs/menu_prefs.c:935 msgid "MIDI Volume" msgstr "MIDI Lautstärke" @@ -997,7 +990,7 @@ msgstr "März" msgid "Marimba" msgstr "Marimba" -#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:837 +#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:846 msgid "Maximum" msgstr "Maximal" @@ -1009,7 +1002,7 @@ msgstr "Maximale Länge einer Ausgabezeile." msgid "May" msgstr "Mai" -#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:835 +#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:844 msgid "Medium" msgstr "Mittel" @@ -1025,11 +1018,11 @@ msgstr "Menüoptionen" msgid "Message hold timeout (in 10ms units)." msgstr "Meldungsanzeigedauer (in 10ms Einheiten)." -#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:833 +#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:842 msgid "Minimum" msgstr "Minimal" -#: Programs/menu_prefs.c:1147 +#: Programs/menu_prefs.c:1156 msgid "Month Day Year" msgstr "Monat Tag Jahr" @@ -1037,7 +1030,7 @@ msgstr "Monat Tag Jahr" msgid "Music Box" msgstr "Musikbox" -#: Programs/menu_prefs.c:906 +#: Programs/menu_prefs.c:915 msgid "Musical Instrument Digital Interface" msgstr "Musical Instrument Digital Interface" @@ -1082,18 +1075,18 @@ msgstr "Nein" msgid "No Capitalization" msgstr "Keine Großschreibung" -#: Programs/menu_prefs.c:759 Programs/menu_prefs.c:989 -#: Programs/menu_prefs.c:1002 Programs/menu_prefs.c:1015 -#: Programs/menu_prefs.c:1135 Programs/menu_prefs.c:1174 -#: Programs/menu_prefs.c:1194 +#: Programs/menu_prefs.c:763 Programs/menu_prefs.c:998 +#: Programs/menu_prefs.c:1011 Programs/menu_prefs.c:1024 +#: Programs/menu_prefs.c:1144 Programs/menu_prefs.c:1183 +#: Programs/menu_prefs.c:1203 msgid "None" msgstr "Keine" -#: Programs/menu_prefs.c:863 +#: Programs/menu_prefs.c:872 msgid "Normal" msgstr "Normal" -#: Programs/menu_prefs.c:1331 +#: Programs/menu_prefs.c:1340 msgid "Notice" msgstr "Hinweis" @@ -1113,7 +1106,7 @@ msgstr "Okarina" msgid "October" msgstr "Oktober" -#: Programs/menu_prefs.c:788 +#: Programs/menu_prefs.c:797 msgid "Off" msgstr "Aus" @@ -1133,7 +1126,7 @@ msgstr "Orchesterharfe" msgid "Organ" msgstr "Orgel" -#: Programs/log.c:73 +#: Programs/log.c:74 msgid "Output Packets" msgstr "ausgehende Datenpakete" @@ -1145,7 +1138,7 @@ msgstr "Übersteuerte Gitarre" msgid "PC mode" msgstr "PC-Modus" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:914 msgid "PCM" msgstr "PCM" @@ -1153,7 +1146,7 @@ msgstr "PCM" msgid "PCM (soundcard digital audio) device specifier." msgstr "" -#: Programs/menu_prefs.c:918 +#: Programs/menu_prefs.c:927 msgid "PCM Volume" msgstr "PCM Lautstärke" @@ -1161,11 +1154,11 @@ msgstr "PCM Lautstärke" msgid "PS/2 (set 3) keyboard scan code" msgstr "PS/2 (set 3) Tastatur-Scancode" -#: Programs/menu_prefs.c:1269 +#: Programs/menu_prefs.c:1278 msgid "Package Revision" -msgstr "" +msgstr "Paketrevision" -#: Programs/menu_prefs.c:1264 +#: Programs/menu_prefs.c:1273 msgid "Package Version" msgstr "Paket Version" @@ -1296,11 +1289,11 @@ msgstr "Pfeife" msgid "Pizzicato Strings" msgstr "Pizzikato-Saiten" -#: Drivers/Braille/Baum/braille.c:1076 +#: Drivers/Braille/Baum/braille.c:1104 msgid "Powerdown" -msgstr "" +msgstr "Abschaltung" -#: Programs/config.c:2621 Programs/menu_prefs.c:1299 +#: Programs/config.c:2622 Programs/menu_prefs.c:1308 msgid "Preferences File" msgstr "Einstellungsdatei" @@ -1316,7 +1309,7 @@ msgstr "Zeige eine Benutzungszusammenfassung (alle Optionen) und beende dann." 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/menu_prefs.c:1250 +#: Programs/menu_prefs.c:1259 msgid "Profiles" msgstr "Profile" @@ -1324,7 +1317,7 @@ msgstr "Profile" msgid "Properties of eligible keyboards." msgstr "Eigenschaften von geeigneten Tastaturen." -#: Programs/menu_prefs.c:1006 +#: Programs/menu_prefs.c:1015 msgid "Raise Pitch" msgstr "Erhöhe Tonhöhe" @@ -1367,25 +1360,25 @@ msgstr "Entferne das Service %s und beende dann." #: Programs/brltty-ktb.c:46 msgid "Report problems with the key table." -msgstr "" +msgstr "Probleme mit der Tastatur-Befehlstabelle melden." #: Programs/brltty-ttb.c:186 msgid "Report the characters within the current screen font that aren't defined within the text table." -msgstr "" +msgstr "Jene Zeichen der aktuellen Bildschirmschriftart melden, welche nicht im aktuellen Braillezeichensatz definiert sind." -#: Programs/menu_prefs.c:733 +#: Programs/menu_prefs.c:737 msgid "Rest of Line" msgstr "Rest der Zeile" -#: Programs/menu_prefs.c:1398 +#: Programs/menu_prefs.c:1407 msgid "Restart Braille Driver" msgstr "Brailletreiber neu starten" -#: Programs/menu_prefs.c:1410 +#: Programs/menu_prefs.c:1419 msgid "Restart Screen Driver" msgstr "Bildschirmtreiber neu starten" -#: Programs/menu_prefs.c:1404 +#: Programs/menu_prefs.c:1413 msgid "Restart Speech Driver" msgstr "Sprachausgabentreiber neu starten" @@ -1393,7 +1386,7 @@ msgstr "Sprachausgabentreiber neu starten" msgid "Reverse Cymbal" msgstr "Becken Rückseite" -#: Programs/menu_prefs.c:1176 +#: Programs/menu_prefs.c:1185 msgid "Right" msgstr "Rechts" @@ -1401,7 +1394,7 @@ msgstr "Rechts" msgid "Rock Organ" msgstr "Rock-Orgel" -#: Programs/menu_prefs.c:864 +#: Programs/menu_prefs.c:873 msgid "Rotated" msgstr "gedreht" @@ -1411,15 +1404,15 @@ 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:1005 +#: Programs/menu_prefs.c:1014 msgid "Say Cap" msgstr "Sprich Groß" -#: Programs/menu_prefs.c:1029 +#: Programs/menu_prefs.c:1038 msgid "Say Line Mode" msgstr "Zeilen-Vorlesemodus" -#: Programs/menu_prefs.c:1016 +#: Programs/menu_prefs.c:1025 msgid "Say Space" msgstr "Sprich Leerzeichen" @@ -1432,9 +1425,8 @@ msgid "Screen Cursor Coordinates" msgstr "Bildschirmcursorkoordinaten" #: Programs/menu_prefs.c:670 -#, fuzzy msgid "Screen Cursor Invisible Time" -msgstr "Sprachcursor ist unsichtbar für" +msgstr "Zeitraum der Unishctbarkeit des Bildschirmcursors" #: Programs/menu_prefs.c:446 msgid "Screen Cursor Row" @@ -1445,24 +1437,22 @@ msgid "Screen Cursor Style" msgstr "Bildschirmcursordarstellung" #: Programs/menu_prefs.c:664 -#, fuzzy msgid "Screen Cursor Visible Time" -msgstr "Sprachcursor ist sichtbar für" +msgstr "Zeitraum für die Sichtbarkeit des Bildschirmcursors" #: Programs/menu_prefs.c:447 -#, fuzzy msgid "Screen Cursor and Braille Window Column" -msgstr "Cursor- und Braillezeilenspalte" +msgstr "Spaltenanzeige für Bildschirmcursor und Braillezeilenausschnitt" #: Programs/menu_prefs.c:448 msgid "Screen Cursor and Braille Window Row" -msgstr "Bildschirmcursor- und Braillezeilenszeile" +msgstr "Zeilenanzeige für Bildschirmcursor und Braillezeilenausschnitt" -#: Programs/config.c:2112 +#: Programs/config.c:2113 msgid "Screen Driver" msgstr "Bildschirmtreiber" -#: Programs/log.c:157 +#: Programs/log.c:158 msgid "Screen Driver Events" msgstr "Bildschirmtreiberereignisse" @@ -1470,14 +1460,14 @@ msgstr "Bildschirmtreiberereignisse" msgid "Screen Number" msgstr "Bildschirmnummer" -#: Programs/config.c:2118 +#: Programs/config.c:2119 msgid "Screen Parameter" msgstr "Bildschirm-Parameter" #: Programs/config.c:527 -#, fuzzy, c-format +#, c-format msgid "Screen driver code (%s, %s, or one of {%s})." -msgstr "Bildschirmtreiber: einer von [%s]" +msgstr "Bildschirmtreiber Kurzbezeichnung (%s, %s, oder eine von {%s})." #: Programs/midi.c:181 msgid "Seashore" @@ -1487,11 +1477,11 @@ msgstr "Brandung" msgid "September" msgstr "September" -#: Programs/log.c:127 +#: Programs/log.c:128 msgid "Serial I/O" msgstr "Serielle E/A" -#: Programs/log.c:121 +#: Programs/log.c:122 msgid "Server Events" msgstr "Server Ereignisse" @@ -1523,11 +1513,11 @@ msgstr "Zeige Attribute" msgid "Show Screen Cursor" msgstr "Zeige Bildschirmcursor" -#: Programs/menu_prefs.c:1129 +#: Programs/menu_prefs.c:1138 msgid "Show Seconds" msgstr "Sekunden anzeigen" -#: Programs/menu_prefs.c:1075 +#: Programs/menu_prefs.c:1084 msgid "Show Speech Cursor" msgstr "Zeige Sprachcursor" @@ -1540,15 +1530,15 @@ msgstr "Zeige Größen von Untermenüs" msgid "Sitar" msgstr "Sitar" -#: Programs/menu_prefs.c:725 +#: Programs/menu_prefs.c:729 msgid "Skip Blank Braille Windows" msgstr "Leere Braillezeileninhalte überspringen" -#: Programs/menu_prefs.c:720 +#: Programs/menu_prefs.c:724 msgid "Skip Identical Lines" msgstr "Identische Zeilen überspringen" -#: Programs/menu_prefs.c:736 +#: Programs/menu_prefs.c:740 #, fuzzy msgid "Skip Which Blank Braille Windows" msgstr "Art der leeren Braillezeileninhalte" @@ -1561,16 +1551,15 @@ msgstr "Geschlagener Bass 1" msgid "Slap Bass 2" msgstr "Geschlagener Bass 2" -#: Programs/menu_prefs.c:1159 +#: Programs/menu_prefs.c:1168 msgid "Slash" msgstr "Schrägstrich" -#: Programs/menu_prefs.c:741 -#, fuzzy +#: Programs/menu_prefs.c:745 msgid "Sliding Braille Window" -msgstr "Braillezeilenverschibung" +msgstr "überlappende Braillezeilenausschnitte" -#: Programs/menu_prefs.c:990 +#: Programs/menu_prefs.c:999 msgid "Some" msgstr "Einige" @@ -1583,103 +1572,101 @@ msgstr "Sopransaxophon" msgid "Sound Effects" msgstr "Soundeffekte" -#: Programs/menu_prefs.c:1195 +#: Programs/menu_prefs.c:1204 msgid "Space" msgstr "Leer" -#: Programs/menu_prefs.c:1069 +#: Programs/menu_prefs.c:1078 msgid "Speak Completed Words" msgstr "Sprich vervollständigte Wörter" -#: Programs/menu_prefs.c:1057 +#: Programs/menu_prefs.c:1066 msgid "Speak Deleted Characters" msgstr "Sprich gelöschte Zeichen" -#: Programs/menu_prefs.c:1051 +#: Programs/menu_prefs.c:1060 msgid "Speak Inserted Characters" msgstr "Sprich eingefügte Zeichen" -#: Programs/menu_prefs.c:1063 +#: Programs/menu_prefs.c:1072 msgid "Speak Replaced Characters" msgstr "Sprich ersetzte Zeichen" -#: Programs/menu_prefs.c:1045 +#: Programs/menu_prefs.c:1054 msgid "Speak Selected Character" msgstr "Sprich hervorgehobenes Zeichen" -#: Programs/menu_prefs.c:1039 +#: Programs/menu_prefs.c:1048 msgid "Speak Selected Line" msgstr "Sprich hervorgehobene Zeile" -#: Programs/menu_prefs.c:1098 +#: Programs/menu_prefs.c:1107 msgid "Speech Cursor Invisible Time" msgstr "Sprachcursor ist unsichtbar für" -#: Programs/menu_prefs.c:1080 +#: Programs/menu_prefs.c:1089 msgid "Speech Cursor Style" msgstr "Sprachcursordarstellung" -#: Programs/menu_prefs.c:1092 +#: Programs/menu_prefs.c:1101 msgid "Speech Cursor Visible Time" msgstr "Sprachcursor ist sichtbar für" -#: Programs/config.c:1880 +#: Programs/config.c:1881 msgid "Speech Driver" msgstr "Sprachausgabentreiber" -#: Programs/log.c:151 +#: Programs/log.c:152 msgid "Speech Driver Events" msgstr "Ereignisse des Sprachausgabentreibers" -#: Programs/log.c:109 +#: Programs/log.c:110 msgid "Speech Events" msgstr "Sprachausgabenereignisse" #. Create the file system object for speech input. -#: Programs/config.c:2720 +#: Programs/config.c:2721 msgid "Speech Input" msgstr "" -#: Programs/menu_prefs.c:964 +#: Programs/menu_prefs.c:973 msgid "Speech Options" msgstr "Sprachausgabenoptionen" -#: Programs/config.c:1883 +#: Programs/config.c:1884 msgid "Speech Parameter" msgstr "Sprachausgaben-Parameter" -#: Programs/menu_prefs.c:981 +#: Programs/menu_prefs.c:990 msgid "Speech Pitch" msgstr "Tonhöhe der Sprache" -#: Programs/menu_prefs.c:994 +#: Programs/menu_prefs.c:1003 msgid "Speech Punctuation" msgstr "Satzzeichenansage" -#: Programs/menu_prefs.c:974 +#: Programs/menu_prefs.c:983 msgid "Speech Rate" msgstr "Sprechgeschwindigkeit" -#: Programs/menu_prefs.c:1009 -#, fuzzy +#: Programs/menu_prefs.c:1018 msgid "Speech Uppercase Indicator" -msgstr "Großbuchstabenanzeige" +msgstr "Großbuchstabenansage" -#: Programs/menu_prefs.c:967 +#: Programs/menu_prefs.c:976 msgid "Speech Volume" msgstr "Sprachlautstärke" -#: Programs/menu_prefs.c:1019 -#, fuzzy +#: Programs/menu_prefs.c:1028 msgid "Speech Whitespace Indicator" -msgstr "Leerzeichenansage" +msgstr "Leerraumansage" #: Programs/config.c:492 -#, fuzzy, c-format +#, c-format msgid "Speech driver code (%s, %s, or one of {%s})." -msgstr "Sprachausgabentreiber: einer von {%s}" +msgstr "Sprachausgabentreiber Kurzbezeichnung (%s, %s, oder eine von {%s})." -#: Programs/menu_prefs.c:1345 +#: Programs/menu_prefs.c:1354 msgid "Standard Error Log Level" msgstr "Protokollierungsausführlichkeit für die Standard-Fehlerausgabe" @@ -1691,11 +1678,11 @@ msgstr "Statuspunkte" msgid "State Letter" msgstr "Statusbuchstabe" -#: Programs/menu_prefs.c:1170 +#: Programs/menu_prefs.c:1179 msgid "Status Cells" msgstr "Statuszellen" -#: Programs/menu_prefs.c:1186 +#: Programs/menu_prefs.c:1195 msgid "Status Count" msgstr "Gesamtanzahl der Statuszellen" @@ -1703,15 +1690,15 @@ msgstr "Gesamtanzahl der Statuszellen" msgid "Status Field" msgstr "Statusfeld" -#: Programs/menu_prefs.c:1179 +#: Programs/menu_prefs.c:1188 msgid "Status Position" msgstr "Position der Statuszellen" -#: Programs/menu_prefs.c:1201 +#: Programs/menu_prefs.c:1210 msgid "Status Separator" msgstr "Status-Trennzeichen" -#: Programs/menu_prefs.c:1197 +#: Programs/menu_prefs.c:1206 msgid "Status Side" msgstr "Statusseitig" @@ -1789,11 +1776,11 @@ msgstr "Synth Saiteninstrumente 1" msgid "SynthStrings 2" msgstr "Synth Saiteninstrumente 2" -#: Programs/menu_prefs.c:1340 +#: Programs/menu_prefs.c:1349 msgid "System Log Level" msgstr "System-Protokollierungsausführlichkeit" -#: Programs/config.c:2627 Programs/menu_prefs.c:1314 +#: Programs/config.c:2628 Programs/menu_prefs.c:1323 msgid "Tables Directory" msgstr "Tabellenverzeichnis" @@ -1817,7 +1804,7 @@ msgstr "Tenorsaxophon" msgid "Text Indicators" msgstr "Indikatoren" -#: Programs/menu_prefs.c:1198 +#: Programs/menu_prefs.c:1207 msgid "Text Side" msgstr "Textseitig" @@ -1825,7 +1812,7 @@ msgstr "Textseitig" msgid "Text Style" msgstr "Textdarstellung" -#: Programs/config.c:2652 Programs/menu_prefs.c:1226 +#: Programs/config.c:2653 Programs/menu_prefs.c:1235 msgid "Text Table" msgstr "Texttabelle" @@ -1837,15 +1824,15 @@ msgstr "Texttabelle." msgid "Time" msgstr "Uhrzeit" -#: Programs/menu_prefs.c:1114 +#: Programs/menu_prefs.c:1123 msgid "Time Format" msgstr "Format der Uhrzeit" -#: Programs/menu_prefs.c:1106 +#: Programs/menu_prefs.c:1115 msgid "Time Presentation" msgstr "Darstellung der Uhrzeit und des Datums" -#: Programs/menu_prefs.c:1124 +#: Programs/menu_prefs.c:1133 msgid "Time Separator" msgstr "Uhrzeit-Trennzeichen" @@ -1858,24 +1845,27 @@ msgstr "Pauken" msgid "Tinkle Bell" msgstr "Glöckchen" -#: Programs/menu_prefs.c:1394 +#: Programs/menu_prefs.c:1403 msgid "Tools" msgstr "Werkzeuge" -#: Programs/menu_prefs.c:826 +#: Programs/menu_prefs.c:835 msgid "Touch Navigation" msgstr "Berührungsbasierte Navigation" -#: Programs/menu_prefs.c:840 +#: Programs/menu_prefs.c:849 msgid "Touch Sensitivity" msgstr "Berührungsempfindlichkeit" -#: Programs/menu_prefs.c:772 -#, fuzzy +#: Programs/menu_prefs.c:781 msgid "Track Screen Pointer" -msgstr "Bildschirm-Parameter" +msgstr "Mauszeigerverfolgung" -#: Programs/menu_prefs.c:853 +#: Programs/menu_prefs.c:775 +msgid "Track Screen Scroll" +msgstr "Bildschirmscrollverfolgung" + +#: Programs/menu_prefs.c:862 msgid "Translated via Text Table" msgstr "Durch Texttabelle übersetzt" @@ -1900,11 +1890,11 @@ msgstr "Tuba" msgid "Tubular Bells" msgstr "Röhrenglocken" -#: Programs/menu_prefs.c:910 +#: Programs/menu_prefs.c:919 msgid "Tune Device" msgstr "Tongeber" -#: Programs/log.c:133 +#: Programs/log.c:134 msgid "USB I/O" msgstr "USB E/A" @@ -1916,11 +1906,11 @@ msgstr "Unterlegung" msgid "Unfrozen" msgstr "Aufgetaut" -#: Programs/config.c:2624 Programs/menu_prefs.c:1294 +#: Programs/config.c:2625 Programs/menu_prefs.c:1303 msgid "Updatable Directory" msgstr "Modifizierbares Verzeichnis" -#: Programs/log.c:103 +#: Programs/log.c:104 msgid "Update Events" msgstr "Update Ereignisse" @@ -1949,11 +1939,11 @@ msgstr "Violine" msgid "Voice Oohs" msgstr "Stimme (Ooh)" -#: Programs/menu_prefs.c:1330 +#: Programs/menu_prefs.c:1339 msgid "Warning" msgstr "Warnung" -#: Programs/menu_prefs.c:1274 +#: Programs/menu_prefs.c:1283 msgid "Web Site" msgstr "Webseite" @@ -1965,11 +1955,15 @@ msgstr "Pfeife" msgid "Woodblock" msgstr "Holzblock" -#: Programs/config.c:2613 +#: Programs/menu_prefs.c:720 +msgid "Word Wrap" +msgstr "Wortumbruch" + +#: Programs/config.c:2614 msgid "Working Directory" msgstr "Arbeitsverzeichnis" -#: Programs/config.c:2625 Programs/menu_prefs.c:1304 +#: Programs/config.c:2626 Programs/menu_prefs.c:1313 msgid "Writable Directory" msgstr "Verzeichnis mit Schreibzugriff" @@ -1993,7 +1987,7 @@ msgstr "XT (set 1) Tastatur-Scancode" msgid "Xylophone" msgstr "Xylophon" -#: Programs/menu_prefs.c:1146 +#: Programs/menu_prefs.c:1155 msgid "Year Month Day" msgstr "Jahr Monat Tag" @@ -2029,24 +2023,21 @@ msgstr "beim Cursor" msgid "backspace key" msgstr "Rücktaste" -#: Drivers/Braille/Baum/braille.c:1067 Drivers/Braille/TSI/braille.c:869 +#: Drivers/Braille/Baum/braille.c:1095 Drivers/Braille/TSI/braille.c:869 msgid "battery low" msgstr "Akku schwach" #: Programs/cmds.auto.h:1038 -#, fuzzy msgid "bind to a specific virtual terminal" -msgstr "wechsle zum vorherigen virtuellen Terminal" +msgstr "an ein bestimmtes virtuellen Terminal anbinden" #: Programs/cmds.auto.h:835 -#, fuzzy msgid "bind to the next virtual terminal" -msgstr "wechsle zum nächsten virtuellen Terminal" +msgstr "an das nächste virtuelle Terminal anbinden" #: Programs/cmds.auto.h:829 -#, fuzzy msgid "bind to the previous virtual terminal" -msgstr "wechsle zum vorherigen virtuellen Terminal" +msgstr "an das vorhergehende virtuelle Terminal anbinden" #. #: Programs/cmd_utils.c:109 @@ -2062,7 +2053,7 @@ msgstr "blinken" msgid "blue" msgstr "Blau" -#: Programs/config.c:2692 +#: Programs/config.c:2693 #, c-format msgid "braille device not specified" msgstr "Braillegerät nicht spezifiziert" @@ -2126,9 +2117,9 @@ msgstr "kann Texttabelle nicht kompilieren" #. * 127.0.0.1 with reconnection attempts. #. #: Programs/xbrlapi.c:187 -#, fuzzy, c-format +#, c-format msgid "cannot connect to braille devices daemon brltty at %s\n" -msgstr "kann auf %s nicht mit BRLTTY verbinden\n" +msgstr "Kann nicht mit Braillegerätedienst brltty via %s verbinden\n" #: Programs/xbrlapi.c:588 #, c-format @@ -2144,7 +2135,7 @@ msgstr "kann Verzeichnis nicht erstellen" msgid "cannot determine program directory" msgstr "kann Programmverzeichnis nicht bestimmen" -#: Programs/config.c:2616 Programs/menu.c:544 +#: Programs/config.c:2617 Programs/menu.c:544 msgid "cannot determine working directory" msgstr "kann Arbeitsverzeichnis nicht bestimmen" @@ -2221,11 +2212,11 @@ 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:888 +#: Programs/core.c:973 msgid "cap" msgstr "Groß" -#: Programs/menu_prefs.c:753 Programs/menu_prefs.c:1187 +#: Programs/menu_prefs.c:757 Programs/menu_prefs.c:1196 msgid "cells" msgstr "Zellen" @@ -2235,7 +2226,7 @@ msgstr "Änderungen verworfen" #: Programs/cmds.auto.h:775 msgid "clear all sticky input modifiers" -msgstr "" +msgstr "alle eingerasteten Steuertasten löschen" #: Programs/cmd_speech.c:456 msgid "column" @@ -2254,7 +2245,7 @@ msgstr "Konfigurationsdirektive mehrfach angegeben" msgid "console not in use" msgstr "Konsole nicht in Verwendung" -#: Programs/menu_prefs.c:904 +#: Programs/menu_prefs.c:913 msgid "console tone generator" msgstr "Konsolen-Tongenerator" @@ -2293,27 +2284,27 @@ msgstr "Zyan" #: Programs/cmds.auto.h:781 msgid "cycle the AltGr (Right Alt) sticky input modifier (next, on, off)" -msgstr "" +msgstr "Einrastfunktion der AltGr (rechte Alt) Taste umschalten (ändern, ein, aus)" #: Programs/cmds.auto.h:562 msgid "cycle the Control sticky input modifier (next, on, off)" -msgstr "" +msgstr "Einrastfunktion der Steuerung-Taste umschalten (ändern, ein, aus)" #: Programs/cmds.auto.h:787 msgid "cycle the GUI (Windows) sticky input modifier (next, on, off)" -msgstr "" +msgstr "Einrastfunktion der GUI (Windows) Taste umschalten (ändern, ein, aus)" #: Programs/cmds.auto.h:568 msgid "cycle the Meta (Left Alt) sticky input modifier (next, on, off)" -msgstr "" +msgstr "Einrastfunktion der Meta (linke Alt) Taste umschalten (ändern, ein, aus)" #: Programs/cmds.auto.h:550 msgid "cycle the Shift sticky input modifier (next, on, off)" -msgstr "" +msgstr "Einrastfunktion der Umschalttaste umschalten (ändern, ein, aus)" #: Programs/cmds.auto.h:556 msgid "cycle the Upper sticky input modifier (next, on, off)" -msgstr "" +msgstr "Einrastfunktion der Feststelltaste umschalten (ändern, ein, aus)" #. L #: Programs/cmd_utils.c:117 @@ -2353,7 +2344,7 @@ msgstr "Verzeichnis" #: Programs/xbrlapi.c:97 msgid "display" -msgstr "" +msgstr "display" #: Programs/cmds.auto.h:4 msgid "do nothing" @@ -2375,7 +2366,7 @@ msgstr "Punkt 8" msgid "dots 7 and 8" msgstr "Punkte 7 und 8" -#: Drivers/Braille/Baum/braille.c:1064 +#: Drivers/Braille/Baum/braille.c:1092 msgid "driver request" msgstr "Treiberanfrage" @@ -2470,14 +2461,12 @@ msgid "go backward one braille window" msgstr "Gehe eine Braillezeilenlänge zurück" #: Programs/cmds.auto.h:202 -#, fuzzy msgid "go backward skipping blank braille windows" -msgstr "Schalte Überspringen leerer Braillezeileninhalte ein/aus" +msgstr "Gehe zurück und überspringe leere Braillezeilenausschnitte" #: Programs/cmds.auto.h:843 -#, fuzzy msgid "go backward to nearest non-blank braille window" -msgstr "Gehe zum nächsten nicht leeren Braillezeileninhalt nach rechts" +msgstr "Gehe zurück zum nähesten befüllten Braillezeilenausschnitt" #: Programs/cmds.auto.h:20 msgid "go down one line" @@ -2524,14 +2513,12 @@ msgid "go forward one braille window" msgstr "Gehe eine Braillezeilenlänge vorwärts" #: Programs/cmds.auto.h:210 -#, fuzzy msgid "go forward skipping blank braille windows" -msgstr "Schalte Überspringen leerer Braillezeileninhalte ein/aus" +msgstr "Gehe vorwärts und überspringe leere Braillezeilenausschnitte" #: Programs/cmds.auto.h:851 -#, fuzzy msgid "go forward to nearest non-blank braille window" -msgstr "Gehe zum nächsten nicht leeren Braillezeileninhalt nach links" +msgstr "Gehe vorwärts zum nähesten befüllten Braillezeilenausschnitt" #: Programs/cmds.auto.h:170 msgid "go left half a braille window" @@ -2696,9 +2683,9 @@ msgstr "Pos1-Taste" #: Programs/config.c:412 msgid "identifier,..." -msgstr "" +msgstr "Bezeichnung,..." -#: Drivers/Braille/Baum/braille.c:1066 +#: Drivers/Braille/Baum/braille.c:1094 msgid "idle timeout" msgstr "Inaktivitätszeitüberschreitung" @@ -2738,11 +2725,11 @@ msgstr "ungültige Escape-Sequenz" msgid "invalid flag setting" msgstr "ungültige Schalter-Einstellung" -#: Programs/config.c:2528 +#: Programs/config.c:2529 msgid "invalid message hold timeout" msgstr "ungültige Meldungsanzeigedauer" -#: Programs/brlapi_server.c:3129 +#: Programs/brlapi_server.c:3143 msgid "invalid thread stack size" msgstr "ungültige Threadstapelgröße" @@ -2807,15 +2794,15 @@ msgstr "Magenta" msgid "missing operand" msgstr "fehlender Operand" -#: Programs/parse.c:367 +#: Programs/parse.c:428 msgid "missing parameter name" msgstr "fehlender Parametername" -#: Programs/parse.c:353 +#: Programs/parse.c:414 msgid "missing parameter qualifier" msgstr "fehlende Parameterkennzeichnung" -#: Programs/parse.c:329 +#: Programs/parse.c:390 msgid "missing parameter value" msgstr "fehlender Parameterwert" @@ -2860,7 +2847,7 @@ msgstr "Seite-Rauf Taste" msgid "percentage" msgstr "prozent" -#: Programs/config.c:2501 +#: Programs/config.c:2502 msgid "pid file not specified" msgstr "PID-Datei nicht spezifiziert" @@ -2876,9 +2863,9 @@ msgstr "Tonhöhe" msgid "place left end of braille window at character" msgstr "Positioniere linken Rand der Braillezeile bei Zeichen" -#: Drivers/Braille/Baum/braille.c:1065 +#: Drivers/Braille/Baum/braille.c:1093 msgid "power switch" -msgstr "" +msgstr "Ein-/Aus-Schalter" #: Programs/spk.c:186 msgid "rate" @@ -2893,17 +2880,17 @@ msgstr "kopiere mit Zeilenumbrüchen bis Zeichen" msgid "red" msgstr "Rot" -#: Programs/config.c:1701 +#: Programs/config.c:1702 #, c-format msgid "reinitializing braille driver" msgstr "reinitialisiere Brailletreiber" -#: Programs/config.c:2249 +#: Programs/config.c:2250 #, c-format msgid "reinitializing screen driver" msgstr "reinitialisiere Bildschirmtreiber" -#: Programs/config.c:2030 +#: Programs/config.c:2031 #, c-format msgid "reinitializing speech driver" msgstr "reinitialisiere Sprachausgabentreiber" @@ -2947,7 +2934,7 @@ msgstr "Speichert den Inhalt der Zwischenablage auf die Festplatte" msgid "save preferences to disk" msgstr "Einstellungen speichern" -#: Programs/config.c:2129 +#: Programs/config.c:2130 msgid "screen driver not loadable" msgstr "Bildschirmtreiber kann nicht geladen werden" @@ -3062,9 +3049,8 @@ msgid "set screen cursor blinking on/off" msgstr "Schalte blinkenden Bildschirmcursor ein/aus" #: Programs/cmds.auto.h:317 -#, fuzzy msgid "set screen cursor style block/underline" -msgstr "wechsle zwischen Cursordarstellung Block/Unterstreichung" +msgstr "Art des Bildschirmcursors umschalten Block/Unterstrich" #: Programs/cmds.auto.h:296 msgid "set screen cursor visibility on/off" @@ -3072,7 +3058,7 @@ msgstr "Schalte die Sichtbarkeit des Bildschirmcursors ein/aus" #: Programs/cmds.auto.h:254 msgid "set screen image frozen/unfrozen" -msgstr "" +msgstr "Standbild ein-/ausschalten" #: Programs/cmds.auto.h:289 msgid "set skipping of blank braille windows on/off" @@ -3083,9 +3069,8 @@ msgid "set skipping of lines with identical content on/off" msgstr "schalte Überspringen von Zeilen mit identischem Inhalt ein/aus" #: Programs/cmds.auto.h:275 -#, fuzzy msgid "set sliding braille window on/off" -msgstr "schalte Braillezeilenverschiebung ein/aus" +msgstr "überlappende Braillezeilenausschnitte ein-/ausschalten" #: Programs/cmds.auto.h:743 msgid "set speech cursor visibility on/off" @@ -3111,15 +3096,15 @@ msgstr "Schalte die Verfolgung des Bildschirmcursors ein/aus" msgid "show current date and time" msgstr "Aktuelles Datum und Uhrzeit anzeigen" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:914 msgid "soundcard digital audio" msgstr "Digital Audio Soundkarte" -#: Programs/menu_prefs.c:907 +#: Programs/menu_prefs.c:916 msgid "soundcard synthesizer" msgstr "Synthesizer der Soundkarte" -#: Programs/cmd.c:277 Programs/core.c:869 +#: Programs/cmd.c:277 Programs/core.c:954 msgid "space" msgstr "leer" @@ -3147,7 +3132,7 @@ msgstr "sprich vom Beginn des Bildschirms bis zur aktuellen Zeile" msgid "speak speech cursor location" msgstr "Sprich Sprachcursorposition" -#: Programs/config.c:1894 +#: Programs/config.c:1895 msgid "speech driver not loadable" msgstr "Sprachausgabentreiber kann nicht geladen werden" @@ -3164,9 +3149,8 @@ msgid "start the braille driver" msgstr "Brailletreiber starten" #: Programs/cmds.auto.h:823 -#, fuzzy msgid "start the screen driver" -msgstr "Bildschirmtreiber neu starten" +msgstr "Bildschirmtreiber starten" #: Programs/cmds.auto.h:811 msgid "start the speech driver" @@ -3181,9 +3165,8 @@ msgid "stop the braille driver" msgstr "Brailletreiber stoppen" #: Programs/cmds.auto.h:817 -#, fuzzy msgid "stop the screen driver" -msgstr "Parameter für den Bildschirmtreiber." +msgstr "Bildschirmtreiber stoppen" #: Programs/cmds.auto.h:805 msgid "stop the speech driver" @@ -3249,7 +3232,7 @@ msgstr "unbekannte Protokollierungsausführlichkeit oder Kategorie" msgid "unknown option" msgstr "unbekannte Option" -#: Programs/parse.c:396 +#: Programs/parse.c:457 msgid "unsupported parameter" msgstr "nicht unterstützter Parameter" @@ -3278,14 +3261,14 @@ msgid "xbrlapi: X Error %d, %s on display %s\n" msgstr "" #: Programs/xbrlapi.c:415 -#, fuzzy, c-format +#, c-format msgid "xbrlapi: bad format for VT number\n" -msgstr "ungültiges Format für VT Nummer\n" +msgstr "xbrlapi: ungültiges Format für VT Nummer\n" #: Programs/xbrlapi.c:418 -#, fuzzy, c-format +#, c-format msgid "xbrlapi: bad type for VT number\n" -msgstr "ungültiger Typ für VT Nummer\n" +msgstr "xbrlapi: ungültiger Typ für VT Nummer\n" #: Programs/xbrlapi.c:397 #, c-format @@ -3313,9 +3296,9 @@ msgid "xbrlapi: didn't grab window %#010lx but got focus\n" msgstr "" #: Programs/xbrlapi.c:406 -#, fuzzy, c-format +#, c-format msgid "xbrlapi: more than one item for VT number\n" -msgstr "ungültiges Format für VT Nummer\n" +msgstr "xbrlapi: mehr als ein Element für VT Nummer\n" #: Programs/xbrlapi.c:391 #, c-format @@ -3323,9 +3306,9 @@ msgid "xbrlapi: no XFree86_VT atom\n" msgstr "" #: Programs/xbrlapi.c:402 -#, fuzzy, c-format +#, c-format msgid "xbrlapi: no items for VT number\n" -msgstr "ungültiger Typ für VT Nummer\n" +msgstr "xbrlapi: keine Elemente für VT Nummer\n" #: Programs/xbrlapi.c:374 #, c-format @@ -3334,9 +3317,9 @@ msgstr "" #. "shouldn't happen" events #: Programs/xbrlapi.c:738 -#, fuzzy, c-format +#, c-format msgid "xbrlapi: unhandled event type: %d\n" -msgstr "unbehandelter Ereignistyp: %d\n" +msgstr "xbrlapi: unbehandelter Ereignistyp: %d\n" #: Programs/xbrlapi.c:717 #, c-format diff --git a/Messages/fr.po b/Messages/fr.po index e58ac919b14b04dacc4d2ae00907d5433e8fe1a6..32e7b5a750342befd5ff77b3de9d1a77dba8d81f 100644 --- a/Messages/fr.po +++ b/Messages/fr.po @@ -1,14 +1,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Messages/zh.po b/Messages/zh.po index 5c2cbf000da8eff750fcb8d3692f8d12b9e26034..cea8c9299fcdba05398e1f1dab187317120a5c39 100644 --- a/Messages/zh.po +++ b/Messages/zh.po @@ -1,14 +1,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/Makefile.in b/Programs/Makefile.in index df05667cb3019bd3d2ddefad447dc0fcf4c0baec..0016035acc4afa1df6a90247a57698eaafd84dc4 100644 --- a/Programs/Makefile.in +++ b/Programs/Makefile.in @@ -2,29 +2,37 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # # This software is maintained by Dave Mielke . ############################################################################### -all: all-brltty brltty-trtxt$X brltty-ttb$X brltty-atb$X brltty-ctb$X all-brltty-ktb brltty-tune$X $(ALL_API_BINDINGS) $(ALL_XBRLAPI) -everything: all all-brltest all-scrtest all-spktest $(ALL_API) +all: all-brltty all-brltty-trtxt all-brltty-ttb all-brltty-atb $(ALL_BRLTTY_CTB) all-brltty-ktb all-brltty-tune $(ALL_XBRLAPI) $(ALL_API_BINDINGS) all-brltty: brltty$X $(BRAILLE_DRIVERS) $(SPEECH_DRIVERS) $(SCREEN_DRIVERS) +all-brltty-trtxt: brltty-trtxt$X +all-brltty-ttb: brltty-ttb$X +all-brltty-atb: brltty-atb$X +all-brltty-ctb: brltty-ctb$X +all-brltty-ktb: brltty-ktb$X $(BRAILLE_DRIVERS) +all-brltty-tune: brltty-tune$X +all-xbrlapi: xbrlapi$X + +everything: all all-brltest all-scrtest all-spktest $(ALL_API) all-brltest: brltest$X $(BRAILLE_DRIVERS) all-spktest: spktest$X $(SPEECH_DRIVERS) all-scrtest: scrtest$X $(SCREEN_DRIVERS) -all-brltty-ktb: brltty-ktb$X $(BRAILLE_DRIVERS) -all-api: apitest$X $(ALL_XBRLAPI) $(ALL_API_BINDINGS) -all-xbrlapi: xbrlapi$X + +all-api: all-apitest +all-apitest: apitest$X ############################################################################### @@ -501,16 +509,25 @@ check-attributes-tables: brltty-atb$X ############################################################################### +ctb_compile.$O: + $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/ctb_compile.c + ctb_translate.$O: $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/ctb_translate.c -ctb_compile.$O: - $(CC) $(LIBCFLAGS) $(ICU_INCLUDES) -c $(SRC_DIR)/ctb_compile.c +ctb_native.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/ctb_native.c + +ctb_external.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/ctb_external.c + +ctb_louis.$O: + $(CC) $(LIBCFLAGS) $(LOUIS_INCLUDES) -c $(SRC_DIR)/ctb_louis.c -BRLTTY_CTB_OBJECTS = brltty-ctb.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) dataarea.$O $(TTB_OBJECTS) ctb_compile.$O ctb_translate.$O +BRLTTY_CTB_OBJECTS = brltty-ctb.$O $(PROGRAM_OBJECTS) $(PREFS_OBJECTS) dataarea.$O $(TTB_OBJECTS) $(CTB_OBJECTS) brltty-ctb$X: $(BRLTTY_CTB_OBJECTS) - $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $(BRLTTY_CTB_OBJECTS) $(LOUIS_LIBS) $(LDLIBS) brltty-ctb.$O: $(CC) $(CFLAGS) -c $(SRC_DIR)/brltty-ctb.c @@ -740,7 +757,7 @@ learn.$O: ############################################################################### BRLTTY_OBJECTS = brltty.$O $(CORE_OBJECTS) -BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(SERVICE_LIBS) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) +BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(SERVICE_LIBS) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LOUIS_LIBS) $(POLKIT_LIBS) $(LDLIBS) brltty$X: $(BRLTTY_OBJECTS) $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) @@ -930,18 +947,20 @@ check-all: check-text-tables check-attributes-tables check-contraction-tables ch ############################################################################### -install:: install-programs install-tables $(INSTALL_DRIVERS) install-core-headers $(INSTALL_MESSAGES) install-manpages install-metainfo $(INSTALL_API) +install:: install-programs install-tables $(INSTALL_DRIVERS) install-core-headers $(INSTALL_MESSAGES) install-manpages $(INSTALL_API) -install-programs: brltty$X brltty-trtxt$X brltty-ttb$X brltty-atb$X brltty-ctb$X brltty-ktb$X brltty-tune$X install-program-directory install-writable-directory +install-programs: brltty$X brltty-trtxt$X brltty-ttb$X brltty-atb$X $(INSTALL_BRLTTY_CTB) brltty-ktb$X brltty-tune$X install-program-directory install-writable-directory $(INSTALL_PROGRAM) brltty$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-trtxt$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-ttb$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-atb$X $(INSTALL_PROGRAM_DIRECTORY) - $(INSTALL_PROGRAM) brltty-ctb$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-ktb$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-tune$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_DATA) $(BLD_TOP)config.sh $(INSTALL_PROGRAM_DIRECTORY)/brltty-config +install-brltty-ctb: brltty-ctb$X install-program-directory + $(INSTALL_PROGRAM) brltty-ctb$X $(INSTALL_PROGRAM_DIRECTORY) + XBRLAPI_X11_AUTOSTART_FILE = 60xbrlapi XBRLAPI_GDM_AUTOSTART_FILE = xbrlapi.desktop @@ -999,10 +1018,6 @@ install-documents: install-document-directory brltty-ktb$X $(BRAILLE_DRIVERS) cd $(BLD_TOP)$(DOC_DIR) && $(MAKE) all $(SRC_TOP)mkdocs -o $(INSTALL_DOCUMENT_DIRECTORY) -s $(SRC_TOP) -b $(BLD_TOP) -d $(DOC_DIR) -t $(TBL_DIR) -METAINFO_FILE = org.a11y.brltty.metainfo.xml -install-metainfo: install-metainfo-directory - $(INSTALL_DATA) $(SRC_TOP)Autostart/AppStream/$(METAINFO_FILE) $(INSTALL_METAINFO_DIRECTORY) - install-api: $(INSTALL_API_LIBRARIES) install-api-headers install-api-manpages install-api-key install-api-policy $(INSTALL_XBRLAPI) $(INSTALL_API_BINDINGS) install-api-libraries: $(API_LIB) $(API_ARC) install-apilib-directory install-apisoc-directory @@ -1044,7 +1059,7 @@ install-api-policy: install-apipol-directory ############################################################################### -uninstall:: uninstall-programs uninstall-tables uninstall-drivers uninstall-messages uninstall-manpages uninstall-documents uninstall-headers uninstall-metainfo uninstall-api-bindings uninstall-api-files +uninstall:: uninstall-programs uninstall-tables uninstall-drivers uninstall-messages uninstall-manpages uninstall-documents uninstall-headers uninstall-api-bindings uninstall-api-files uninstall-programs: -rm -f $(INSTALL_PROGRAM_DIRECTORY)/brltty$X @@ -1081,9 +1096,6 @@ uninstall-headers: -rm -f $(INSTALL_APIHDR_DIRECTORY)/brlapi_*.h -[ ! -d $(INSTALL_INCLUDE_DIRECTORY) ] || rm -f -r $(INSTALL_INCLUDE_DIRECTORY) -uninstall-metainfo: - -rm -f $(INSTALL_METAINFO_DIRECTORY)/$(METAINFO_FILE) - uninstall-api-libraries: -rm -f $(INSTALL_APILIB_DIRECTORY)/$(API_LIB) -rm -f $(INSTALL_APILIB_DIRECTORY)/$(API_LIB).$(API_VERSION) diff --git a/Programs/activity.c b/Programs/activity.c index 51fc841e607e23b3e00599eed782fe7b576000b7..af52ff8856fcb644d59a2565f3cded71724bca4e 100644 --- a/Programs/activity.c +++ b/Programs/activity.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -214,7 +214,7 @@ prepareActivity (ActivityObject *activity) { static int scheduleActivity (ActivityObject *activity) { - if (asyncSetAlarmIn(&activity->startAlarm, 0, handleActivityStartAlarm, activity)) { + if (asyncNewRelativeAlarm(&activity->startAlarm, 0, handleActivityStartAlarm, activity)) { if (asyncResetAlarmEvery(activity->startAlarm, activity->methods->retryInterval)) { setActivityState(activity, ACT_SCHEDULED); return 1; diff --git a/Programs/activity.h b/Programs/activity.h index 1a8c7df2f28e0ff975468ee99076df1142069352..75ff8cbcf3d5ab53d205a388cedb67fe73c58953 100644 --- a/Programs/activity.h +++ b/Programs/activity.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/addresses.c b/Programs/addresses.c index 4d981a52c2dac4a3a695329d809bb13838eb3356..ba91272de011826f89bc041016dc897d573d5e45 100644 --- a/Programs/addresses.c +++ b/Programs/addresses.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/alert.c b/Programs/alert.c index 5b1857849a401cf8498370f3cafa9462f5db913c..360a33f972e0d6a145f4f7bb3eb5e8f28ea09cf2 100644 --- a/Programs/alert.c +++ b/Programs/alert.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -168,6 +168,10 @@ static const AlertEntry alertTable[] = { .message = strtext("Autorelease"), .tune = "c6@50 b- g e- p50 c@100 c c" }, + + [ALERT_SCROLL_UP] = { + .tune = "b6@10 d7" + }, }; static ToneElement *tuneTable[ARRAY_COUNT(alertTable)] = {NULL}; diff --git a/Programs/api.h b/Programs/api.h index 39b9511bed44ded6f7e5d918c31d684dd7725a9a..ec499c6bce69777219993b0c5b6a6ad140cc4278 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/api_control.c b/Programs/api_control.c index 00fd53e655e69b971652ec0f05a47d7964eb3aa7..d9820dea8e473df0ecf0fe8b2177de83ae4fb5ef 100644 --- a/Programs/api_control.c +++ b/Programs/api_control.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/api_control.h b/Programs/api_control.h index 8b1c49afa18da91c9d2d5a72c7c83d5da468f911..67ee2e2366615b1b3f9ea0b2ae6f1051b49cd317 100644 --- a/Programs/api_control.h +++ b/Programs/api_control.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/api_server.h b/Programs/api_server.h index cb5532ffffd3fdfc6cd8e81b036c5e8edc6b01f7..671b6785fec0c506022baccec17440224aa72689 100644 --- a/Programs/api_server.h +++ b/Programs/api_server.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/apitest.c b/Programs/apitest.c index ef84eb6ca3437555a963196e00ad44d6e41f1523..367bb72df0a9d72cc088bdda25ebebd9c13ec0f0 100644 --- a/Programs/apitest.c +++ b/Programs/apitest.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -17,7 +17,7 @@ */ /* apitest provides a small test utility for BRLTTY's API */ - + #include "prologue.h" #include @@ -34,10 +34,13 @@ #include "brlapi.h" static brlapi_connectionSettings_t settings; +static char *opt_host; +static char *opt_auth; static int opt_learnMode; static int opt_showDots; static int opt_showName; +static int opt_showModelIdentifier; static int opt_showSize; static int opt_showKeyCodes; static int opt_suspendMode; @@ -49,6 +52,13 @@ BEGIN_OPTION_TABLE(programOptions) .description = "Show the name of the braille driver." }, + { .letter = 'm', + .word = "model", + .setting.flag = &opt_showModelIdentifier, + .description = "Show the model identifier of the braille device." + }, + + { .letter = 'w', .word = "window", .setting.flag = &opt_showSize, @@ -82,14 +92,14 @@ BEGIN_OPTION_TABLE(programOptions) { .letter = 'b', .word = "brlapi", .argument = "[host][:port]", - .setting.string = &settings.host, + .setting.string = &opt_host, .description = "BrlAPIa host and/or port to connect to." }, { .letter = 'a', .word = "auth", .argument = "file", - .setting.string = &settings.auth, + .setting.string = &opt_auth, .description = "BrlAPI authorization/authentication string." }, END_OPTION_TABLE @@ -116,6 +126,17 @@ static void showDriverName(void) fprintf(stderr, "%s\n", name); } +static void showModelIdentifier(void) +{ + char identifier[30]; + fprintf(stderr, "Getting model identifier: "); + if (brlapi_getModelIdentifier(identifier, sizeof(identifier))<0) { + brlapi_perror("failed"); + exit(PROG_EXIT_FATAL); + } + fprintf(stderr, "%s\n", identifier); +} + #define DOTS_TEXT "dots: " #define DOTS_TEXTLEN (strlen(DOTS_TEXT)) #define DOTS_LEN 8 @@ -266,7 +287,6 @@ int main (int argc, char *argv[]) { ProgramExitStatus exitStatus = PROG_EXIT_SUCCESS; brlapi_fileDescriptor fd; - settings.host = NULL; settings.auth = NULL; { static const OptionsDescriptor descriptor = { @@ -276,6 +296,8 @@ main (int argc, char *argv[]) { PROCESS_OPTIONS(descriptor, argc, argv); } + settings.host = opt_host; + settings.auth = opt_auth; fprintf(stderr, "Connecting to BrlAPI... "); if ((fd=brlapi_openConnection(&settings, &settings)) != (brlapi_fileDescriptor)(-1)) { fprintf(stderr, "done (fd=%"PRIfd")\n", fd); @@ -285,6 +307,10 @@ main (int argc, char *argv[]) { showDriverName(); } + if (opt_showModelIdentifier) { + showModelIdentifier(); + } + if (opt_showSize) { showDisplaySize(); } @@ -306,7 +332,7 @@ main (int argc, char *argv[]) { } brlapi_closeConnection(); - fprintf(stderr, "Disconnected\n"); + fprintf(stderr, "Disconnected\n"); } else { fprintf(stderr, "failed to connect to %s using auth %s",settings.host, settings.auth); brlapi_perror(""); diff --git a/Programs/async_alarm.c b/Programs/async_alarm.c index d16ad6696aaec91ff2fa8ecc8b07cf019c0bb7ec..a556ec3f6a2fcfce75fb24483d0b004f78048e02 100644 --- a/Programs/async_alarm.c +++ b/Programs/async_alarm.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -159,7 +159,7 @@ newAlarmElement (const void *parameters) { } int -asyncSetAlarmTo ( +asyncNewAbsoluteAlarm ( AsyncHandle *handle, const TimeValue *time, AsyncAlarmCallback *callback, @@ -175,17 +175,17 @@ asyncSetAlarmTo ( } int -asyncSetAlarmIn ( +asyncNewRelativeAlarm ( AsyncHandle *handle, - int interval, + int milliseconds, AsyncAlarmCallback *callback, void *data ) { TimeValue time; getMonotonicTime(&time); - adjustTimeValue(&time, interval); - return asyncSetAlarmTo(handle, &time, callback, data); + adjustTimeValue(&time, milliseconds); + return asyncNewAbsoluteAlarm(handle, &time, callback, data); } static Element * @@ -209,22 +209,22 @@ asyncResetAlarmTo (AsyncHandle handle, const TimeValue *time) { } int -asyncResetAlarmIn (AsyncHandle handle, int interval) { +asyncResetAlarmIn (AsyncHandle handle, int milliseconds) { TimeValue time; getMonotonicTime(&time); - adjustTimeValue(&time, interval); + adjustTimeValue(&time, milliseconds); return asyncResetAlarmTo(handle, &time); } int -asyncResetAlarmEvery (AsyncHandle handle, int interval) { +asyncResetAlarmEvery (AsyncHandle handle, int milliseconds) { Element *element = getAlarmElement(handle); if (element) { AlarmEntry *alarm = getElementItem(element); - alarm->interval = interval; + alarm->interval = milliseconds; alarm->reschedule = 1; return 1; } diff --git a/Programs/async_data.c b/Programs/async_data.c index 16ea847795dec489094b01643186738d37975688..a2081819ff8125cb363380c7acd99395bc478d73 100644 --- a/Programs/async_data.c +++ b/Programs/async_data.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_event.c b/Programs/async_event.c index 3137e76e8200c1f6496ab383c203ecbecdbf1999..625e41f88442964e09a8f0cd52212e995f3c64f9 100644 --- a/Programs/async_event.c +++ b/Programs/async_event.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_handle.c b/Programs/async_handle.c index c2fc9e8ea758035c83d75a16953a50e6989721da..cef399da04b29af6927c523e2c24a792b090a5bd 100644 --- a/Programs/async_handle.c +++ b/Programs/async_handle.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_internal.h b/Programs/async_internal.h index a2bac054a6dede994b4e5bcaebdc1b7e2986db9c..bf39443f8d17cb87b5af17ead59f86fc500730c3 100644 --- a/Programs/async_internal.h +++ b/Programs/async_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_io.c b/Programs/async_io.c index 89530275103a14faf6b2ada8e1b674dd9a6a6450..201035828d9125612a28df394c3001bdf1001989 100644 --- a/Programs/async_io.c +++ b/Programs/async_io.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_signal.c b/Programs/async_signal.c index 0602b29cdbc28171e4e8d591ace6b97553d7b2b1..f243436eae458eed02f3c2d4db04cf1840a63dd7 100644 --- a/Programs/async_signal.c +++ b/Programs/async_signal.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_task.c b/Programs/async_task.c index 2d75aa5a6fce0a816f9ca26344a08095b653ddee..4863ec91f8571e3aec5bab18ff611216eccf6135 100644 --- a/Programs/async_task.c +++ b/Programs/async_task.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/async_wait.c b/Programs/async_wait.c index cdbc586bcdb857384a2a76733e08a77f3975d647..823f308b20c3606028f85bde5de53c2905cae6b9 100644 --- a/Programs/async_wait.c +++ b/Programs/async_wait.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/atb_compile.c b/Programs/atb_compile.c index a1e94529aaaf459e8f9c7ec46c630da7fb8983d0..f5efe575bc35200140d220425061aa8268229607 100644 --- a/Programs/atb_compile.c +++ b/Programs/atb_compile.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/atb_internal.h b/Programs/atb_internal.h index a4c5f185b35063faedb4e2fc9451eb53bf7864ac..1809c609223a71b824167d65205cc61a1751544f 100644 --- a/Programs/atb_internal.h +++ b/Programs/atb_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/atb_translate.c b/Programs/atb_translate.c index 0b0f8eaa2fe503548e8e9eae7358bc5d499bc643..36bb7b1f1ed448b67bb49266eae0af937a903e78 100644 --- a/Programs/atb_translate.c +++ b/Programs/atb_translate.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/auth.c b/Programs/auth.c index 83c3519d87ae81347d4d231bc2d59a35b29fb63d..3c4a955b73ebad5d19277283e9d95791f51ac0e7 100644 --- a/Programs/auth.c +++ b/Programs/auth.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep.c b/Programs/beep.c index dd5505d1bb2cc34ff7a3ba8dcbb5ee1a821d12b3..3ef2b3ed878abcb5c20d1a641372b427debaf513 100644 --- a/Programs/beep.c +++ b/Programs/beep.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_linux.c b/Programs/beep_linux.c index b34634ee6516c1a7e1c700efdf36528562d29138..54439ba4040c13ff822de9d6d83059c131cd55c1 100644 --- a/Programs/beep_linux.c +++ b/Programs/beep_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_msdos.c b/Programs/beep_msdos.c index 217b1a6a1cbd36bd76e9f372c52496583283917d..4cd805fbbc7032e81d3ae0ed5e1554ee371e8012 100644 --- a/Programs/beep_msdos.c +++ b/Programs/beep_msdos.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_none.c b/Programs/beep_none.c index adb182129030c54b3bf07056b8c5cf0a471331c7..f3ad5d3df1c332151b5aceed7b73a1273fa6f6fa 100644 --- a/Programs/beep_none.c +++ b/Programs/beep_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_solaris.c b/Programs/beep_solaris.c index 8466f8f3c111a0a924f065c9bc9a9e58989c1bd3..7da64edbf40fbf43a065d1f1016c054d35c8ed6c 100644 --- a/Programs/beep_solaris.c +++ b/Programs/beep_solaris.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_spkr.c b/Programs/beep_spkr.c index e4f5d27d45a9e119f979426eda2ccf6c620299c3..093b8a9aaac2422418094818354611be06ae83b5 100644 --- a/Programs/beep_spkr.c +++ b/Programs/beep_spkr.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_windows.c b/Programs/beep_windows.c index fb585acf584e2c582d14f410da2d97fcc081e7ec..b772a41905926288791560f379347df084fe41e7 100644 --- a/Programs/beep_windows.c +++ b/Programs/beep_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/beep_wskbd.c b/Programs/beep_wskbd.c index 7bf8dc15e7869e72658c0769dddc27f909965fdc..731d30067b0a4e080fed0859a3f1e229b9d29c87 100644 --- a/Programs/beep_wskbd.c +++ b/Programs/beep_wskbd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bell.c b/Programs/bell.c index bd83834f023b2d25b55e5200e76de6e3438c0773..b0916dbbc2c323684d5fc0619f56489895177d60 100644 --- a/Programs/bell.c +++ b/Programs/bell.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bell_linux.c b/Programs/bell_linux.c index 2af2702a052378c474b61fe4fb4bb2d9a7a83e91..c029867292a6944ef00b6a3fad524da272da3dcc 100644 --- a/Programs/bell_linux.c +++ b/Programs/bell_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bell_none.c b/Programs/bell_none.c index 04f6c3e3256bfb88fbb48c4b8a3ec95f94cde440..d2f5e8d9bb980e9a1c13a2bde163789427273b7a 100644 --- a/Programs/bell_none.c +++ b/Programs/bell_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/blink.c b/Programs/blink.c index 52d8dc184a2f4f54d39e97574f5caa8893f6d37e..2a71c5daf03a48906ec014a01ba094f40f5726c4 100644 --- a/Programs/blink.c +++ b/Programs/blink.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -109,7 +109,7 @@ ASYNC_ALARM_CALLBACK(handleBlinkAlarm) { static void setBlinkAlarm (BlinkDescriptor *blink) { - asyncSetAlarmIn(&blink->alarmHandle, getBlinkDuration(blink), handleBlinkAlarm, blink); + asyncNewRelativeAlarm(&blink->alarmHandle, getBlinkDuration(blink), handleBlinkAlarm, blink); } static void diff --git a/Programs/blink.h b/Programs/blink.h index 570b90c4f6a525d3352ae419ed62645dd5344008..01671e4e0bdec6da337b45b6bd18788ca7bc1961 100644 --- a/Programs/blink.h +++ b/Programs/blink.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bluetooth.c b/Programs/bluetooth.c index 805574692b728c9ac6a4a75a0a65419b6bd8ac29..78d942bc2605c859fd666d10bc273ad9c9f1b8f4 100644 --- a/Programs/bluetooth.c +++ b/Programs/bluetooth.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -636,6 +636,6 @@ bthGetDriverCodes (const char *identifier, int timeout) { } int -isBluetoothDevice (const char **identifier) { - return isQualifiedDevice(identifier, "bluetooth"); +isBluetoothDeviceIdentifier (const char **identifier) { + return hasQualifier(identifier, "bluetooth"); } diff --git a/Programs/bluetooth_android.c b/Programs/bluetooth_android.c index 817751f877522d5054fef45baa35423017940c45..755306f1bda056969ef191c2e0114b13337d1218 100644 --- a/Programs/bluetooth_android.c +++ b/Programs/bluetooth_android.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bluetooth_darwin.c b/Programs/bluetooth_darwin.c index 301f1be532ec7ee85f11ffe4d61a3cd4601f729f..8a28ce9a881fcca318c07d93bc522bda201a0965 100644 --- a/Programs/bluetooth_darwin.c +++ b/Programs/bluetooth_darwin.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bluetooth_internal.h b/Programs/bluetooth_internal.h index 72a0554ba46b2052b06037eaa731c4ba08f8605b..125e57815ab29310c8ec0df6c21195038bcf6d02 100644 --- a/Programs/bluetooth_internal.h +++ b/Programs/bluetooth_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bluetooth_linux.c b/Programs/bluetooth_linux.c index f3dcc90f287c9ca6deb860e58079b6d6474764d2..bc56cfef8083b946158a7ee2b8bde8ba5751f786 100644 --- a/Programs/bluetooth_linux.c +++ b/Programs/bluetooth_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bluetooth_names.c b/Programs/bluetooth_names.c index 241564629f80dd8d0495b35ede2e5bdbe4fffe36..bbd59edcc5dd126c0342e680a3c0cae1460160cf 100644 --- a/Programs/bluetooth_names.c +++ b/Programs/bluetooth_names.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -33,6 +33,7 @@ BLUETOOTH_NAME_DRIVERS(BaumSuperVario, "bm"); BLUETOOTH_NAME_DRIVERS(BaumSVario, "bm"); BLUETOOTH_NAME_DRIVERS(BrailleConnect, "bm"); BLUETOOTH_NAME_DRIVERS(BrailleEdge, "hm"); +BLUETOOTH_NAME_DRIVERS(BrailleMe, "ic"); BLUETOOTH_NAME_DRIVERS(BrailleMemoPocket, "mm"); BLUETOOTH_NAME_DRIVERS(BrailleMemoSmart, "mm"); BLUETOOTH_NAME_DRIVERS(BrailleMemo32, "mm"); @@ -46,12 +47,14 @@ BLUETOOTH_NAME_DRIVERS(Braillino, "ht"); BLUETOOTH_NAME_DRIVERS(B2G, "bm"); BLUETOOTH_NAME_DRIVERS(Conny, "bm"); BLUETOOTH_NAME_DRIVERS(EL12, "al", "vo"); +BLUETOOTH_NAME_DRIVERS(Eurobraille, "eu"); BLUETOOTH_NAME_DRIVERS(Focus, "fs"); BLUETOOTH_NAME_DRIVERS(HWGBrailliant, "bm"); BLUETOOTH_NAME_DRIVERS(MB248, "md"); BLUETOOTH_NAME_DRIVERS(OrbitReader, "bm"); BLUETOOTH_NAME_DRIVERS(Pronto, "bm"); BLUETOOTH_NAME_DRIVERS(Refreshabraille, "bm"); +BLUETOOTH_NAME_DRIVERS(SmartBeetle, "hm"); BLUETOOTH_NAME_DRIVERS(SuperVario, "bm"); BLUETOOTH_NAME_DRIVERS(TSM, "sk"); BLUETOOTH_NAME_DRIVERS(VarioConnect, "bm"); @@ -106,6 +109,10 @@ const BluetoothNameEntry bluetoothNameTable[] = { .driverCodes = bluetoothNameDrivers_BrailleEdge }, + { .namePrefix = "BrailleMe", + .driverCodes = bluetoothNameDrivers_BrailleMe + }, + { .namePrefix = "BMpk", .driverCodes = bluetoothNameDrivers_BrailleMemoPocket }, @@ -158,6 +165,10 @@ const BluetoothNameEntry bluetoothNameTable[] = { .driverCodes = bluetoothNameDrivers_EL12 }, + { .namePrefix = "Esys-", + .driverCodes = bluetoothNameDrivers_Eurobraille + }, + { .namePrefix = "Focus", .driverCodes = bluetoothNameDrivers_Focus }, @@ -182,6 +193,10 @@ const BluetoothNameEntry bluetoothNameTable[] = { .driverCodes = bluetoothNameDrivers_Refreshabraille }, + { .namePrefix = "SmartBeetle", + .driverCodes = bluetoothNameDrivers_SmartBeetle + }, + { .namePrefix = "SuperVario", .driverCodes = bluetoothNameDrivers_SuperVario }, diff --git a/Programs/bluetooth_none.c b/Programs/bluetooth_none.c index d6a99d54923d08ddcae92c0da84c1cd2889e9d78..3a38681d560ef9fec65b4d6df1701448c459352b 100644 --- a/Programs/bluetooth_none.c +++ b/Programs/bluetooth_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/bluetooth_windows.c b/Programs/bluetooth_windows.c index d8962c6f2080ad17031e25daf78a998aa439839c..fa853c31e38d1b3d3e89ddbf3ff4e0f2763c542d 100644 --- a/Programs/bluetooth_windows.c +++ b/Programs/bluetooth_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brl.c b/Programs/brl.c index b40d307269212167f6a8e0e0dce9b1f434d30aaf..0319784afa92c4fd5c68e87a84b6f120dcf90d1d 100644 --- a/Programs/brl.c +++ b/Programs/brl.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brl.h b/Programs/brl.h index 54b7cbe58ea6e00ecc927627ec3514e08960f0f6..b49ed6f822ba15e09c36806c20a4bd86d6497c6f 100644 --- a/Programs/brl.h +++ b/Programs/brl.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brl_base.c b/Programs/brl_base.c index 0e38a84a639c2d7a703ec777df2358dee2567743..5aa11643bd6b9d1137b214a47bf13920894e6d02 100644 --- a/Programs/brl_base.c +++ b/Programs/brl_base.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -365,8 +365,8 @@ setBrailleMessageAlarm (BrailleDisplay *brl) { if (brl->acknowledgements.alarm) { asyncResetAlarmIn(brl->acknowledgements.alarm, brl->acknowledgements.missing.timeout); } else { - asyncSetAlarmIn(&brl->acknowledgements.alarm, brl->acknowledgements.missing.timeout, - handleBrailleMessageTimeout, brl); + asyncNewRelativeAlarm(&brl->acknowledgements.alarm, brl->acknowledgements.missing.timeout, + handleBrailleMessageTimeout, brl); } } diff --git a/Programs/brl_cmds.awk b/Programs/brl_cmds.awk index 5020f765f7fc6d10f7fa4fdad4dfeb04053aa6b0..d612d3810d1da324298518c664c49b6bdd889153 100644 --- a/Programs/brl_cmds.awk +++ b/Programs/brl_cmds.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/brl_driver.c b/Programs/brl_driver.c index e223357c648ed74a6a028f7c9c017871b14d7c01..15bd3788c3e9e6cbfe44d2a2d54719b17622135b 100644 --- a/Programs/brl_driver.c +++ b/Programs/brl_driver.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -46,7 +46,6 @@ connectResource (BrailleDisplay *brl, const char *identifier) { static int brl_construct (BrailleDisplay *brl, char **parameters, const char *device) { if (connectResource(brl, "null:")) { - brl->keyBindings = NULL; return 1; } diff --git a/Programs/brl_input.c b/Programs/brl_input.c index cc52309d82af31fc5100f449d6f05bf98287d43b..3a69db581d29e0340031360d2c6f022a19f80009 100644 --- a/Programs/brl_input.c +++ b/Programs/brl_input.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brl_input.h b/Programs/brl_input.h index 9934ed3982111492141621b7e5a68d4f8f58ff13..6e572fc4ba8ed8d5c01ba85873fc86adfee59df5 100644 --- a/Programs/brl_input.h +++ b/Programs/brl_input.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brl_utils.c b/Programs/brl_utils.c index a7206c390371527c1c1d644156a451cfa77995ed..c157f97d61b23002c6026999159ca0a03303e9e5 100644 --- a/Programs/brl_utils.c +++ b/Programs/brl_utils.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brlapi.awk b/Programs/brlapi.awk index 449ba9c65df9eb7719f6acda5a861df6981429b2..64f213424073d758088c460d747121de247f89a5 100644 --- a/Programs/brlapi.awk +++ b/Programs/brlapi.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -55,4 +55,3 @@ BEGIN { apiRangeType(substr($1, 18), $1, apiRangeTypeCount++, "") next } - diff --git a/Programs/brlapi.h.in b/Programs/brlapi.h.in index b49e8c6eba3e13d44a1f5bc945e51459309c24f1..b35956d7a8ce74cbb3350b8dcc3e609d6003166c 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-2017 by + * Copyright (C) 2002-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -116,7 +116,7 @@ size_t BRLAPI_STDCALL brlapi_getHandleSize(void); * @{ */ /** Default port number on which connections to \e BrlAPI can be established */ -#define BRLAPI_SOCKETPORTNUM 4101 +#define BRLAPI_SOCKETPORTNUM 4101 #define BRLAPI_SOCKETPORT "4101" /** Default unix path on which connections to \e BrlAPI can be established */ @@ -137,8 +137,16 @@ size_t BRLAPI_STDCALL brlapi_getHandleSize(void); #ifdef BRLAPI_WIN32 /* No authentication by default on Windows */ #define BRLAPI_DEFAUTH "none" -#else -#define BRLAPI_DEFAUTH "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE +#else /* BRLAPI_WIN32 */ +#define BRLAPI_DEFAUTH_KEYFILE "keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE + +#ifdef USE_POLKIT +#define BRLAPI_DEFAUTH_POLKIT "+polkit" +#else /* USE_POLKIT */ +#define BRLAPI_DEFAUTH_POLKIT "" +#endif /* USE_POLKIT */ + +#define BRLAPI_DEFAUTH BRLAPI_DEFAUTH_KEYFILE BRLAPI_DEFAUTH_POLKIT #endif /* BRLAPI_WIN32 */ #ifdef __MINGW32__ @@ -286,19 +294,36 @@ void BRLAPI_STDCALL brlapi__closeConnection(brlapi_handle_t *handle); /** Return the complete name of the driver used by \e brltty * * This function fills its argument with the whole name of the braille - * terminal if available, terminated with a '\\0'. + * driver if available, terminated with a '\\0'. * - * \param buffer is the buffer given by the application; + * \param buffer is the buffer provided by the application; * \param size is the maximum size for the name buffer. * * \return -1 on error, or a positive value giving the size of the needed - * buffer, if the supplied one is to small (same as snprintf()). + * buffer, if the supplied one is too small (same as snprintf()). */ #ifndef BRLAPI_NO_SINGLE_SESSION int BRLAPI_STDCALL brlapi_getDriverName(char *buffer, size_t size); #endif /* BRLAPI_NO_SINGLE_SESSION */ int BRLAPI_STDCALL brlapi__getDriverName(brlapi_handle_t *handle, char *buffer, size_t size); +/* brlapi_getModelIdentifier */ +/** Return an identifier for the device model used by \e brltty + * + * This function fills its argument with the whole identifier of the braille + * device model if available, terminated with a '\\0'. + * + * \param buffer is the buffer given by the application; + * \param size is the maximum size for the identifier buffer. + * + * \return -1 on error, or a positive value giving the size of the needed + * buffer, if the supplied one is too small (same as snprintf()). +*/ +#ifndef BRLAPI_NO_SINGLE_SESSION +int BRLAPI_STDCALL brlapi_getModelIdentifier(char *buffer, size_t size); +#endif /* BRLAPI_NO_SINGLE_SESSION */ +int BRLAPI_STDCALL brlapi__getModelIdentifier(brlapi_handle_t *handle, char *buffer, size_t size); + /* brlapi_getDisplaySize */ /** Return the size of the braille display */ #ifndef BRLAPI_NO_SINGLE_SESSION @@ -312,7 +337,7 @@ int BRLAPI_STDCALL brlapi__getDisplaySize(brlapi_handle_t *handle, unsigned int * \brief How to take control of ttys for direct braille display / read * * Before being able to write on the braille display, the application must tell - * the server which tty it will handle. + * the server which tty it will handle. * * The application must also specify how braille keys will be delivered to it. * Two ways are possible: key codes and commands: @@ -444,8 +469,8 @@ int BRLAPI_STDCALL brlapi__setFocus(brlapi_handle_t *handle, int tty); * * If the string is too long, it is truncated. If it's too short, * it is padded with spaces. The text is assumed to be in the current - * locale charset, or latin1 if locales have not been initialized. - * To initialize locales, use setlocale(3). + * locale charset set by setlocale(3) if it was called, or the locale charset + * from the locale environment variables if setlocale(3) was not called. * * \param cursor gives the cursor position; if equal to ::BRLAPI_CURSOR_OFF, no cursor is shown at * all; if cursor==::BRLAPI_CURSOR_LEAVE, the cursor is left where it is @@ -812,9 +837,9 @@ typedef struct { * \note The given codes should be raw keycodes (i.e. some driver name was given * to brlapi_enterTtyMode()) */ #ifndef BRLAPI_NO_SINGLE_SESSION -int BRLAPI_STDCALL brlapi_ignoreKeyRanges(brlapi_range_t ranges[], unsigned int count); +int BRLAPI_STDCALL brlapi_ignoreKeyRanges(const brlapi_range_t ranges[], unsigned int count); #endif /* BRLAPI_NO_SINGLE_SESSION */ -int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count); +int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count); /* brlapi_acceptKeyRanges */ /** Accept some key presses from the braille keyboard @@ -828,9 +853,9 @@ int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, brlapi_range * \note The given codes should be raw keycodes (i.e. some driver name was given * to brlapi_enterTtyMode()) */ #ifndef BRLAPI_NO_SINGLE_SESSION -int BRLAPI_STDCALL brlapi_acceptKeyRanges(brlapi_range_t ranges[], unsigned int count); +int BRLAPI_STDCALL brlapi_acceptKeyRanges(const brlapi_range_t ranges[], unsigned int count); #endif /* BRLAPI_NO_SINGLE_SESSION */ -int BRLAPI_STDCALL brlapi__acceptKeyRanges(brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int count); +int BRLAPI_STDCALL brlapi__acceptKeyRanges(brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int count); /** @} */ /** \defgroup brlapi_driverspecific Driver-Specific modes diff --git a/Programs/brlapi_brldefs.awk b/Programs/brlapi_brldefs.awk index 2ebcbad7c0125af4128962d4bba2798c179fb9b4..ef1721cacd73916a3fcd3dfecf89608e0a8b9233 100644 --- a/Programs/brlapi_brldefs.awk +++ b/Programs/brlapi_brldefs.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c index bb227ff90668dd81b5c7e569010b95a95aa88f8b..7457caa02469f3b7e96bbf4797119cf2d67d6e81 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-2017 by + * Copyright (C) 2002-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -76,6 +76,7 @@ #endif /* HAVE_ALLOCA_H */ #ifdef linux +#include #include #include #include @@ -126,9 +127,9 @@ static void* GetProc(const char *library, const char *fun) { } #define CHECKPROC(library, name) \ - (name##Proc && name##Proc != (void*)(-1)) + (name##Proc && name##Proc != (void*)(-1)) #define CHECKGETPROC(library, name) \ - (name##Proc != (void*)(-1) && (name##Proc || (name##Proc = GetProc(library,#name)) != (void*)(-1))) + (name##Proc != (void*)(-1) && (name##Proc || (name##Proc = GetProc(library,#name)) != (void*)(-1))) #define WIN_PROC_STUB(name) typeof(name) (*name##Proc); @@ -144,8 +145,9 @@ static WIN_PROC_STUB(freeaddrinfo); #endif /* __MINGW32__ */ #endif /* WINDOWS */ -/* We need to declare these as weak external references to determine at runtime - * whether libpthread is used or not. We also can't rely on the functions prototypes. +/* We need to declare these as weak external references to determine + * at runtime whether libpthread is used or not. + * We also can't rely on the functions prototypes. */ #if defined(WINDOWS) @@ -224,6 +226,11 @@ struct brlapi_handle_t { /* Connection-specific information */ sem_t *altSem; int state; pthread_mutex_t state_mutex; + +#ifdef LC_GLOBAL_LOCALE + locale_t default_locale; +#endif /* LC_GLOBAL_LOCALE */ + /* key presses buffer, for when key presses are received instead of * acknowledgements for instance * @@ -266,6 +273,11 @@ static void brlapi_initializeHandle(brlapi_handle_t *handle) handle->altSem = NULL; handle->state = 0; pthread_mutex_init(&handle->state_mutex, NULL); + +#ifdef LC_GLOBAL_LOCALE + handle->default_locale = LC_GLOBAL_LOCALE; +#endif /* LC_GLOBAL_LOCALE */ + memset(handle->keybuf, 0, sizeof(handle->keybuf)); handle->keybuf_next = 0; handle->keybuf_nb = 0; @@ -376,7 +388,7 @@ again: } else { if ( #ifndef WINDOWS - !sem_init || !sem_post || !sem_wait || !sem_destroy || + !sem_init || !sem_post || !sem_wait || !sem_destroy || #endif /* WINDOWS */ handle->altSem) { /* This can't happen without threads */ @@ -582,7 +594,7 @@ static int tryHost(brlapi_handle_t *handle, char *hostAndPort) { addr.sin_port = htons(strtol(port, &c, 0)); if (*c) { struct servent *se; - + if (!(se = getservbyname(port,"tcp"))) { brlapi_gaierrno = h_errno; brlapi_errno=BRLAPI_ERROR_GAIERR; @@ -616,7 +628,7 @@ static int tryHost(brlapi_handle_t *handle, char *hostAndPort) { } memcpy(&addr.sin_addr,he->h_addr,he->h_length); } - + sockfd = socket(addr.sin_family, SOCK_STREAM, 0); if (sockfd<0) { brlapi_errfun = "socket"; @@ -780,6 +792,13 @@ void BRLAPI_STDCALL brlapi__closeConnection(brlapi_handle_t *handle) closeFileDescriptor(handle->fileDescriptor); handle->fileDescriptor = INVALID_FILE_DESCRIPTOR; pthread_mutex_unlock(&handle->fileDescriptor_mutex); + +#ifdef LC_GLOBAL_LOCALE + if (handle->default_locale != LC_GLOBAL_LOCALE) { + freelocale(handle->default_locale); + } +#endif /* LC_GLOBAL_LOCALE */ + #ifdef __MINGW32__ WSACleanup(); #endif /* __MINGW32__ */ @@ -955,6 +974,20 @@ int BRLAPI_STDCALL brlapi_getDriverName(char *name, size_t n) return brlapi__getDriverName(&defaultHandle, name, n); } +/* Function : brlapi_getModelIdentifier */ +/* An identifier for the model of the device used by brltty */ +int BRLAPI_STDCALL brlapi__getModelIdentifier(brlapi_handle_t *handle, char *identifier, size_t n) +{ + ssize_t res = brlapi__request(handle, BRLAPI_PACKET_GETMODELID, identifier, n); + if ((res>0) && (res<=n)) identifier[res-1] = '\0'; + return res; +} + +int BRLAPI_STDCALL brlapi_getModelIdentifier(char *identifier, size_t n) +{ + return brlapi__getModelIdentifier(&defaultHandle, identifier, n); +} + /* Function : brlapi_getDisplaySize */ /* Returns the size of the braille display */ int BRLAPI_STDCALL brlapi__getDisplaySize(brlapi_handle_t *handle, unsigned int *x, unsigned int *y) @@ -1035,7 +1068,7 @@ int BRLAPI_STDCALL brlapi__enterTtyMode(brlapi_handle_t *handle, int tty, const /* 0 can be a valid screen WINDOW 0xffffffff can not be a valid WINDOWID (top 3 bits guaranteed to be zero) */ if (tty<0) { brlapi_errno=BRLAPI_ERROR_UNKNOWNTTY; return -1; } - + if (brlapi__enterTtyModeWithPath(handle, &tty, 1, driverName)) return -1; return tty; @@ -1066,7 +1099,7 @@ int BRLAPI_STDCALL brlapi__enterTtyModeWithPath(brlapi_handle_t *handle, int *tt } if (brlapi__getDisplaySize(handle, &handle->brlx, &handle->brly)<0) return -1; - + /* Clear key buffer before taking the tty, just in case... */ pthread_mutex_lock(&handle->read_mutex); handle->keybuf_next = handle->keybuf_nb = 0; @@ -1099,9 +1132,24 @@ int BRLAPI_STDCALL brlapi__enterTtyModeWithPath(brlapi_handle_t *handle, int *tt *p = n; p++; if (n) p = mempcpy(p, driverName, n); - if ((res=brlapi__writePacketWaitForAck(handle,BRLAPI_PACKET_ENTERTTYMODE,&packet,(p-(unsigned char *)&packet))) == 0) + + if ((res=brlapi__writePacketWaitForAck(handle,BRLAPI_PACKET_ENTERTTYMODE,&packet,(p-(unsigned char *)&packet))) == 0) { handle->state |= STCONTROLLINGTTY; + } + pthread_mutex_unlock(&handle->state_mutex); + + /* Determine default charset if application did not call setlocale. */ +#ifdef LC_GLOBAL_LOCALE + const char *locale = setlocale(LC_CTYPE, NULL); + + if (!locale || !strcmp(locale, "C")) { + /* Application did not call setlocale, try to load the current locale. */ + locale_t default_locale = newlocale(LC_CTYPE_MASK, "", 0); + if (default_locale) handle->default_locale = default_locale; + } +#endif /* LC_GLOBAL_LOCALE */ + return res; } @@ -1152,7 +1200,7 @@ int BRLAPI_STDCALL brlapi_setFocus(int tty) return brlapi__setFocus(&defaultHandle, tty); } -static size_t getCharset(void *buffer, int wide) { +static size_t getCharset(brlapi_handle_t *handle, void *buffer, int wide) { char *p = buffer; const char *start = p; const char *locale = setlocale(LC_CTYPE, NULL); @@ -1165,7 +1213,11 @@ static size_t getCharset(void *buffer, int wide) { size_t length = strlen(WCHAR_CHARSET); *p++ = length; p = mempcpy(p, WCHAR_CHARSET, length); - } else if (locale && strcmp(locale, "C")) { + } else if ((locale && strcmp(locale, "C")) +#ifdef LC_GLOBAL_LOCALE + || (handle->default_locale != LC_GLOBAL_LOCALE) +#endif /* LC_GLOBAL_LOCALE */ + ) { /* not default locale, tell charset to server */ #ifdef WINDOWS UINT CP = GetACP(); @@ -1200,7 +1252,20 @@ static int brlapi___writeText(brlapi_handle_t *handle, int cursor, const void *s char *locale; int res; size_t len; + +#ifdef LC_GLOBAL_LOCALE + locale_t old_locale = 0; + + if (handle->default_locale != LC_GLOBAL_LOCALE) { + /* Temporarily load the default locale. */ + old_locale = uselocale(handle->default_locale); + } + + locale = "default locale"; +#else /* LC_GLOBAL_LOCALE */ locale = setlocale(LC_CTYPE,NULL); +#endif /* LC_GLOBAL_LOCALE */ + wa->flags = BRLAPI_WF_REGION; *((uint32_t *) p) = htonl(1); p += sizeof(uint32_t); *((uint32_t *) p) = htonl(dispSize); p += sizeof(uint32_t); @@ -1235,6 +1300,12 @@ static int brlapi___writeText(brlapi_handle_t *handle, int cursor, const void *s brlapi_libcerrno = errno; brlapi_errfun = "mbrlen"; brlapi_errno = BRLAPI_ERROR_LIBCERR; +#ifdef LC_GLOBAL_LOCALE + if (handle->default_locale != LC_GLOBAL_LOCALE) { + /* Restore application locale */ + uselocale(old_locale); + } +#endif /* LC_GLOBAL_LOCALE */ return -1; case 0: goto endcount; @@ -1269,7 +1340,7 @@ endcount: p += sizeof(uint32_t); } - if ((len = getCharset(p , wide))) { + if ((len = getCharset(handle, p , wide))) { wa->flags |= BRLAPI_WF_CHARSET; p += len; } @@ -1278,6 +1349,14 @@ endcount: pthread_mutex_lock(&handle->fileDescriptor_mutex); res = brlapi_writePacket(handle->fileDescriptor,BRLAPI_PACKET_WRITE,&packet,sizeof(wa->flags)+(p-&wa->data)); pthread_mutex_unlock(&handle->fileDescriptor_mutex); + +#ifdef LC_GLOBAL_LOCALE + if (handle->default_locale != LC_GLOBAL_LOCALE) { + /* Restore application locale */ + uselocale(old_locale); + } +#endif /* LC_GLOBAL_LOCALE */ + return res; } @@ -1429,14 +1508,31 @@ int brlapi__write(brlapi_handle_t *handle, const brlapi_writeArguments_t *s) p += sizeof(uint32_t); } else if (s->cursor!=-1) { brlapi_errno = BRLAPI_ERROR_INVALID_PARAMETER; - return -1; + return -1; } + if (s->charset) { if (!*s->charset) { - if ((strLen = getCharset(p, wide))) { +#ifdef LC_GLOBAL_LOCALE + locale_t old_locale = 0; + + if (handle->default_locale != LC_GLOBAL_LOCALE) { + /* Temporarily load the default locale. */ + old_locale = uselocale(handle->default_locale); + } +#endif /* LC_GLOBAL_LOCALE */ + + if ((strLen = getCharset(handle, p, wide))) { wa->flags |= BRLAPI_WF_CHARSET; p += strLen; } + +#ifdef LC_GLOBAL_LOCALE + if (handle->default_locale != LC_GLOBAL_LOCALE) { + /* Restore application locale */ + uselocale(old_locale); + } +#endif /* LC_GLOBAL_LOCALE */ } else { strLen = strlen(s->charset); *p++ = strLen; @@ -1445,10 +1541,12 @@ int brlapi__write(brlapi_handle_t *handle, const brlapi_writeArguments_t *s) brlapi_errno = BRLAPI_ERROR_INVALID_PARAMETER; return -1; } + memcpy(p, s->charset, strLen); p += strLen; } } + send: wa->flags = htonl(wa->flags); pthread_mutex_lock(&handle->fileDescriptor_mutex); @@ -1702,7 +1800,7 @@ done: /* Function : ignore_accept_key_range */ /* Common tasks for ignoring and unignoring key ranges */ /* what = 0 for ignoring !0 for unignoring */ -static int ignore_accept_key_ranges(brlapi_handle_t *handle, int what, brlapi_range_t ranges[], unsigned int n) +static int ignore_accept_key_ranges(brlapi_handle_t *handle, int what, const brlapi_range_t ranges[], unsigned int n) { uint32_t ints[n][4]; unsigned int i, remaining, todo; @@ -1756,12 +1854,12 @@ static int ignore_accept_keys(brlapi_handle_t *handle, int what, brlapi_rangeTyp } /* Function : brlapi_acceptKeyRanges */ -int BRLAPI_STDCALL brlapi__acceptKeyRanges(brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int n) +int BRLAPI_STDCALL brlapi__acceptKeyRanges(brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int n) { return ignore_accept_key_ranges(handle, !0, ranges, n); } -int BRLAPI_STDCALL brlapi_acceptKeyRanges(brlapi_range_t ranges[], unsigned int n) +int BRLAPI_STDCALL brlapi_acceptKeyRanges(const brlapi_range_t ranges[], unsigned int n) { return brlapi__acceptKeyRanges(&defaultHandle, ranges, n); } @@ -1778,12 +1876,12 @@ int BRLAPI_STDCALL brlapi_acceptKeys(brlapi_rangeType_t r, const brlapi_keyCode_ } /* Function : brlapi_ignoreKeyRanges */ -int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, brlapi_range_t ranges[], unsigned int n) +int BRLAPI_STDCALL brlapi__ignoreKeyRanges(brlapi_handle_t *handle, const brlapi_range_t ranges[], unsigned int n) { return ignore_accept_key_ranges(handle, 0, ranges, n); } -int BRLAPI_STDCALL brlapi_ignoreKeyRanges(brlapi_range_t ranges[], unsigned int n) +int BRLAPI_STDCALL brlapi_ignoreKeyRanges(const brlapi_range_t ranges[], unsigned int n) { return brlapi__ignoreKeyRanges(&defaultHandle, ranges, n); } diff --git a/Programs/brlapi_common.h b/Programs/brlapi_common.h index 9b271e9ce85b8a64a28d04a93d9525b92967ab8c..091472ae6abdc64c49d13a95e8e3d168a3765285 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-2017 by + * Copyright (C) 2002-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -176,7 +176,7 @@ ssize_t BRLAPI(readPacketHeader)(brlapi_fileDescriptor fd, brlapi_packetType_t * if (res<0) { /* reports EINTR too */ LibcError("read in brlapi_readPacketHeader"); - return -1; + return -1; } else return -2; } *packetType = ntohl(header[1]); @@ -242,7 +242,7 @@ static int BRLAPI(loadAuthKey)(const char *filename, size_t *authlength, void *a LibcError("stat in loadAuthKey"); return -1; } - + if (statbuf.st_size==0) { brlapi_errno = BRLAPI_ERROR_EMPTYKEY; brlapi_errfun = "brlapi_laudAuthKey"; @@ -436,4 +436,3 @@ BRLAPI(getKeyFile)(const char *auth) *delim = 0; return ret; } - diff --git a/Programs/brlapi_constants.awk b/Programs/brlapi_constants.awk index 558e15df2c3d59e60367eb8d1888e3f1a09b9cda..f457bd0f80e2450cb811bcbcd9b30b605e2eae9a 100644 --- a/Programs/brlapi_constants.awk +++ b/Programs/brlapi_constants.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/brlapi_keycodes.h b/Programs/brlapi_keycodes.h index bfddf83b82b74d96d04cf68fe8243b609b29db89..9eeec023aecded5986b4a05f2780035cebba8d8a 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-2017 by + * Copyright (C) 2002-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -44,7 +44,7 @@ extern "C" { * * The third part is itself split into two parts: a command number and a command * value. The relative sizes of these parts vary according to the key type. - * + * * For a braille command, bits 28-16 (BRLAPI_KEY_CMD_BLK_MASK) hold the braille * command number, while bits 15-0 (BRLAPI_KEY_CMD_ARG_MASK) hold the command * value. diff --git a/Programs/brlapi_keyranges.c b/Programs/brlapi_keyranges.c index c7e03c3b89546efb1af6e3bbfa80527d02609f8a..e7bd6441c0c139b7887da79609b0cc9cf5ec5113 100644 --- a/Programs/brlapi_keyranges.c +++ b/Programs/brlapi_keyranges.c @@ -2,20 +2,20 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * * This software is maintained by Dave Mielke . */ - + #include "prologue.h" /* Source file for range list management module */ diff --git a/Programs/brlapi_keyranges.h b/Programs/brlapi_keyranges.h index f7bcba38d841b181cb7bebe4e6711042ba61c7c4..4c432b09b763a36d67d0321a1940ce59dea7a8f4 100644 --- a/Programs/brlapi_keyranges.h +++ b/Programs/brlapi_keyranges.h @@ -2,20 +2,20 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * * This software is maintained by Dave Mielke . */ - + #ifndef BRLAPI_INCLUDED_KEYRANGES #define BRLAPI_INCLUDED_KEYRANGES @@ -33,7 +33,7 @@ typedef uint64_t KeyrangeElem; #define KeyrangeVal(v) ((v) & 0xffffffffull) #define KeyrangeElem(flags,val) (((KeyrangeElem)(flags) << 32) | (val)) - + typedef struct KeyrangeList { uint32_t minFlags, maxFlags; diff --git a/Programs/brlapi_keytab.awk b/Programs/brlapi_keytab.awk index f7ccdda3383737fc77c8758369b0b1147f376c2f..89f06b959765da4bd77b7f74851375bf388aba61 100644 --- a/Programs/brlapi_keytab.awk +++ b/Programs/brlapi_keytab.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/brlapi_protocol.h b/Programs/brlapi_protocol.h index 540f091de736ee2de5509a9206b9f79259bf7fbf..31cf01d536a7e713b6eec3ba93650c06acb34cee 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-2017 by + * Copyright (C) 2002-2018 by * Samuel Thibault * Sébastien Hinderer * @@ -58,6 +58,7 @@ extern "C" { #define BRLAPI_PACKET_VERSION 'v' /**< Version */ #define BRLAPI_PACKET_AUTH 'a' /**< Authorization */ #define BRLAPI_PACKET_GETDRIVERNAME 'n' /**< Ask which driver is used */ +#define BRLAPI_PACKET_GETMODELID 'd' /**< Ask which model is used */ #define BRLAPI_PACKET_GETDISPLAYSIZE 's' /**< Dimensions of brl display */ #define BRLAPI_PACKET_ENTERTTYMODE 't' /**< Asks for a specified tty */ #define BRLAPI_PACKET_SETFOCUS 'F' /**< Set current tty focus */ @@ -245,7 +246,6 @@ ssize_t brlapi_readPacket(brlapi_fileDescriptor fd, brlapi_packetType_t *type, v * - brlapi_leaveRawMode() * - brlapi_sendRaw() * - brlapi_recvRaw() - * - brlapi_getDriverId() * - brlapi_getDriverName() * - brlapi_getDisplaySize() * - brlapi_enterTtyMode() diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c index 9591d33e58d4315c4a24eb10adba52e57399a2ec..5887f7e93611e573a41fb864c4b5f691b0135190 100644 --- a/Programs/brlapi_server.c +++ b/Programs/brlapi_server.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -29,7 +29,7 @@ #endif /* PTHREAD_STACK_MIN */ #define RELEASE "BrlAPI Server: release " BRLAPI_RELEASE -#define COPYRIGHT " Copyright (C) 2002-2017 by Sébastien Hinderer , \ +#define COPYRIGHT " Copyright (C) 2002-2018 by Sébastien Hinderer , \ Samuel Thibault " #include "prologue.h" @@ -155,7 +155,7 @@ static brlapi_error_t brlapiserver_error; #define BRLAPI(fun) brlapiserver_ ## fun #include "brlapi_common.h" - + /** ask for \e brltty commands */ #define BRL_COMMANDS 0 /** ask for raw driver keycodes */ @@ -192,7 +192,7 @@ typedef struct { PacketState state; int readBytes; /* Already read bytes */ unsigned char *p; /* Where read() should load datas */ - int n; /* Value to give so read() */ + int n; /* Value to give so read() */ #ifdef __MINGW32__ OVERLAPPED overl; #endif /* __MINGW32__ */ @@ -538,6 +538,7 @@ typedef int(*PacketHandler)(Connection *, brlapi_packetType_t, brlapi_packet_t * typedef struct { /* packet handlers */ PacketHandler getDriverName; + PacketHandler getModelIdentifier; PacketHandler getDisplaySize; PacketHandler enterTtyMode; PacketHandler setFocus; @@ -545,7 +546,7 @@ typedef struct { /* packet handlers */ PacketHandler ignoreKeyRanges; PacketHandler acceptKeyRanges; PacketHandler write; - PacketHandler enterRawMode; + PacketHandler enterRawMode; PacketHandler leaveRawMode; PacketHandler packet; PacketHandler suspendDriver; @@ -757,7 +758,7 @@ static inline Tty *newTty(Tty *father, int number) tty->next->prevnext = &tty->next; father->subttys = tty; return tty; - + outtty: free(tty); out: @@ -806,6 +807,11 @@ static int handleGetDriverName(Connection *c, brlapi_packetType_t type, brlapi_p return handleGetDriver(c, type, size, braille->definition.name); } +static int handleGetModelIdentifier(Connection *c, brlapi_packetType_t type, brlapi_packet_t *packet, size_t size) +{ + return handleGetDriver(c, type, size, disp->keyBindings); +} + static int handleGetDisplaySize(Connection *c, brlapi_packetType_t type, brlapi_packet_t *packet, size_t size) { CHECKERR(size==0,BRLAPI_ERROR_INVALID_PACKET,"packet should be empty"); @@ -893,7 +899,7 @@ static int handleEnterTtyMode(Connection *c, brlapi_packetType_t type, brlapi_pa unlockMutex(&apiConnectionsMutex); WERR(c->fd,BRLAPI_ERROR_NOMEM, "no memory for new tty"); freeBrailleWindow(&c->brailleWindow); - return 0; + return 0; } logMessage(LOG_CATEGORY(SERVER_EVENTS), "allocated tty %#010lx",(unsigned long)ntohl(*ptty)); } @@ -945,7 +951,7 @@ static int handleSetFocus(Connection *c, brlapi_packetType_t type, brlapi_packet static void doLeaveTty(Connection *c) { Tty *tty = c->tty; - logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd"releasing tty %#010x",c->fd,tty->number); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd" releasing tty %#010x",c->fd,tty->number); c->tty = NULL; lockMutex(&apiConnectionsMutex); __removeConnection(c); @@ -1106,6 +1112,7 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t if (coreCharset) unlockCharset(); lockMutex(&c->brailleWindowMutex); memcpy(c->brailleWindow.text+rbeg-1,textBuf,rsiz*sizeof(wchar_t)); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd" wrote %d characters %d bytes",c->fd,rsiz,textLen); } else #endif /* HAVE_ICONV_H */ { @@ -1115,6 +1122,7 @@ static int handleWrite(Connection *c, brlapi_packetType_t type, brlapi_packet_t /* assume latin1 */ c->brailleWindow.text[rbeg-1+i] = text[i]; } + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd" wrote %d characters %d bytes",c->fd,rsiz,rsiz); } if (!andAttr) memset(c->brailleWindow.andAttr+rbeg-1,0xFF,rsiz); if (!orAttr) memset(c->brailleWindow.orAttr+rbeg-1,0x00,rsiz); @@ -1224,7 +1232,7 @@ static int handleResumeDriver(Connection *c, brlapi_packetType_t type, brlapi_pa } static PacketHandlers packetHandlers = { - handleGetDriverName, handleGetDisplaySize, + handleGetDriverName, handleGetModelIdentifier, handleGetDisplaySize, handleEnterTtyMode, handleSetFocus, handleLeaveTtyMode, handleKeyRanges, handleKeyRanges, handleWrite, handleEnterRawMode, handleLeaveRawMode, handlePacket, @@ -1404,15 +1412,16 @@ static int processRequest(Connection *c, PacketHandlers *handlers) } size = c->packet.header.size; type = c->packet.header.type; - + if (c->auth!=1) return handleUnauthorizedConnection(c, type, packet, size); if (size>BRLAPI_MAXPACKETSIZE) { logMessage(LOG_WARNING, "Discarding too large packet of type %s on fd %"PRIfd,brlapiserver_getPacketTypeName(type), c->fd); - return 0; + return 0; } switch (type) { case BRLAPI_PACKET_GETDRIVERNAME: p = handlers->getDriverName; break; + case BRLAPI_PACKET_GETMODELID: p = handlers->getModelIdentifier; break; case BRLAPI_PACKET_GETDISPLAYSIZE: p = handlers->getDisplaySize; break; case BRLAPI_PACKET_ENTERTTYMODE: p = handlers->enterTtyMode; break; case BRLAPI_PACKET_SETFOCUS: p = handlers->setFocus; break; @@ -1441,7 +1450,7 @@ static int processRequest(Connection *c, PacketHandlers *handlers) * There is one server thread which first launches binding threads and then * enters infinite loop trying to accept connections, read packets, etc. * - * Binding threads loop trying to establish some socket, waiting for + * Binding threads loop trying to establish some socket, waiting for * filesystems to be read/write or network to be configured. * * On windows, WSAEventSelect() is emulated by a standalone thread. @@ -1859,7 +1868,7 @@ static FileDescriptor createLocalSocket(struct socketInfo *info) tmppath[lpath+2+lport+1]=0; lockpath[lpath+2+lport]=0; - while ((lock = open(tmppath, O_WRONLY|O_CREAT|O_EXCL, + while ((lock = open(tmppath, O_WRONLY|O_CREAT|O_EXCL, (permissions & (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)))) == -1) { if (errno == EROFS) { approximateDelay(1000); @@ -2002,7 +2011,7 @@ static void closeSockets(void *arg) { int i; struct socketInfo *info; - + for (i=0;i=0) { - FD_SET(socketInfo[i].fd, &sockset); - - if (socketInfo[i].fd>fdmax) { - fdmax = socketInfo[i].fd; - } - } - } - lockMutex(&apiConnectionsMutex); addTtyFds(&sockset, &fdmax, ¬ty); addTtyFds(&sockset, &fdmax, &ttys); @@ -2357,6 +2356,16 @@ THREAD_FUNCTION(runServer) { struct timeval tv, *timeout; lockMutex(&serverSocketsMutex); + for (i=0;i=0) { + FD_SET(socketInfo[i].fd, &sockset); + + if (socketInfo[i].fd>fdmax) { + fdmax = socketInfo[i].fd; + } + } + } + if (unauthConnections || serverSocketsPending) { memset(&tv, 0, sizeof(tv)); tv.tv_sec = SERVER_SELECT_TIMEOUT; @@ -2476,7 +2485,9 @@ finished: /* to let the user read the screen in case theree is an error */ static int initializeAcceptedKeys(Connection *c, int how) { - if (how != BRL_KEYCODES) { + if (how == BRL_KEYCODES) { + if (c && addKeyrange(0, BRLAPI_KEY_MAX, &c->acceptedKeys) == -1) return -1; + } else { if (c) { typedef struct { int (*action) (brlapi_keyCode_t first, brlapi_keyCode_t last, KeyrangeList **list); @@ -3197,7 +3208,7 @@ int api_start(BrailleDisplay *brl, char **parameters) } return 1; - + noServerThread: asyncDiscardEvent(flushEvent); noFlushEvent: diff --git a/Programs/brldefs.h b/Programs/brldefs.h index a4a5cdd8e24f6968d552ecd02428a9f9cd1e0fce..e2906a282edbd67b1fb6a5656e00a7d4205fc0ab 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-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff --git a/Programs/brltest.c b/Programs/brltest.c index aef4b0b976a3076f6c394f5ce4de6365d5dd91f4..7157da9dbb870b721b9f278d9fbeaa7ad5c2ab9d 100644 --- a/Programs/brltest.c +++ b/Programs/brltest.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty-atb.c b/Programs/brltty-atb.c index c85ea185aac37b80fcbc9e906ca8d2cd47618886..9a1ed99ee0474dfbfac02e0f5ba98d4fcf52b77f 100644 --- a/Programs/brltty-atb.c +++ b/Programs/brltty-atb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty-ctb.c b/Programs/brltty-ctb.c index e804c34fa44e6ebf131390f1df3a3e7829eb7243..b7fc912404c08729e2e0fe233fd946bf589b6c3a 100644 --- a/Programs/brltty-ctb.c +++ b/Programs/brltty-ctb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -154,18 +154,22 @@ putCharacter (unsigned char character, void *data) { } static int -putMappedCharacter (unsigned char cell, void *data) { - fputc(convertDotsToCharacter(textTable, cell), outputStream); +putCellCharacter (wchar_t character, void *data) { + Utf8Buffer utf8; + size_t utfs = convertWcharToUtf8(character, utf8); + + fprintf(outputStream, "%.*s", (int)utfs, utf8); return checkOutputStream(data); } static int -putUnicodeBraille (unsigned char cell, void *data) { - Utf8Buffer utf8; - size_t utfs = convertWcharToUtf8(cell|UNICODE_BRAILLE_ROW, utf8); +putTextCell (unsigned char cell, void *data) { + return putCellCharacter(convertDotsToCharacter(textTable, cell), data); +} - fprintf(outputStream, "%.*s", (int)utfs, utf8); - return checkOutputStream(data); +static int +putBrailleCell (unsigned char cell, void *data) { + return putCellCharacter((UNICODE_BRAILLE_ROW | cell), data); } static int @@ -472,7 +476,7 @@ main (int argc, char *argv[]) { if (*opt_textTable) { char *textTablePath; - putCell = putMappedCharacter; + putCell = putTextCell; if ((textTablePath = makeTextTablePath(opt_tablesDirectory, opt_textTable))) { exitStatus = (textTable = compileTextTable(textTablePath))? PROG_EXIT_SUCCESS: PROG_EXIT_FATAL; @@ -481,7 +485,7 @@ main (int argc, char *argv[]) { exitStatus = PROG_EXIT_FATAL; } } else { - putCell = putUnicodeBraille; + putCell = putBrailleCell; exitStatus = PROG_EXIT_SUCCESS; } diff --git a/Programs/brltty-genkey b/Programs/brltty-genkey index 2401cbc7e01d81a813f75bcd7047bbb213ed4e9a..cb68798e6dbfe509318c12e11d2a02f63175a105 100755 --- a/Programs/brltty-genkey +++ b/Programs/brltty-genkey @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/brltty-ktb b/Programs/brltty-ktb index a51fed583cbe0200eb4f29a37643610181393787..7c31cef62bcc3b45c3ffb6d2087cc18a2892a981 100755 Binary files a/Programs/brltty-ktb and b/Programs/brltty-ktb differ diff --git a/Programs/brltty-ktb.c b/Programs/brltty-ktb.c index dcf96b5797cd052539912bf3796d636461ca937d..3f55b25cd22f6b56ae1fff260fabbe9b05333a5a 100644 --- a/Programs/brltty-ktb.c +++ b/Programs/brltty-ktb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty-trtxt.c b/Programs/brltty-trtxt.c index 13ef9afd5f37737675e8157692a8fa3e66a2c53a..3c817f1e56bc00b83411918c7ed573f6a38b5437 100644 --- a/Programs/brltty-trtxt.c +++ b/Programs/brltty-trtxt.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty-ttb.c b/Programs/brltty-ttb.c index 46c4a5e5196fb99a75ce10c5a1ccd021e7a9ebfb..59e8dd8d7d16229ecafa7eafa965b43f876109fd 100644 --- a/Programs/brltty-ttb.c +++ b/Programs/brltty-ttb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty-tune.c b/Programs/brltty-tune.c index a01c24d5b1878af30ee9ffce0f8aa0c5679c0a83..ca22b3e7dc27f9dadfb0cb608b670da3b94b043d 100644 --- a/Programs/brltty-tune.c +++ b/Programs/brltty-tune.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty.c b/Programs/brltty.c index ccb5c714a41fb7eefec2d2bfa3a5e733bb8d99a0..245aa214bfc3067b6853aae89de3be534ce826b0 100644 --- a/Programs/brltty.c +++ b/Programs/brltty.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty.java b/Programs/brltty.java index b617cfb504c09fa49686b32a5e1a1c3f0923a43a..f9ebcc5bbe37dcf93063e78ed0e2cf26a87fdf32 100644 --- a/Programs/brltty.java +++ b/Programs/brltty.java @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/brltty_jni.c b/Programs/brltty_jni.c index 50910f7f44ecd84c8d79ea30f640d2a675b43b2f..2ff534765483c6a8d85afd1703c241a2c5669043 100644 --- a/Programs/brltty_jni.c +++ b/Programs/brltty_jni.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset.c b/Programs/charset.c index d6a97ed5d338c6559fd70aad631f13c43fcb1d2e..9b9526cd3f19a9c015de79f529658592d6484cd4 100644 --- a/Programs/charset.c +++ b/Programs/charset.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset_grub.c b/Programs/charset_grub.c index 3265581aef1a75485cfeea511d8966cb6fe3cc55..ca596724efc979f378cea5d0c444ce2c3076c9e0 100644 --- a/Programs/charset_grub.c +++ b/Programs/charset_grub.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset_iconv.c b/Programs/charset_iconv.c index b94dc7608cdb5e4a46e3f5c14c1ca622b2d68990..8a5c12109b9fff0740108dd6abf9a9eadc68793b 100644 --- a/Programs/charset_iconv.c +++ b/Programs/charset_iconv.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset_internal.h b/Programs/charset_internal.h index db7d76e3b4abbc2059e2f93b384e85a3a5133ee6..63f6318ee4e8e14db9bde355387245f538dbd659 100644 --- a/Programs/charset_internal.h +++ b/Programs/charset_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset_msdos.c b/Programs/charset_msdos.c index dc19a7f0431031a6479d82560710fc6be0c8267a..897ceb2f1744eee3e9c1b6deed445f307465eec7 100644 --- a/Programs/charset_msdos.c +++ b/Programs/charset_msdos.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset_none.c b/Programs/charset_none.c index 52bbf8210939ff8d9ca2d94d3e23ef5c3059d63d..53f7a64f2cc93fbaf209dfbf1c54d07586ddabac 100644 --- a/Programs/charset_none.c +++ b/Programs/charset_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/charset_windows.c b/Programs/charset_windows.c index 28c37d766e3398f8af556a67135306576cce6828..9464e5516cb8be8fc5559143bd747c74853d4255 100644 --- a/Programs/charset_windows.c +++ b/Programs/charset_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd.c b/Programs/cmd.c index e6b193840466a610a3d8bfce5ae85da0630895f9..3087c58b1452d7ebe747756f5dae6807c0e14d68 100644 --- a/Programs/cmd.c +++ b/Programs/cmd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_brlapi.c b/Programs/cmd_brlapi.c index 9f2a89e2b5feda461e328c23612d8bec2fc2460a..c22c41d6339ee386376296aab98d90284938b32b 100644 --- a/Programs/cmd_brlapi.c +++ b/Programs/cmd_brlapi.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_brlapi.h b/Programs/cmd_brlapi.h index ebe3c6f0b43d9c868f6df966344d6447d9916b96..b733638248f6d1699f79a6492c69bd7be5c71606 100644 --- a/Programs/cmd_brlapi.h +++ b/Programs/cmd_brlapi.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_clipboard.c b/Programs/cmd_clipboard.c index 125c18aec3348fb9053e29ac8a39cfe9b99b2e1e..2e0a0d2732639580d5909086ff4f67b3ae9943e3 100644 --- a/Programs/cmd_clipboard.c +++ b/Programs/cmd_clipboard.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_clipboard.h b/Programs/cmd_clipboard.h index 39f248cd5bf4ae793f902969ff9514abbc82f377..1ca22009e39d3e8fba50f92c371065e23f3f0147 100644 --- a/Programs/cmd_clipboard.h +++ b/Programs/cmd_clipboard.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_custom.c b/Programs/cmd_custom.c index ef6dad0eaee1762d6410fbed76f1f9e1ff817eab..b9329e9fc35a1195139f33ee1c325255f9867d18 100644 --- a/Programs/cmd_custom.c +++ b/Programs/cmd_custom.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_custom.h b/Programs/cmd_custom.h index ea04df2167eff82a29400e70451a0cd3868b6928..fe27e58b63eb930429a59c5ba4474dcc01803e98 100644 --- a/Programs/cmd_custom.h +++ b/Programs/cmd_custom.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_input.c b/Programs/cmd_input.c index 44bd28dac2f7d6d104d443550e387bea227cc09c..5ddc2fa7de0df4b3a8e091b29dc5a28d00a2678e 100644 --- a/Programs/cmd_input.c +++ b/Programs/cmd_input.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -93,9 +93,9 @@ setModifierTimeout (InputCommandData *icd) { return icd->modifiers.timeout? asyncResetAlarmIn(icd->modifiers.timeout, INPUT_STICKY_MODIFIERS_TIMEOUT): - asyncSetAlarmIn(&icd->modifiers.timeout, - INPUT_STICKY_MODIFIERS_TIMEOUT, - handleStickyModifiersTimeout, icd); + asyncNewRelativeAlarm(&icd->modifiers.timeout, + INPUT_STICKY_MODIFIERS_TIMEOUT, + handleStickyModifiersTimeout, icd); } static void diff --git a/Programs/cmd_input.h b/Programs/cmd_input.h index b672aa3407147605bbc72aa83dd89ae1e6041ca1..dbcdd67d6c6c3f78ff5c19433db82ba61da63aa8 100644 --- a/Programs/cmd_input.h +++ b/Programs/cmd_input.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_keycodes.c b/Programs/cmd_keycodes.c index 92ecc44faf7f66c60776e6e367f6051394d6c458..d18a2ae9446e856c93e40dd652537d1d31c28e52 100644 --- a/Programs/cmd_keycodes.c +++ b/Programs/cmd_keycodes.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_keycodes.h b/Programs/cmd_keycodes.h index 407f6b13ef58675704f3f0f10939732e724daf59..d9bf62f978ad415010df725ef11672ab4621d43f 100644 --- a/Programs/cmd_keycodes.h +++ b/Programs/cmd_keycodes.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_learn.c b/Programs/cmd_learn.c index b8ea9f40f6f984e1e436824c0f84736e0882e300..fc83089138073c117d35c5b846363911d9440a41 100644 --- a/Programs/cmd_learn.c +++ b/Programs/cmd_learn.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_learn.h b/Programs/cmd_learn.h index 53de678794e3fde2ab49e7394741f63a691f3a67..ac956e80cc50926d30741c7d32c38f127232b770 100644 --- a/Programs/cmd_learn.h +++ b/Programs/cmd_learn.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_miscellaneous.c b/Programs/cmd_miscellaneous.c index dbbe2a01fab6773f9f971ac7ec049b640ecb5672..442351aeea41d200390ccde80d90d6cb49575ff3 100644 --- a/Programs/cmd_miscellaneous.c +++ b/Programs/cmd_miscellaneous.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_miscellaneous.h b/Programs/cmd_miscellaneous.h index 45889c4c09c2703166145395b09e4f6cf0e9c7dd..7840a66fbf0d2099fc6ec5aa5c9efef820c37e68 100644 --- a/Programs/cmd_miscellaneous.h +++ b/Programs/cmd_miscellaneous.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_navigation.c b/Programs/cmd_navigation.c index bc309f9757c47cf16446091b32fa4b8cee7df8d6..d227fa1e489ddf59b84489b5dfdf331448402c75 100644 --- a/Programs/cmd_navigation.c +++ b/Programs/cmd_navigation.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -161,7 +161,7 @@ static int testIndent (int column, int row, void *data UNUSED) { int count = column+1; ScreenCharacter characters[count]; - readScreen(0, row, count, 1, characters); + readScreenRow(row, count, characters); while (column >= 0) { wchar_t text = characters[column].text; if (text != WC_C(' ')) return 1; @@ -175,7 +175,7 @@ testPrompt (int column, int row, void *data) { const ScreenCharacter *prompt = data; int count = column+1; ScreenCharacter characters[count]; - readScreen(0, row, count, 1, characters); + readScreenRow(row, count, characters); return isSameRow(characters, prompt, count, isSameText); } @@ -357,7 +357,7 @@ handleNavigationCommands (int command, void *data) { while (1) { int isBlankLine; - readScreen(0, line, scr.cols, 1, characters); + readScreenRow(line, scr.cols, characters); isBlankLine = isAllSpaceCharacters(characters, scr.cols); switch (state) { @@ -401,7 +401,7 @@ handleNavigationCommands (int command, void *data) { int line = ses->winy; while (line <= (int)(scr.rows - brl.textRows)) { - readScreen(0, line, scr.cols, 1, characters); + readScreenRow(line, scr.cols, characters); if (isAllSpaceCharacters(characters, scr.cols) == findBlankLine) { if (!findBlankLine) { @@ -432,7 +432,7 @@ handleNavigationCommands (int command, void *data) { { ScreenCharacter characters[scr.cols]; size_t length = 0; - readScreen(0, ses->winy, scr.cols, 1, characters); + readScreenRow(ses->winy, scr.cols, characters); while (length < scr.cols) { if (characters[length].text == WC_C(' ')) break; ++length; @@ -466,10 +466,10 @@ handleNavigationCommands (int command, void *data) { } case BRL_CMD_CHRLT: - if (!moveWindowLeft(1)) alert(ALERT_BOUNCE); + if (!moveBrailleWindowLeft(1)) alert(ALERT_BOUNCE); break; case BRL_CMD_CHRRT: - if (!moveWindowRight(1)) alert(ALERT_BOUNCE); + if (!moveBrailleWindowRight(1)) alert(ALERT_BOUNCE); break; case BRL_CMD_HWINLT: @@ -510,10 +510,9 @@ handleNavigationCommands (int command, void *data) { if (shiftBrailleWindowLeft(fullWindowShift)) { if (skipBlankBrailleWindows) { - int charCount; - if (prefs.skipBlankBrailleWindowsMode == sbwEndOfLine) goto skipEndOfLine; - charCount = MIN(scr.cols, ses->winx+textCount); + int charCount = MIN(scr.cols, ses->winx+textCount); + if (!showScreenCursor() || (scr.posy != ses->winy) || (scr.posx < 0) || @@ -521,7 +520,7 @@ handleNavigationCommands (int command, void *data) { int charIndex; ScreenCharacter characters[charCount]; - readScreen(0, ses->winy, charCount, 1, characters); + readScreenRow(ses->winy, charCount, characters); for (charIndex=0; charIndexwiny == 0) { ses->winx = oldX; - alert(ALERT_BOUNCE); break; } @@ -550,23 +548,18 @@ handleNavigationCommands (int command, void *data) { skipEndOfLine: if (skipBlankBrailleWindows && (prefs.skipBlankBrailleWindowsMode == sbwEndOfLine)) { - int charIndex; ScreenCharacter characters[scr.cols]; + readScreenRow(ses->winy, scr.cols, characters); + int last = scr.cols; - readScreen(0, ses->winy, scr.cols, 1, characters); - - for (charIndex=scr.cols-1; charIndex>0; charIndex-=1) { - wchar_t text = characters[charIndex].text; - - if (text != WC_C(' ')) break; - } - - if (showScreenCursor() && (scr.posy == ses->winy) && SCR_COLUMN_OK(scr.posx)) { - charIndex = MAX(charIndex, scr.posx); + while (last > 0) { + if (!isWordBreak(characters, ses->winy, --last)) break; } - if (charIndex < ses->winx) placeRightEdge(charIndex); + if (ses->winx > last) placeRightEdge(last); } + + if (prefs.wordWrap) setWordWrapStart(ses->winx); } break; @@ -685,7 +678,7 @@ handleNavigationCommands (int command, void *data) { arg = rescaleInteger(arg, BRL_MSK_ARG, scr.rows-1); } if (arg < scr.rows) { - slideWindowVertically(arg); + slideBrailleWindowVertically(arg); oldwiny = -1; } else { alert(ALERT_COMMAND_REJECTED); diff --git a/Programs/cmd_navigation.h b/Programs/cmd_navigation.h index 8ac4a07e1aefeb7d8283d342b30b0c031d4470a3..f7ad91bcc1ff06083efdc02cdfbc55a7d8452b91 100644 --- a/Programs/cmd_navigation.h +++ b/Programs/cmd_navigation.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_preferences.c b/Programs/cmd_preferences.c index b6394f69d930f569f3d9fa5e08ad83e533bce9fc..8a1882f5a9db5b6a5a796476d191eca7116dfc7e 100644 --- a/Programs/cmd_preferences.c +++ b/Programs/cmd_preferences.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_preferences.h b/Programs/cmd_preferences.h index 64f885a357daa88cddadd1983aec165336bdddef..ab0beac3476c4cc2ab6c5a422936b21be299c0d2 100644 --- a/Programs/cmd_preferences.h +++ b/Programs/cmd_preferences.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_queue.c b/Programs/cmd_queue.c index 15c189875377b978759214245514e45202b04d54..2af8749ea75eae849e3a3a0b2c55f03536656b28 100644 --- a/Programs/cmd_queue.c +++ b/Programs/cmd_queue.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -226,7 +226,7 @@ setCommandAlarm (void *data) { Queue *queue = getCommandQueue(0); if (queue && (getQueueSize(queue) > 0)) { - asyncSetAlarmIn(&commandAlarm, 0, handleCommandAlarm, data); + asyncNewRelativeAlarm(&commandAlarm, 0, handleCommandAlarm, data); } } } diff --git a/Programs/cmd_queue.h b/Programs/cmd_queue.h index 155d0941a1a868f80c4005a2c155104066bf6b3f..82ac369310dd2c45ee3033e30a195368ccbf4f5d 100644 --- a/Programs/cmd_queue.h +++ b/Programs/cmd_queue.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_speech.c b/Programs/cmd_speech.c index 68b6a20ea97a35571219a08173690d30636eedf9..0d8ba967c8f3e9909e7b06482366ae2a622b5a62 100644 --- a/Programs/cmd_speech.c +++ b/Programs/cmd_speech.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -65,7 +65,7 @@ speakDone (const ScreenCharacter *line, int column, int count, int spell) { speakCharacters(line, count, spell); placeBrailleWindowHorizontally(ses->spkx); - slideWindowVertically(ses->spky); + slideBrailleWindowVertically(ses->spky); suppressAutospeak(); } @@ -192,7 +192,7 @@ handleSpeechCommands (int command, void *data) { ScreenCharacter characters[scr.cols]; int column; - readScreen(0, ses->spky, scr.cols, 1, characters); + readScreenRow(ses->spky, scr.cols, characters); if ((column = findFirstNonSpaceCharacter(characters, scr.cols)) >= 0) { ses->spkx = column; speakDone(characters, column, 1, 0); @@ -207,7 +207,7 @@ handleSpeechCommands (int command, void *data) { ScreenCharacter characters[scr.cols]; int column; - readScreen(0, ses->spky, scr.cols, 1, characters); + readScreenRow(ses->spky, scr.cols, characters); if ((column = findLastNonSpaceCharacter(characters, scr.cols)) >= 0) { ses->spkx = column; speakDone(characters, column, 1, 0); @@ -255,7 +255,7 @@ handleSpeechCommands (int command, void *data) { int to = from + 1; findWord: - readScreen(0, row, scr.cols, 1, characters); + readScreenRow(row, scr.cols, characters); type = (row == ses->spky)? getScreenCharacterType(&characters[column]): SCT_SPACE; onCurrentWord = type != SCT_SPACE; @@ -375,10 +375,10 @@ handleSpeechCommands (int command, void *data) { ScreenCharacter current[scr.cols]; unsigned int count = 0; - readScreen(0, ses->spky, scr.cols, 1, original); + readScreenRow(ses->spky, scr.cols, original); do { - readScreen(0, ses->spky+=increment, scr.cols, 1, current); + readScreenRow(ses->spky+=increment, scr.cols, current); if (!isSameRow(original, current, scr.cols, isSameText)) break; alertLineSkipped(&count); } while (ses->spky != limit); @@ -397,7 +397,7 @@ handleSpeechCommands (int command, void *data) { int row = 0; while (row < scr.rows) { - readScreen(0, row, scr.cols, 1, characters); + readScreenRow(row, scr.cols, characters); if (!isAllSpaceCharacters(characters, scr.cols)) break; row += 1; } @@ -418,7 +418,7 @@ handleSpeechCommands (int command, void *data) { int row = scr.rows - 1; while (row >= 0) { - readScreen(0, row, scr.cols, 1, characters); + readScreenRow(row, scr.cols, characters); if (!isAllSpaceCharacters(characters, scr.cols)) break; row -= 1; } diff --git a/Programs/cmd_speech.h b/Programs/cmd_speech.h index 31d788057a4a2094241a76dbb603ef37ae5a62cb..d9efb00f3969fae01768208cf9e52ad582c8d42b 100644 --- a/Programs/cmd_speech.h +++ b/Programs/cmd_speech.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_toggle.c b/Programs/cmd_toggle.c index b5d0a1849fb3296950a88fa7e8a0a613ad449e3c..e0e7af261455dd3503fd76e3569dbc931ea551e2 100644 --- a/Programs/cmd_toggle.c +++ b/Programs/cmd_toggle.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -215,11 +215,10 @@ handleToggleCommands (int command, void *data) { break; case BRL_CMD_INFO: - if ((prefs.statusPosition == spNone) || haveStatusCells()) { + if (haveStatusCells() || !(textMaximized || statusCount)) { toggleModeSetting(&infoMode, command); } else { ToggleResult result = toggleModeSetting(&textMaximized, command); - if (result > TOGGLE_SAME) reconfigureBrailleWindow(); } break; diff --git a/Programs/cmd_toggle.h b/Programs/cmd_toggle.h index 889b80ed7af8a456cf516572a38220821b476335..3ebf2d85de79eec534fb632ba0d66610d66df3f8 100644 --- a/Programs/cmd_toggle.h +++ b/Programs/cmd_toggle.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_touch.c b/Programs/cmd_touch.c index eb535ad2a8686fbb023977fc6f3ddab24a819b9e..0efa32316d4c10ecaec1021839aabe29d7aaa0cf 100644 --- a/Programs/cmd_touch.c +++ b/Programs/cmd_touch.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_touch.h b/Programs/cmd_touch.h index 6ad5378e661e0998f1a3813896697da0df565dc7..ff8698708ffe05d0e4793535e96c9d08791e796c 100644 --- a/Programs/cmd_touch.h +++ b/Programs/cmd_touch.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_utils.c b/Programs/cmd_utils.c index 5046c600aae52b12749963a75ae3a191ddf68ccd..c6b77a9eda1036e7402a63f28d39522110de8773 100644 --- a/Programs/cmd_utils.c +++ b/Programs/cmd_utils.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmd_utils.h b/Programs/cmd_utils.h index f50e41c20fff5bef3a4fa24f9e932250a6efd01b..34ab302641ebf28b3b10dde9c44cff45c121a4cc 100644 --- a/Programs/cmd_utils.h +++ b/Programs/cmd_utils.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/cmds.awk b/Programs/cmds.awk index 700134521e9c4fc9cd8ed6239f6ea511d8d3652d..952281526280c1a8275e12e346839985e70e8f1c 100644 --- a/Programs/cmds.awk +++ b/Programs/cmds.awk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/config.c b/Programs/config.c index 875a2a58a3dfda1d32d131e901e29d7480804d8a..54638fecd1afa490989558a18e9bf6466f04abcc 100644 --- a/Programs/config.c +++ b/Programs/config.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -1508,19 +1508,19 @@ activateBrailleDriver (int verify) { { const char *dev = brailleDevice; - if (isSerialDevice(&dev)) { + if (isSerialDeviceIdentifier(&dev)) { static const char *const serialDrivers[] = { "md", "pm", "ts", "ht", "bn", "al", "bm", "pg", "sk", NULL }; autodetectableDrivers = serialDrivers; - } else if (isUsbDevice(&dev)) { + } else if (isUsbDeviceIdentifier(&dev)) { static const char *const usbDrivers[] = { - "al", "bm", "bn", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo", + "al", "bm", "bn", "eu", "fs", "hd", "hm", "ht", "hw", "ic", "mt", "pg", "pm", "sk", "vo", NULL }; autodetectableDrivers = usbDrivers; - } else if (isBluetoothDevice(&dev)) { + } else if (isBluetoothDeviceIdentifier(&dev)) { if (!(autodetectableDrivers = bthGetDriverCodes(dev, BLUETOOTH_DEVICE_NAME_OBTAIN_TIMEOUT))) { static const char *bluetoothDrivers[] = { "np", "ht", "al", "bm", @@ -1584,6 +1584,7 @@ startBrailleDriver (void) { if (activateBrailleDriver(0)) { if (oldPreferencesEnabled) { if (!loadPreferencesFile(oldPreferencesFile)) resetPreferences(); + setPreferenceOverrides(); applyAllPreferences(); } else { applyBraillePreferences(); @@ -1798,8 +1799,8 @@ ASYNC_ALARM_CALLBACK(handleAutospeakDelayAlarm) { static void beginAutospeakDelay (int duration) { - if (asyncSetAlarmIn(&autospeakDelayAlarm, duration, - handleAutospeakDelayAlarm, NULL)) { + if (asyncNewRelativeAlarm(&autospeakDelayAlarm, duration, + handleAutospeakDelayAlarm, NULL)) { spk.canAutospeak = 0; } } @@ -2326,7 +2327,7 @@ tryPidFile (void) { } else if (errno == EEXIST) { return 0; } else { - asyncSetAlarmIn(NULL, PID_FILE_CREATE_RETRY_INTERVAL, retryPidFile, NULL); + asyncNewRelativeAlarm(NULL, PID_FILE_CREATE_RETRY_INTERVAL, retryPidFile, NULL); } return 1; diff --git a/Programs/core.c b/Programs/core.c index 439737654926383b24338023b305361aa0ef2dfd..b2e2ac6855a5485c431b58ce6fedf6d3f5ac17b3 100644 --- a/Programs/core.c +++ b/Programs/core.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -178,7 +178,7 @@ postprocessCommand (void *state, int command, int handled) { describeScreen(&description); if (description.number == scr.number) { - slideWindowVertically(description.posy); + slideBrailleWindowVertically(description.posy); placeBrailleWindowHorizontally(description.posx); } } @@ -555,12 +555,79 @@ getTimeFormattingData (TimeFormattingData *fmt) { fmt->meridian = getMeridianString(&fmt->components.hour); } -void -slideWindowVertically (int y) { - if (y < ses->winy) - ses->winy = y; - else if (y >= (int)(ses->winy + brl.textRows)) - ses->winy = y - (brl.textRows - 1); +int +isWordBreak (const ScreenCharacter *characters, int y, int x) { + if (!iswspace(characters[x].text)) return 0; + return !(showScreenCursor() && (y == scr.posy) && (x == scr.posx)); +} + +int +getWordWrapLength (int row, int from, int count) { + int width = scr.cols; + if (from >= width) return 0; + + int to = from + count; + if (to >= width) return width - from; + + ScreenCharacter characters[width]; + readScreenRow(row, width, characters); + int onWordBreak = iswspace(characters[to].text); + + if (!onWordBreak) { + int index = to; + + while (index > from) { + if (isWordBreak(characters, ses->winy, --index)) { + to = index; + onWordBreak = 1; + break; + } + } + } + + if (onWordBreak) { + while (to < width) { + if (!isWordBreak(characters, ses->winy, to)) break; + to += 1; + } + } + + return to - from; +} + +void +setWordWrapStart (int start) { + if (start < 0) start = 0; + ses->winx = start; + + if (start > 0) { + int end = start + textCount; + if (end > scr.cols) end = scr.cols; + + ScreenCharacter characters[end]; + readScreenRow(ses->winy, end, characters); + + while (end > 0) { + if (!isWordBreak(characters, ses->winy, --end)) { + end += 1; + break; + } + } + + if (!isWordBreak(characters, ses->winy, start-1)) { + while (start < end) { + if (isWordBreak(characters, ses->winy, start)) break; + start += 1; + } + } + + while (start < end) { + if (!isWordBreak(characters, ses->winy, start)) break; + start += 1; + } + + if (start < end) ses->winx = start; + } } void @@ -599,7 +666,7 @@ placeBrailleWindowRight (void) { } int -moveWindowLeft (unsigned int amount) { +moveBrailleWindowLeft (unsigned int amount) { if (ses->winx < 1) return 0; if (amount < 1) return 0; @@ -608,15 +675,13 @@ moveWindowLeft (unsigned int amount) { } int -moveWindowRight (unsigned int amount) { +moveBrailleWindowRight (unsigned int amount) { + if (amount < 1) return 0; int newx = ses->winx + amount; + if (newx >= scr.cols) return 0; - if ((newx > ses->winx) && (newx < scr.cols)) { - ses->winx = newx; - return 1; - } - - return 0; + ses->winx = newx; + return 1; } int @@ -637,6 +702,17 @@ shiftBrailleWindowLeft (unsigned int amount) { } } + if (first > 0) { + ScreenCharacter characters[reference]; + readScreenRow(ses->winy, reference, characters); + + if (!isWordBreak(characters, ses->winy, first-1)) { + while (!isWordBreak(characters, ses->winy, first)) first += 1; + } + + while (isWordBreak(characters, ses->winy, first)) first += 1; + } + if (first == reference) { if (!first) return 0; first -= 1; @@ -647,16 +723,36 @@ shiftBrailleWindowLeft (unsigned int amount) { } #endif /* ENABLE_CONTRACTED_BRAILLE */ - return moveWindowLeft(amount); + if (prefs.wordWrap) { + if (ses->winx < 1) return 0; + setWordWrapStart(ses->winx - amount); + return 1; + } + + return moveBrailleWindowLeft(amount); } int shiftBrailleWindowRight (unsigned int amount) { #ifdef ENABLE_CONTRACTED_BRAILLE - if (isContracting()) amount = getContractedLength(amount); + if (isContracting()) { + amount = getContractedLength(amount); + } else #endif /* ENABLE_CONTRACTED_BRAILLE */ + if (prefs.wordWrap) { + amount = getWordWrapLength(ses->winy, ses->winx, amount); + } - return moveWindowRight(amount); + return moveBrailleWindowRight(amount); +} + +void +slideBrailleWindowVertically (int y) { + if (y < ses->winy) { + ses->winy = y; + } else if (y >= (int)(ses->winy + brl.textRows)) { + ses->winy = y - (brl.textRows - 1); + } } static int @@ -720,8 +816,8 @@ trackScreenCursor (int place) { ses->dcty = ses->trky; int delay = 250 << (prefs.cursorTrackingDelay - 1); - asyncSetAlarmIn(&delayedCursorTrackingAlarm, delay, - handleDelayedCursorTrackingAlarm, NULL); + asyncNewRelativeAlarm(&delayedCursorTrackingAlarm, delay, + handleDelayedCursorTrackingAlarm, NULL); return 1; } @@ -737,7 +833,7 @@ trackScreenCursor (int place) { int length = scr.posx + 1; ScreenCharacter characters[length]; int onspace = 1; - readScreen(0, ses->winy, length, 1, characters); + readScreenRow(ses->winy, length, characters); while (length) { if ((iswspace(characters[--length].text) != 0) != onspace) { if (onspace) { @@ -775,7 +871,7 @@ trackScreenCursor (int place) { ses->winx += (scr.posx - ses->winx) / textCount * textCount; } - slideWindowVertically(scr.posy); + slideBrailleWindowVertically(scr.posy); return 1; } @@ -821,7 +917,7 @@ volatile SpeechSynthesizer spk; void trackSpeech (void) { placeBrailleWindowHorizontally(spk.track.speechLocation % scr.cols); - slideWindowVertically(spk.track.firstLine + (spk.track.speechLocation / scr.cols)); + slideBrailleWindowVertically(spk.track.firstLine + (spk.track.speechLocation / scr.cols)); scheduleUpdate("speech tracked"); } @@ -985,6 +1081,14 @@ isSameAttributes ( return character1->attributes == character2->attributes; } +int +isSameCharacter ( + const ScreenCharacter *character1, + const ScreenCharacter *character2 +) { + return isSameText(character1, character2) && isSameAttributes(character1, character2); +} + int isSameRow ( const ScreenCharacter *characters1, diff --git a/Programs/core.h b/Programs/core.h index 239692e0832eb0c1f0eea5e769983da6cb52a783..84fdbbb60f5990b6820b8c9cafd5e65d96f27fe2 100644 --- a/Programs/core.h +++ b/Programs/core.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -64,6 +64,12 @@ extern int isSameAttributes ( const ScreenCharacter *character2 ); +extern int +isSameCharacter ( + const ScreenCharacter *character1, + const ScreenCharacter *character2 +); + extern int isSameRow ( const ScreenCharacter *characters1, const ScreenCharacter *characters2, @@ -88,17 +94,21 @@ extern char *opt_keyboardTable; extern int opt_releaseDevice; +extern int isWordBreak (const ScreenCharacter *characters, int y, int x); +extern int getWordWrapLength (int row, int from, int count); +extern void setWordWrapStart (int start); + extern void placeRightEdge (int column); extern void placeBrailleWindowRight (void); extern void placeBrailleWindowHorizontally (int x); -extern int moveWindowLeft (unsigned int amount); -extern int moveWindowRight (unsigned int amount); +extern int moveBrailleWindowLeft (unsigned int amount); +extern int moveBrailleWindowRight (unsigned int amount); extern int shiftBrailleWindowLeft (unsigned int amount); extern int shiftBrailleWindowRight (unsigned int amount); -extern void slideWindowVertically (int y); +extern void slideBrailleWindowVertically (int y); extern int showScreenCursor (void); extern int trackScreenCursor (int place); diff --git a/Programs/ctb_compile.c b/Programs/ctb_compile.c index abc6e5ebe2c774c2a969a8c1302cf3ab961ef81d..e7aa34d338ec39b1fa38db6ea934af1e0f9a7ebf 100644 --- a/Programs/ctb_compile.c +++ b/Programs/ctb_compile.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -23,6 +23,7 @@ #include #include "log.h" +#include "parse.h" #include "file.h" #include "ctb.h" #include "ctb_internal.h" @@ -529,38 +530,6 @@ static DATA_OPERANDS_PROCESSOR(processContractionTableOperands) { return processDirectiveOperand(file, &directives, "contraction table directive", data); } -int -startContractionCommand (ContractionTable *table) { - if (!table->data.external.commandStarted) { - const char *command[] = {table->command, NULL}; - HostCommandOptions options; - - initializeHostCommandOptions(&options); - options.asynchronous = 1; - options.standardInput = &table->data.external.standardInput; - options.standardOutput = &table->data.external.standardOutput; - - logMessage(LOG_DEBUG, "starting external contraction table: %s", table->command); - if (runHostCommand(command, &options) != 0) return 0; - logMessage(LOG_DEBUG, "external contraction table started: %s", table->command); - - table->data.external.commandStarted = 1; - } - - return 1; -} - -void -stopContractionCommand (ContractionTable *table) { - if (table->data.external.commandStarted) { - fclose(table->data.external.standardInput); - fclose(table->data.external.standardOutput); - - logMessage(LOG_DEBUG, "external contraction table stopped: %s", table->command); - table->data.external.commandStarted = 0; - } -} - static void initializeCommonFields (ContractionTable *table) { table->characters.array = NULL; @@ -580,37 +549,46 @@ initializeCommonFields (ContractionTable *table) { table->cache.offsets.count = 0; } -ContractionTable * -compileContractionTable (const char *fileName) { - ContractionTable *table = NULL; +static void +destroyCommonFields (ContractionTable *table) { + if (table->characters.array) { + free(table->characters.array); + table->characters.array = NULL; + } - if (testProgramPath(fileName)) { - if ((table = malloc(sizeof(*table)))) { - memset(table, 0, sizeof(*table)); + if (table->cache.input.characters) { + free(table->cache.input.characters); + table->cache.input.characters = NULL; + } - if ((table->command = strdup(fileName))) { - initializeCommonFields(table); - table->data.external.commandStarted = 0; + if (table->cache.output.cells) { + free(table->cache.output.cells); + table->cache.output.cells = NULL; + } - table->data.external.input.buffer = NULL; - table->data.external.input.size = 0; + if (table->cache.offsets.array) { + free(table->cache.offsets.array); + table->cache.offsets.array = NULL; + } +} - if (startContractionCommand(table)) { - return table; - } +static void +destroyContractionTable_native (ContractionTable *table) { + destroyCommonFields(table); - free(table->command); - } else { - logMallocError(); - } + if (table->data.internal.size) { + free(table->data.internal.header.fields); + free(table); + } +} - free(table); - } else { - logMallocError(); - } +static const ContractionTableManagementMethods nativeManagementMethods = { + .destroy = destroyContractionTable_native +}; - return NULL; - } +static ContractionTable * +compileContractionTable_native (const char *fileName) { + ContractionTable *table = NULL; if (setTableDataVariables(CONTRACTION_TABLE_EXTENSION, CONTRACTION_SUBTABLE_EXTENSION)) { ContractionTableData ctd; @@ -641,8 +619,9 @@ compileContractionTable (const char *fileName) { if (processDataFile(fileName, ¶meters)) { if (saveCharacterTable(&ctd)) { if ((table = malloc(sizeof(*table)))) { + table->managementMethods = &nativeManagementMethods; + table->translationMethods = getContractionTableTranslationMethods_native(); initializeCommonFields(table); - table->command = NULL; table->data.internal.header.fields = getContractionTableHeader(&ctd); table->data.internal.size = getDataSize(ctd.area); @@ -666,39 +645,182 @@ compileContractionTable (const char *fileName) { return table; } +int +startContractionCommand (ContractionTable *table) { + if (!table->data.external.commandStarted) { + const char *command[] = {table->data.external.command, NULL}; + HostCommandOptions options; + + initializeHostCommandOptions(&options); + options.asynchronous = 1; + options.standardInput = &table->data.external.standardInput; + options.standardOutput = &table->data.external.standardOutput; + + logMessage(LOG_DEBUG, "starting external contraction table: %s", table->data.external.command); + if (runHostCommand(command, &options) != 0) return 0; + logMessage(LOG_DEBUG, "external contraction table started: %s", table->data.external.command); + + table->data.external.commandStarted = 1; + } + + return 1; +} + void -destroyContractionTable (ContractionTable *table) { - if (table->characters.array) { - free(table->characters.array); - table->characters.array = NULL; +stopContractionCommand (ContractionTable *table) { + if (table->data.external.commandStarted) { + fclose(table->data.external.standardInput); + fclose(table->data.external.standardOutput); + + logMessage(LOG_DEBUG, "external contraction table stopped: %s", table->data.external.command); + table->data.external.commandStarted = 0; } +} - if (table->cache.input.characters) { - free(table->cache.input.characters); - table->cache.input.characters = NULL; +static void +destroyContractionTable_external (ContractionTable *table) { + stopContractionCommand(table); + if (table->data.external.input.buffer) free(table->data.external.input.buffer); + free(table->data.external.command); + + destroyCommonFields(table); + free(table); +} + +static const ContractionTableManagementMethods externalManagementMethods = { + .destroy = destroyContractionTable_external +}; + +static ContractionTable * +compileContractionTable_external (const char *fileName) { + ContractionTable *table; + + if ((table = malloc(sizeof(*table)))) { + memset(table, 0, sizeof(*table)); + + if ((table->data.external.command = strdup(fileName))) { + table->managementMethods = &externalManagementMethods; + table->translationMethods = getContractionTableTranslationMethods_external(); + initializeCommonFields(table); + + table->data.external.commandStarted = 0; + + table->data.external.input.buffer = NULL; + table->data.external.input.size = 0; + + if (startContractionCommand(table)) { + return table; + } + + free(table->data.external.command); + } else { + logMallocError(); + } + + free(table); + } else { + logMallocError(); } - if (table->cache.output.cells) { - free(table->cache.output.cells); - table->cache.output.cells = NULL; + return NULL; +} + +#ifdef LOUIS_TABLES_DIRECTORY +static void +destroyContractionTable_louis (ContractionTable *table) { + free(table->data.louis.tableList); + + destroyCommonFields(table); + free(table); +} + +static const ContractionTableManagementMethods louisManagementMethods = { + .destroy = destroyContractionTable_louis +}; + +static ContractionTable * +compileContractionTable_louis (const char *fileName) { + ContractionTable *table; + + if ((table = malloc(sizeof(*table)))) { + memset(table, 0, sizeof(*table)); + + if ((table->data.louis.tableList = strdup(fileName))) { + table->managementMethods = &louisManagementMethods; + table->translationMethods = getContractionTableTranslationMethods_louis(); + initializeCommonFields(table); + + return table; + } else { + logMallocError(); + } + + free(table); + } else { + logMallocError(); } - if (table->cache.offsets.array) { - free(table->cache.offsets.array); - table->cache.offsets.array = NULL; + return NULL; +} +#endif /* LOUIS_TABLES_DIRECTORY */ + +typedef ContractionTable *ContractionTableCompileFunction (const char *fileName); + +typedef struct { + const char *qualifier; + ContractionTableCompileFunction *compile; + const char *directory; +} ContractionTableQualifierEntry; + +static const ContractionTableQualifierEntry contractionTableQualifierTable[] = { +#ifdef LOUIS_TABLES_DIRECTORY + { .qualifier = "louis", + .compile = &compileContractionTable_louis, + .directory = LOUIS_TABLES_DIRECTORY + }, +#endif /* LOUIS_TABLES_DIRECTORY */ + + { .qualifier = NULL } +}; + +const ContractionTableQualifierEntry * +getContractionTableQualifierEntry (const char **fileName) { + const ContractionTableQualifierEntry *entry = contractionTableQualifierTable; + + while (entry->qualifier) { + if (hasQualifier(fileName, entry->qualifier)) return entry; + entry += 1; } - if (table->command) { - stopContractionCommand(table); - if (table->data.external.input.buffer) free(table->data.external.input.buffer); - free(table->command); - free(table); + return NULL; +} + +ContractionTable * +compileContractionTable (const char *fileName) { + ContractionTableCompileFunction *compile = NULL; + const ContractionTableQualifierEntry *ctq = getContractionTableQualifierEntry(&fileName); + + if (ctq) { + compile = ctq->compile; } else { - if (table->data.internal.size) { - free(table->data.internal.header.fields); - free(table); + if (!hasNoQualifier(fileName)) { + logMessage(LOG_ERR, "unsupported contraction table: %s", fileName); + return NULL; + } + + if (testProgramPath(fileName)) { + compile = &compileContractionTable_external; + } else { + compile = &compileContractionTable_native; } } + + return compile(fileName); +} + +void +destroyContractionTable (ContractionTable *table) { + table->managementMethods->destroy(table); } char * @@ -708,13 +830,40 @@ ensureContractionTableExtension (const char *path) { char * makeContractionTablePath (const char *directory, const char *name) { - char *subdirectory = makePath(directory, CONTRACTION_TABLES_SUBDIRECTORY); + const char *qualifier = name; + const ContractionTableQualifierEntry *ctq = getContractionTableQualifierEntry(&name); + if (!ctq) hasQualifier(&name, NULL); + int qualifierLength = name - qualifier; + + char *path; + const char *extension; + + if (ctq && ctq->directory) { + if (!(path = strdup(ctq->directory))) logMallocError(); + extension = NULL; + } else { + path = makePath(directory, CONTRACTION_TABLES_SUBDIRECTORY); + extension = CONTRACTION_TABLE_EXTENSION; + } - if (subdirectory) { - char *file = makeFilePath(subdirectory, name, CONTRACTION_TABLE_EXTENSION); + if (path) { + char *file = makeFilePath(path, name, extension); - free(subdirectory); - if (file) return file; + free(path); + path = NULL; + + if (file) { + if (qualifierLength) { + char buffer[qualifierLength + strlen(file) + 1]; + snprintf(buffer, sizeof(buffer), "%.*s%s", + qualifierLength, qualifier, file); + + free(file); + if (!(file = strdup(buffer))) logMallocError(); + } + + if (file) return file; + } } return NULL; diff --git a/Programs/ctb_external.c b/Programs/ctb_external.c new file mode 100644 index 0000000000000000000000000000000000000000..4062ab0b73428614d03748dda3a16d9fc6b59970 --- /dev/null +++ b/Programs/ctb_external.c @@ -0,0 +1,361 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2018 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.com/ + * + * This software is maintained by Dave Mielke . + */ + +#include "prologue.h" + +#include +#include + +#include "log.h" +#include "ctb_translate.h" +#include "brl_dots.h" +#include "file.h" +#include "parse.h" +#include "charset.h" + +static int +putExternalRequests (BrailleContractionData *bcd) { + typedef enum { + REQ_TEXT, + REQ_NUMBER + } ExternalRequestType; + + typedef struct { + const char *name; + ExternalRequestType type; + + union { + struct { + const wchar_t *start; + size_t count; + } text; + + unsigned int number; + } value; + } ExternalRequestEntry; + + const ExternalRequestEntry externalRequestTable[] = { + { .name = "cursor-position", + .type = REQ_NUMBER, + .value.number = bcd->input.cursor? bcd->input.cursor-bcd->input.begin+1: 0 + }, + + { .name = "expand-current-word", + .type = REQ_NUMBER, + .value.number = prefs.expandCurrentWord + }, + + { .name = "capitalization-mode", + .type = REQ_NUMBER, + .value.number = prefs.capitalizationMode + }, + + { .name = "maximum-length", + .type = REQ_NUMBER, + .value.number = getOutputCount(bcd) + }, + + { .name = "text", + .type = REQ_TEXT, + .value.text = { + .start = bcd->input.begin, + .count = getInputCount(bcd) + } + }, + + { .name = NULL } + }; + + FILE *stream = bcd->table->data.external.standardInput; + const ExternalRequestEntry *req = externalRequestTable; + + while (req->name) { + if (fputs(req->name, stream) == EOF) goto outputError; + if (fputc('=', stream) == EOF) goto outputError; + + switch (req->type) { + case REQ_TEXT: { + const wchar_t *character = req->value.text.start; + const wchar_t *end = character + req->value.text.count; + + while (character < end) { + Utf8Buffer utf8; + size_t utfs = convertWcharToUtf8(*character++, utf8); + + if (!utfs) return 0; + if (fputs(utf8, stream) == EOF) goto outputError; + } + + break; + } + + case REQ_NUMBER: + if (fprintf(stream, "%u", req->value.number) == EOF) goto outputError; + break; + + default: + logMessage(LOG_WARNING, "unimplemented external contraction request property type: %s: %u (%s)", bcd->table->data.external.command, req->type, req->name); + return 0; + } + + if (fputc('\n', stream) == EOF) goto outputError; + req += 1; + } + + if (fflush(stream) == EOF) goto outputError; + return 1; + +outputError: + logMessage(LOG_WARNING, "external contraction output error: %s: %s", bcd->table->data.external.command, strerror(errno)); + return 0; +} + +static const unsigned char brfTable[0X40] = { + /* 0X20 */ 0, + /* 0X21 ! */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, + /* 0X22 " */ BRL_DOT_5, + /* 0X23 # */ BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X24 $ */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_6, + /* 0X25 % */ BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_6, + /* 0X26 & */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, + /* 0X27 ' */ BRL_DOT_3, + /* 0X28 ( */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, + /* 0X29 ) */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X2A * */ BRL_DOT_1 | BRL_DOT_6, + /* 0X2B + */ BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, + /* 0X2C , */ BRL_DOT_6, + /* 0X2D - */ BRL_DOT_3 | BRL_DOT_6, + /* 0X2E . */ BRL_DOT_4 | BRL_DOT_6, + /* 0X2F / */ BRL_DOT_3 | BRL_DOT_4, + /* 0X30 0 */ BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, + /* 0X31 1 */ BRL_DOT_2, + /* 0X32 2 */ BRL_DOT_2 | BRL_DOT_3, + /* 0X33 3 */ BRL_DOT_2 | BRL_DOT_5, + /* 0X34 4 */ BRL_DOT_2 | BRL_DOT_5 | BRL_DOT_6, + /* 0X35 5 */ BRL_DOT_2 | BRL_DOT_6, + /* 0X36 6 */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5, + /* 0X37 7 */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, + /* 0X38 8 */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_6, + /* 0X39 9 */ BRL_DOT_3 | BRL_DOT_5, + /* 0X3A : */ BRL_DOT_1 | BRL_DOT_5 | BRL_DOT_6, + /* 0X3B ; */ BRL_DOT_5 | BRL_DOT_6, + /* 0X3C < */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_6, + /* 0X3D = */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X3E > */ BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, + /* 0X3F ? */ BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X40 @ */ BRL_DOT_4, + /* 0X41 A */ BRL_DOT_1, + /* 0X42 B */ BRL_DOT_1 | BRL_DOT_2, + /* 0X43 C */ BRL_DOT_1 | BRL_DOT_4, + /* 0X44 D */ BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_5, + /* 0X45 E */ BRL_DOT_1 | BRL_DOT_5, + /* 0X46 F */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4, + /* 0X47 G */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5, + /* 0X48 H */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_5, + /* 0X49 I */ BRL_DOT_2 | BRL_DOT_4, + /* 0X4A J */ BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5, + /* 0X4B K */ BRL_DOT_1 | BRL_DOT_3, + /* 0X4C L */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3, + /* 0X4D M */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4, + /* 0X4E N */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, + /* 0X4F O */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_5, + /* 0X50 P */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4, + /* 0X51 Q */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, + /* 0X52 R */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5, + /* 0X53 S */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4, + /* 0X54 T */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, + /* 0X55 U */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_6, + /* 0X56 V */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_6, + /* 0X57 W */ BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X58 X */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, + /* 0X59 Y */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X5A Z */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, + /* 0X5B [ */ BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_6, + /* 0X5C \ */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_5 | BRL_DOT_6, + /* 0X5D ] */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, + /* 0X5E ^ */ BRL_DOT_4 | BRL_DOT_5, + /* 0X5F _ */ BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6 +}; + +static int +handleExternalResponse_brf (BrailleContractionData *bcd, const char *value) { + int useDot7 = prefs.capitalizationMode == CTB_CAP_DOT7; + + while (*value && (bcd->output.current < bcd->output.end)) { + unsigned char brf = *value++ & 0XFF; + unsigned char dots = 0; + unsigned char superimpose = 0; + + if ((brf >= 0X60) && (brf <= 0X7F)) { + brf -= 0X20; + } else if ((brf >= 0X41) && (brf <= 0X5A)) { + if (useDot7) superimpose |= BRL_DOT_7; + } + + if ((brf >= 0X20) && (brf <= 0X5F)) dots = brfTable[brf - 0X20] | superimpose; + *bcd->output.current++ = dots; + } + + return 1; +} + +static int +handleExternalResponse_consumedLength (BrailleContractionData *bcd, const char *value) { + int length; + + if (!isInteger(&length, value)) return 0; + if (length < 1) return 0; + if (length > getInputCount(bcd)) return 0; + + bcd->input.current = bcd->input.begin + length; + return 1; +} + +static int +handleExternalResponse_outputOffsets (BrailleContractionData *bcd, const char *value) { + if (bcd->input.offsets) { + int previous = CTB_NO_OFFSET; + unsigned int count = getInputCount(bcd); + unsigned int index = 0; + + while (*value && (index < count)) { + int offset; + + { + char *delimiter = strchr(value, ','); + + if (delimiter) { + int ok; + + { + char oldDelimiter = *delimiter; + *delimiter = 0; + ok = isInteger(&offset, value); + *delimiter = oldDelimiter; + } + + if (!ok) return 0; + value = delimiter + 1; + } else if (isInteger(&offset, value)) { + value += strlen(value); + } else { + return 0; + } + } + + if (offset < ((index == 0)? 0: previous)) return 0; + if (offset >= getOutputCount(bcd)) return 0; + + bcd->input.offsets[index++] = (offset == previous)? CTB_NO_OFFSET: offset; + previous = offset; + } + } + + return 1; +} + +typedef struct { + const char *name; + int (*handler) (BrailleContractionData *bcd, const char *value); + unsigned stop:1; +} ExternalResponseEntry; + +static const ExternalResponseEntry externalResponseTable[] = { + { .name = "brf", + .stop = 1, + .handler = handleExternalResponse_brf + }, + + { .name = "consumed-length", + .handler = handleExternalResponse_consumedLength + }, + + { .name = "output-offsets", + .handler = handleExternalResponse_outputOffsets + }, + + { .name = NULL } +}; + +static int +getExternalResponses (BrailleContractionData *bcd) { + FILE *stream = bcd->table->data.external.standardOutput; + + while (readLine(stream, &bcd->table->data.external.input.buffer, &bcd->table->data.external.input.size)) { + int ok = 0; + int stop = 0; + char *delimiter = strchr(bcd->table->data.external.input.buffer, '='); + + if (delimiter) { + const char *value = delimiter + 1; + const ExternalResponseEntry *rsp = externalResponseTable; + + char oldDelimiter = *delimiter; + *delimiter = 0; + + while (rsp->name) { + if (strcmp(bcd->table->data.external.input.buffer, rsp->name) == 0) { + if (rsp->handler(bcd, value)) ok = 1; + if (rsp->stop) stop = 1; + break; + } + + rsp += 1; + } + + *delimiter = oldDelimiter; + } + + if (!ok) logMessage(LOG_WARNING, "unexpected external contraction response: %s: %s", bcd->table->data.external.command, bcd->table->data.external.input.buffer); + if (stop) return 1; + } + + logMessage(LOG_WARNING, "incomplete external contraction response: %s", bcd->table->data.external.command); + return 0; +} + +static int +contractText_external (BrailleContractionData *bcd) { + setOffset(bcd); + while (++bcd->input.current < bcd->input.end) clearOffset(bcd); + + if (startContractionCommand(bcd->table)) { + if (putExternalRequests(bcd)) { + if (getExternalResponses(bcd)) { + return 1; + } + } + } + + stopContractionCommand(bcd->table); + return 0; +} + +static void +finishCharacterEntry_external (BrailleContractionData *bcd, CharacterEntry *entry) { +} + +static const ContractionTableTranslationMethods externalTranslationMethods = { + .contractText = contractText_external, + .finishCharacterEntry = finishCharacterEntry_external +}; + +const ContractionTableTranslationMethods * +getContractionTableTranslationMethods_external (void) { + return &externalTranslationMethods; +} diff --git a/Programs/ctb_internal.h b/Programs/ctb_internal.h index 798d56e154efcb5a6036ba7c9fcd532e8d8df2c6..eece1f1d92a0b5aca25a1d1dd5942d021c007433 100644 --- a/Programs/ctb_internal.h +++ b/Programs/ctb_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -119,7 +119,20 @@ typedef struct { const ContractionTableRule *always; } CharacterEntry; +typedef struct { + void (*destroy) (ContractionTable *table); +} ContractionTableManagementMethods; + +typedef struct ContractionTableTranslationMethodsStruct ContractionTableTranslationMethods; +typedef const ContractionTableTranslationMethods *GetContractionTableTranslationMethodsFunction (void); +extern GetContractionTableTranslationMethodsFunction getContractionTableTranslationMethods_native; +extern GetContractionTableTranslationMethodsFunction getContractionTableTranslationMethods_external; +extern GetContractionTableTranslationMethodsFunction getContractionTableTranslationMethods_louis; + struct ContractionTableStruct { + const ContractionTableManagementMethods *managementMethods; + const ContractionTableTranslationMethods *translationMethods; + struct { CharacterEntry *array; int size; @@ -152,8 +165,6 @@ struct ContractionTableStruct { unsigned char capitalizationMode; } cache; - char *command; - union { struct { union { @@ -165,15 +176,22 @@ struct ContractionTableStruct { } internal; struct { - unsigned commandStarted:1; + char *command; FILE *standardInput; FILE *standardOutput; + unsigned commandStarted:1; struct { char *buffer; size_t size; } input; } external; + +#ifdef LOUIS_TABLES_DIRECTORY + struct { + char *tableList; + } louis; +#endif /* LOUIS_TABLES_DIRECTORY */ } data; }; diff --git a/Programs/ctb_louis.c b/Programs/ctb_louis.c new file mode 100644 index 0000000000000000000000000000000000000000..1a228a6413b600de2ddc8f562cf1691d84469b60 --- /dev/null +++ b/Programs/ctb_louis.c @@ -0,0 +1,128 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2018 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.com/ + * + * This software is maintained by Dave Mielke . + */ + +#include "prologue.h" + +#include + +#include "log.h" +#include "ctb_translate.h" +#include "prefs.h" + +static void +initialize (void) { + static unsigned char initialized = 0; + + if (!initialized) { + int logLevel = LOG_INFO; + + logMessage(logLevel, "LibLouis version: %s", lou_version()); + logMessage(logLevel, "LibLouis Data Directory: %s", lou_getDataPath()); + logMessage(logLevel, "LibLouis Character Size: %d", lou_charSize()); + + initialized = 1; + } +} + +static int +contractText_louis (BrailleContractionData *bcd) { + initialize(); + + int inputLength = getInputCount(bcd); + widechar inputBuffer[inputLength]; + int outputOffsets[inputLength]; + + { + const wchar_t *source = bcd->input.begin; + widechar *target = inputBuffer; + + while (source < bcd->input.end) { + *target++ = *source++; + } + } + + int outputLength = getOutputCount(bcd); + widechar outputBuffer[outputLength]; + int inputOffsets[outputLength]; + + int *cursor = NULL; + int position; + + if (bcd->input.cursor) { + position = bcd->input.cursor - bcd->input.begin; + if ((position >= 0) && (position < inputLength)) cursor = &position; + } + + int translationMode = dotsIO | ucBrl; + if (prefs.expandCurrentWord) translationMode |= compbrlAtCursor; + + int translated = lou_translate( + bcd->table->data.louis.tableList, + inputBuffer, &inputLength, outputBuffer, &outputLength, + NULL /* typeForm */, NULL /* spacing */, + outputOffsets, inputOffsets, cursor, translationMode + ); + + if (translated) { + bcd->input.current = bcd->input.begin + inputLength; + bcd->output.current = bcd->output.begin + outputLength; + + { + const widechar *source = outputBuffer; + BYTE *target = bcd->output.begin; + + while (target < bcd->output.current) { + *target++ = *source++ & 0XFF; + } + } + + if (bcd->input.offsets) { + const int *source = outputOffsets; + int *target = bcd->input.offsets; + const int *end = target + inputLength; + int previousOffset = -1; + + while (target < end) { + int offset = *source++; + int same = offset == previousOffset; + + *target++ = same? CTB_NO_OFFSET: offset; + previousOffset = offset; + } + + end += bcd->input.end - bcd->input.current; + while (target < end) *target++ = CTB_NO_OFFSET; + } + } + + return translated; +} + +static void +finishCharacterEntry_louis (BrailleContractionData *bcd, CharacterEntry *entry) { +} + +static const ContractionTableTranslationMethods louisTranslationMethods = { + .contractText = contractText_louis, + .finishCharacterEntry = finishCharacterEntry_louis +}; + +const ContractionTableTranslationMethods * +getContractionTableTranslationMethods_louis (void) { + return &louisTranslationMethods; +} diff --git a/Programs/ctb_native.c b/Programs/ctb_native.c new file mode 100644 index 0000000000000000000000000000000000000000..5c8cb0fffe868d3e560d28581d9f1dfe1c03378b --- /dev/null +++ b/Programs/ctb_native.c @@ -0,0 +1,1107 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2018 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.com/ + * + * This software is maintained by Dave Mielke . + */ + +#include "prologue.h" + +#include + +#ifdef HAVE_ICU +#endif /* HAVE_ICU */ + +#include "log.h" +#include "ctb_translate.h" +#include "brl_dots.h" +#include "unicode.h" + +#ifdef HAVE_ICU +#include + +typedef struct { + unsigned int index; + ULineBreak after; + ULineBreak before; + ULineBreak previous; + ULineBreak indirect; +} LineBreakOpportunitiesState; + +static void +prepareLineBreakOpportunitiesState (LineBreakOpportunitiesState *lbo) { + lbo->index = 0; + lbo->after = U_LB_SPACE; + lbo->before = lbo->after; + lbo->previous = lbo->before; + lbo->indirect = U_LB_SPACE; +} + +static void +findLineBreakOpportunities ( + BrailleContractionData *bcd, + LineBreakOpportunitiesState *lbo, + unsigned char *opportunities, + const wchar_t *characters, unsigned int limit +) { + /* UAX #14: Line Breaking Properties + * http://unicode.org/reports/tr14/ + * Section 6: Line Breaking Algorithm + * + * ! Mandatory break at the indicated position + * ^ No break allowed at the indicated position + * _ Break allowed at the indicated position + * + * H ideographs + * h small kana + * 9 digits + */ + + while (lbo->index <= limit) { + unsigned char *opportunity = &opportunities[lbo->index]; + + lbo->previous = lbo->before; + lbo->before = lbo->after; + lbo->after = u_getIntPropertyValue(characters[lbo->index], UCHAR_LINE_BREAK); + lbo->index += 1; + + /* LB9 Do not break a combining character sequence. + */ + if (lbo->after == U_LB_COMBINING_MARK) { + /* LB10: Treat any remaining combining mark as AL. + */ + if ((lbo->before == U_LB_MANDATORY_BREAK) || + (lbo->before == U_LB_CARRIAGE_RETURN) || + (lbo->before == U_LB_LINE_FEED) || + (lbo->before == U_LB_NEXT_LINE) || + (lbo->before == U_LB_SPACE) || + (lbo->before == U_LB_ZWSPACE)) { + lbo->before = U_LB_ALPHABETIC; + } + + /* treat it as if it has the line breaking class of the base character + */ + lbo->after = lbo->before; + *opportunity = 0; + continue; + } + + if (lbo->before != U_LB_SPACE) lbo->indirect = lbo->before; + + /* LB2: Never break at the start of text. + * sot × + */ + if (opportunity == opportunities) { + *opportunity = 0; + continue; + } + + /* LB4: Always break after hard line breaks + * BK ! + */ + if (lbo->before == U_LB_MANDATORY_BREAK) { + *opportunity = 1; + continue; + } + + /* LB5: Treat CR followed by LF, as well as CR, LF, and NL as hard line breaks. + * CR ^ LF + * CR ! + * LF ! + * NL ! + */ + if ((lbo->before == U_LB_CARRIAGE_RETURN) && (lbo->after == U_LB_LINE_FEED)) { + *opportunity = 0; + continue; + } + if ((lbo->before == U_LB_CARRIAGE_RETURN) || + (lbo->before == U_LB_LINE_FEED) || + (lbo->before == U_LB_NEXT_LINE)) { + *opportunity = 1; + continue; + } + + /* LB6: Do not break before hard line breaks. + * ^ ( BK | CR | LF | NL ) + */ + if ((lbo->after == U_LB_MANDATORY_BREAK) || + (lbo->after == U_LB_CARRIAGE_RETURN) || + (lbo->after == U_LB_LINE_FEED) || + (lbo->after == U_LB_NEXT_LINE)) { + *opportunity = 0; + continue; + } + + /* LB7: Do not break before spaces or zero width space. + * ^ SP + * ^ ZW + */ + if ((lbo->after == U_LB_SPACE) || (lbo->after == U_LB_ZWSPACE)) { + *opportunity = 0; + continue; + } + + /* LB8: Break after zero width space. + * ZW _ + */ + if (lbo->before == U_LB_ZWSPACE) { + *opportunity = 1; + continue; + } + + /* LB11: Do not break before or after Word joiner and related characters. + * ^ WJ + * WJ ^ + */ + if ((lbo->before == U_LB_WORD_JOINER) || (lbo->after == U_LB_WORD_JOINER)) { + *opportunity = 0; + continue; + } + + /* LB12: Do not break before or after NBSP and related characters. + * [^SP] ^ GL + * GL ^ + */ + if ((lbo->before != U_LB_SPACE) && (lbo->after == U_LB_GLUE)) { + *opportunity = 0; + continue; + } + if (lbo->before == U_LB_GLUE) { + *opportunity = 0; + continue; + } + + /* LB13: Do not break before ‘]' or ‘!' or ‘;' or ‘/', even after spaces. + * ^ CL + * ^ EX + * ^ IS + * ^ SY + */ + if ((lbo->after == U_LB_CLOSE_PUNCTUATION) || + (lbo->after == U_LB_EXCLAMATION) || + (lbo->after == U_LB_INFIX_NUMERIC) || + (lbo->after == U_LB_BREAK_SYMBOLS)) { + *opportunity = 0; + continue; + } + + /* LB14: Do not break after ‘[', even after spaces. + * OP SP* ^ + */ + if (lbo->indirect == U_LB_OPEN_PUNCTUATION) { + *opportunity = 0; + continue; + } + + /* LB15: Do not break within ‘"[', even with intervening spaces. + * QU SP* ^ OP + */ + if ((lbo->indirect == U_LB_QUOTATION) && (lbo->after == U_LB_OPEN_PUNCTUATION)) { + *opportunity = 0; + continue; + } + + /* LB16: Do not break within ‘]h', even with intervening spaces. + * CL SP* ^ NS + */ + if ((lbo->indirect == U_LB_CLOSE_PUNCTUATION) && (lbo->after == U_LB_NONSTARTER)) { + *opportunity = 0; + continue; + } + + /* LB17: Do not break within ‘ــ', even with intervening spaces. + * B2 SP* ^ B2 + */ + if ((lbo->indirect == U_LB_BREAK_BOTH) && (lbo->after == U_LB_BREAK_BOTH)) { + *opportunity = 0; + continue; + } + + /* LB18: Break after spaces. + * SP _ + */ + if (lbo->before == U_LB_SPACE) { + *opportunity = 1; + continue; + } + + /* LB19: Do not break before or after quotation marks. + * ^ QU + * QU ^ + */ + if ((lbo->before == U_LB_QUOTATION) || (lbo->after == U_LB_QUOTATION)) { + *opportunity = 0; + continue; + } + + /* LB20: Break before and after unresolved. + * _ CB + * CB _ + */ + if ((lbo->after == U_LB_CONTINGENT_BREAK) || (lbo->before == U_LB_CONTINGENT_BREAK)) { + *opportunity = 1; + continue; + } + + /* LB21: Do not break before hyphen-minus, other hyphens, + * fixed-width spaces, small kana, and other non-starters, + * or lbo->after acute accents. + * ^ BA + * ^ HY + * ^ NS + * BB ^ + */ + if ((lbo->after == U_LB_BREAK_AFTER) || + (lbo->after == U_LB_HYPHEN) || + (lbo->after == U_LB_NONSTARTER) || + (lbo->before == U_LB_BREAK_BEFORE)) { + *opportunity = 0; + continue; + } + + /* LB22: Do not break between two ellipses, + * or between letters or numbers and ellipsis. + * AL ^ IN + * ID ^ IN + * IN ^ IN + * NU ^ IN + */ + if ((lbo->after == U_LB_INSEPARABLE) && + ((lbo->before == U_LB_ALPHABETIC) || + (lbo->before == U_LB_IDEOGRAPHIC) || + (lbo->before == U_LB_INSEPARABLE) || + (lbo->before == U_LB_NUMERIC))) { + *opportunity = 0; + continue; + } + + /* LB23: Do not break within ‘a9', ‘3a', or ‘H%'. + * ID ^ PO + * AL ^ NU + * NU ^ AL + */ + if (((lbo->before == U_LB_IDEOGRAPHIC) && (lbo->after == U_LB_POSTFIX_NUMERIC)) || + ((lbo->before == U_LB_ALPHABETIC) && (lbo->after == U_LB_NUMERIC)) || + ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_ALPHABETIC))) { + *opportunity = 0; + continue; + } + + /* LB24: Do not break between prefix and letters or ideographs. + * PR ^ ID + * PR ^ AL + * PO ^ AL + */ + if (((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_IDEOGRAPHIC)) || + ((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_ALPHABETIC)) || + ((lbo->before == U_LB_POSTFIX_NUMERIC) && (lbo->after == U_LB_ALPHABETIC))) { + *opportunity = 0; + continue; + } + + /* LB25: Do not break between the following pairs of classes relevant to numbers: + * CL ^ PO + * CL ^ PR + * NU ^ PO + * NU ^ PR + * PO ^ OP + * PO ^ NU + * PR ^ OP + * PR ^ NU + * HY ^ NU + * IS ^ NU + * NU ^ NU + * SY ^ NU + */ + if (((lbo->before == U_LB_CLOSE_PUNCTUATION) && (lbo->after == U_LB_POSTFIX_NUMERIC)) || + ((lbo->before == U_LB_CLOSE_PUNCTUATION) && (lbo->after == U_LB_PREFIX_NUMERIC)) || + ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_POSTFIX_NUMERIC)) || + ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_PREFIX_NUMERIC)) || + ((lbo->before == U_LB_POSTFIX_NUMERIC) && (lbo->after == U_LB_OPEN_PUNCTUATION)) || + ((lbo->before == U_LB_POSTFIX_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || + ((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_OPEN_PUNCTUATION)) || + ((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || + ((lbo->before == U_LB_HYPHEN) && (lbo->after == U_LB_NUMERIC)) || + ((lbo->before == U_LB_INFIX_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || + ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || + ((lbo->before == U_LB_BREAK_SYMBOLS) && (lbo->after == U_LB_NUMERIC))) { + *opportunity = 0; + continue; + } + + /* LB26: Do not break a Korean syllable. + * JL ^ (JL | JV | H2 | H3) + * (JV | H2) ^ (JV | JT) + * (JT | H3) ^ JT + */ + if ((lbo->before == U_LB_JL) && + ((lbo->after == U_LB_JL) || + (lbo->after == U_LB_JV) || + (lbo->after == U_LB_H2) || + (lbo->after == U_LB_H3))) { + *opportunity = 0; + continue; + } + if (((lbo->before == U_LB_JV) || (lbo->before == U_LB_H2)) && + ((lbo->after == U_LB_JV) || (lbo->after == U_LB_JT))) { + *opportunity = 0; + continue; + } + if (((lbo->before == U_LB_JT) || (lbo->before == U_LB_H3)) && + (lbo->after == U_LB_JT)) { + *opportunity = 0; + continue; + } + + /* LB27: Treat a Korean Syllable Block the same as ID. + * (JL | JV | JT | H2 | H3) ^ IN + * (JL | JV | JT | H2 | H3) ^ PO + * PR ^ (JL | JV | JT | H2 | H3) + */ + if (((lbo->before == U_LB_JL) || (lbo->before == U_LB_JV) || (lbo->before == U_LB_JT) || + (lbo->before == U_LB_H2) || (lbo->before == U_LB_H3)) && + (lbo->after == U_LB_INSEPARABLE)) { + *opportunity = 0; + continue; + } + if (((lbo->before == U_LB_JL) || (lbo->before == U_LB_JV) || (lbo->before == U_LB_JT) || + (lbo->before == U_LB_H2) || (lbo->before == U_LB_H3)) && + (lbo->after == U_LB_POSTFIX_NUMERIC)) { + *opportunity = 0; + continue; + } + if ((lbo->before == U_LB_PREFIX_NUMERIC) && + ((lbo->after == U_LB_JL) || (lbo->after == U_LB_JV) || (lbo->after == U_LB_JT) || + (lbo->after == U_LB_H2) || (lbo->after == U_LB_H3))) { + *opportunity = 0; + continue; + } + + /* LB28: Do not break between alphabetics. + * AL ^ AL + */ + if ((lbo->before == U_LB_ALPHABETIC) && (lbo->after == U_LB_ALPHABETIC)) { + *opportunity = 0; + continue; + } + + /* LB29: Do not break between numeric punctuation and alphabetics. + * IS ^ AL + */ + if ((lbo->before == U_LB_INFIX_NUMERIC) && (lbo->after == U_LB_ALPHABETIC)) { + *opportunity = 0; + continue; + } + + /* LB30: Do not break between letters, numbers, or ordinary symbols + * and opening or closing punctuation. + * (AL | NU) ^ OP + * CL ^ (AL | NU) + */ + if (((lbo->before == U_LB_ALPHABETIC) || (lbo->before == U_LB_NUMERIC)) && + (lbo->after == U_LB_OPEN_PUNCTUATION)) { + *opportunity = 0; + continue; + } + if ((lbo->before == U_LB_CLOSE_PUNCTUATION) && + ((lbo->after == U_LB_ALPHABETIC) || (lbo->after == U_LB_NUMERIC))) { + *opportunity = 0; + continue; + } + + /* Unix options begin with a minus sign. */ + if ((lbo->before == U_LB_HYPHEN) && + (lbo->after != U_LB_SPACE) && + (lbo->previous == U_LB_SPACE)) { + *opportunity = 0; + continue; + } + + /* LB31: Break everywhere else. + * ALL _ + * _ ALL + */ + *opportunity = 1; + } +} + +#else /* HAVE_ICU */ +#include "ascii.h" + +typedef struct { + unsigned int index; + int wasSpace; +} LineBreakOpportunitiesState; + +static void +prepareLineBreakOpportunitiesState (LineBreakOpportunitiesState *lbo) { + lbo->index = 0; + lbo->wasSpace = 0; +} + +static void +findLineBreakOpportunities ( + BrailleContractionData *bcd, + LineBreakOpportunitiesState *lbo, + unsigned char *opportunities, + const wchar_t *characters, unsigned int limit +) { + while (lbo->index <= limit) { + int isSpace = testCharacter(bcd, characters[lbo->index], CTC_Space); + opportunities[lbo->index] = lbo->wasSpace && !isSpace; + + lbo->wasSpace = isSpace; + lbo->index += 1; + } +} +#endif /* HAVE_ICU */ + +static inline ContractionTableHeader * +getContractionTableHeader (BrailleContractionData *bcd) { + return bcd->table->data.internal.header.fields; +} + +static inline const void * +getContractionTableItem (BrailleContractionData *bcd, ContractionTableOffset offset) { + return &bcd->table->data.internal.header.bytes[offset]; +} + +static const ContractionTableCharacter * +getContractionTableCharacter (BrailleContractionData *bcd, wchar_t character) { + const ContractionTableCharacter *characters = getContractionTableItem(bcd, getContractionTableHeader(bcd)->characters); + int first = 0; + int last = getContractionTableHeader(bcd)->characterCount - 1; + + while (first <= last) { + int current = (first + last) / 2; + const ContractionTableCharacter *ctc = &characters[current]; + + if (ctc->value < character) { + first = current + 1; + } else if (ctc->value > character) { + last = current - 1; + } else { + return ctc; + } + } + + return NULL; +} + +typedef struct { + BrailleContractionData *bcd; + CharacterEntry *character; +} SetAlwaysRuleData; + +static int +setAlwaysRule (wchar_t character, void *data) { + SetAlwaysRuleData *sar = data; + const ContractionTableCharacter *ctc = getContractionTableCharacter(sar->bcd, character); + + if (ctc) { + ContractionTableOffset offset = ctc->always; + + if (offset) { + const ContractionTableRule *rule = getContractionTableItem(sar->bcd, offset); + + if (rule->replen) { + sar->character->always = rule; + return 1; + } + } + } + + return 0; +} + +static const ContractionTableRule * +getAlwaysRule (BrailleContractionData *bcd, wchar_t character) { + const CharacterEntry *entry = getCharacterEntry(bcd, character); + + return entry? entry->always: NULL; +} + +static wchar_t +getBestCharacter (BrailleContractionData *bcd, wchar_t character) { + const ContractionTableRule *rule = getAlwaysRule(bcd, character); + + return rule? rule->findrep[0]: 0; +} + +static int +sameCharacters (BrailleContractionData *bcd, wchar_t character1, wchar_t character2) { + wchar_t best1 = getBestCharacter(bcd, character1); + + return best1 && (best1 == getBestCharacter(bcd, character2)); +} + +static wchar_t +toLowerCase (BrailleContractionData *bcd, wchar_t character) { + const CharacterEntry *entry = getCharacterEntry(bcd, character); + return entry? entry->lowercase: character; +} + +static int +checkCurrentRule (BrailleContractionData *bcd, const wchar_t *source) { + const wchar_t *character = bcd->current.rule->findrep; + int count = bcd->current.length; + + while (count) { + if (toLowerCase(bcd, *source) != toLowerCase(bcd, *character)) return 0; + --count, ++source, ++character; + } + return 1; +} + +static void +setBefore (BrailleContractionData *bcd) { + bcd->current.before = (bcd->input.current == bcd->input.begin)? WC_C(' '): bcd->input.current[-1]; +} + +static void +setAfter (BrailleContractionData *bcd, int length) { + bcd->current.after = (bcd->input.current + length < bcd->input.end)? bcd->input.current[length]: WC_C(' '); +} + +static int +isBeginning (BrailleContractionData *bcd) { + const wchar_t *ptr = bcd->input.current; + + while (ptr > bcd->input.begin) { + if (!testCharacter(bcd, *--ptr, CTC_Punctuation)) { + if (!testCharacter(bcd, *ptr, CTC_Space)) return 0; + break; + } + } + + return 1; +} + +static int +isEnding (BrailleContractionData *bcd) { + const wchar_t *ptr = bcd->input.current + bcd->current.length; + + while (ptr < bcd->input.end) { + if (!testCharacter(bcd, *ptr, CTC_Punctuation)) { + if (!testCharacter(bcd, *ptr, CTC_Space)) return 0; + break; + } + + ptr += 1; + } + + return 1; +} + +static int +selectRule (BrailleContractionData *bcd, int length) { + int ruleOffset; + int maximumLength; + + if (length < 1) return 0; + if (length == 1) { + const ContractionTableCharacter *ctc = getContractionTableCharacter(bcd, toLowerCase(bcd, *bcd->input.current)); + if (!ctc) return 0; + ruleOffset = ctc->rules; + maximumLength = 1; + } else { + wchar_t characters[2]; + characters[0] = toLowerCase(bcd, bcd->input.current[0]); + characters[1] = toLowerCase(bcd, bcd->input.current[1]); + ruleOffset = getContractionTableHeader(bcd)->rules[CTH(characters)]; + maximumLength = 0; + } + + while (ruleOffset) { + bcd->current.rule = getContractionTableItem(bcd, ruleOffset); + bcd->current.opcode = bcd->current.rule->opcode; + bcd->current.length = bcd->current.rule->findlen; + + if ((length == 1) || + ((bcd->current.length <= length) && + checkCurrentRule(bcd, bcd->input.current))) { + setAfter(bcd, bcd->current.length); + + if (!maximumLength) { + maximumLength = bcd->current.length; + + if (prefs.capitalizationMode != CTB_CAP_NONE) { + typedef enum {CS_Any, CS_Lower, CS_UpperSingle, CS_UpperMultiple} CapitalizationState; +#define STATE(c) (testCharacter(bcd, (c), CTC_UpperCase)? CS_UpperSingle: testCharacter(bcd, (c), CTC_LowerCase)? CS_Lower: CS_Any) + + CapitalizationState current = STATE(bcd->current.before); + int i; + + for (i=0; icurrent.length; i+=1) { + wchar_t character = bcd->input.current[i]; + CapitalizationState next = STATE(character); + + if (i > 0) { + if (((current == CS_Lower) && (next == CS_UpperSingle)) || + ((current == CS_UpperMultiple) && (next == CS_Lower))) { + maximumLength = i; + break; + } + + if ((prefs.capitalizationMode != CTB_CAP_SIGN) && + (next == CS_UpperSingle)) { + maximumLength = i; + break; + } + } + + if ((prefs.capitalizationMode == CTB_CAP_SIGN) && (current > CS_Lower) && (next == CS_UpperSingle)) { + current = CS_UpperMultiple; + } else if (next != CS_Any) { + current = next; + } else if (current == CS_Any) { + current = CS_Lower; + } + } + +#undef STATE + } + } + + if ((bcd->current.length <= maximumLength) && + (!bcd->current.rule->after || testBefore(bcd, bcd->current.rule->after)) && + (!bcd->current.rule->before || testAfter(bcd, bcd->current.rule->before))) { + switch (bcd->current.opcode) { + case CTO_Always: + case CTO_Repeatable: + case CTO_Literal: + return 1; + + case CTO_LargeSign: + case CTO_LastLargeSign: + if (!isBeginning(bcd) || !isEnding(bcd)) bcd->current.opcode = CTO_Always; + return 1; + + case CTO_WholeWord: + if (testBefore(bcd, CTC_Space|CTC_Punctuation) && + testAfter(bcd, CTC_Space|CTC_Punctuation)) + return 1; + break; + + case CTO_Contraction: + if ((bcd->input.current > bcd->input.begin) && sameCharacters(bcd, bcd->input.current[-1], WC_C('\''))) break; + if (isBeginning(bcd) && isEnding(bcd)) return 1; + break; + + case CTO_LowWord: + if (testBefore(bcd, CTC_Space) && testAfter(bcd, CTC_Space) && + (bcd->previous.opcode != CTO_JoinedWord) && + ((bcd->output.current == bcd->output.begin) || !bcd->output.current[-1])) + return 1; + break; + + case CTO_JoinedWord: + if (testBefore(bcd, CTC_Space|CTC_Punctuation) && + !sameCharacters(bcd, bcd->current.before, WC_C('-')) && + (bcd->output.current + bcd->current.rule->replen < bcd->output.end)) { + const wchar_t *end = bcd->input.current + bcd->current.length; + const wchar_t *ptr = end; + + while (ptr < bcd->input.end) { + if (!testCharacter(bcd, *ptr, CTC_Space)) { + if (!testCharacter(bcd, *ptr, CTC_Letter)) break; + if (ptr == end) break; + return 1; + } + + if (ptr++ == bcd->input.cursor) break; + } + } + break; + + case CTO_SuffixableWord: + if (testBefore(bcd, CTC_Space|CTC_Punctuation) && + testAfter(bcd, CTC_Space|CTC_Letter|CTC_Punctuation)) + return 1; + break; + + case CTO_PrefixableWord: + if (testBefore(bcd, CTC_Space|CTC_Letter|CTC_Punctuation) && + testAfter(bcd, CTC_Space|CTC_Punctuation)) + return 1; + break; + + case CTO_BegWord: + if (testBefore(bcd, CTC_Space|CTC_Punctuation) && + testAfter(bcd, CTC_Letter)) + return 1; + break; + + case CTO_BegMidWord: + if (testBefore(bcd, CTC_Letter|CTC_Space|CTC_Punctuation) && + testAfter(bcd, CTC_Letter)) + return 1; + break; + + case CTO_MidWord: + if (testBefore(bcd, CTC_Letter) && testAfter(bcd, CTC_Letter)) + return 1; + break; + + case CTO_MidEndWord: + if (testBefore(bcd, CTC_Letter) && + testAfter(bcd, CTC_Letter|CTC_Space|CTC_Punctuation)) + return 1; + break; + + case CTO_EndWord: + if (testBefore(bcd, CTC_Letter) && + testAfter(bcd, CTC_Space|CTC_Punctuation)) + return 1; + break; + + case CTO_BegNum: + if (testBefore(bcd, CTC_Space|CTC_Punctuation) && + testAfter(bcd, CTC_Digit)) + return 1; + break; + + case CTO_MidNum: + if (testBefore(bcd, CTC_Digit) && testAfter(bcd, CTC_Digit)) + return 1; + break; + + case CTO_EndNum: + if (testBefore(bcd, CTC_Digit) && + testAfter(bcd, CTC_Space|CTC_Punctuation)) + return 1; + break; + + case CTO_PrePunc: + if (testCurrent(bcd, CTC_Punctuation) && isBeginning(bcd) && !isEnding(bcd)) return 1; + break; + + case CTO_PostPunc: + if (testCurrent(bcd, CTC_Punctuation) && !isBeginning(bcd) && isEnding(bcd)) return 1; + break; + + default: + break; + } + } + } + + ruleOffset = bcd->current.rule->next; + } + + return 0; +} + +static int +putCells (BrailleContractionData *bcd, const BYTE *cells, int count) { + if (bcd->output.current + count > bcd->output.end) return 0; + bcd->output.current = mempcpy(bcd->output.current, cells, count); + return 1; +} + +static int +putCell (BrailleContractionData *bcd, BYTE byte) { + return putCells(bcd, &byte, 1); +} + +static int +putReplace (BrailleContractionData *bcd, const ContractionTableRule *rule, wchar_t character) { + const BYTE *cells = (BYTE *)&rule->findrep[rule->findlen]; + int count = rule->replen; + + if ((prefs.capitalizationMode == CTB_CAP_DOT7) && + testCharacter(bcd, character, CTC_UpperCase)) { + if (!putCell(bcd, *cells++ | BRL_DOT_7)) return 0; + if (!(count -= 1)) return 1; + } + + return putCells(bcd, cells, count); +} + +static int +putCharacter (BrailleContractionData *bcd, wchar_t character) { + { + const ContractionTableRule *rule = getAlwaysRule(bcd, character); + if (rule) return putReplace(bcd, rule, character); + } + + if (isBrailleCharacter(character)) { + return putCell(bcd, (character & UNICODE_CELL_MASK)); + } + + { +#ifdef HAVE_WCHAR_H + const wchar_t replacementCharacter = UNICODE_REPLACEMENT_CHARACTER; + if (getCharacterWidth(character) == 0) return 1; +#else /* HAVE_WCHAR_H */ + const wchar_t replacementCharacter = SUB; +#endif /* HAVE_WCHAR_H */ + + if (replacementCharacter != character) { + const ContractionTableRule *rule = getAlwaysRule(bcd, replacementCharacter); + if (rule) return putReplace(bcd, rule, character); + } + } + + return putCell(bcd, BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6 | BRL_DOT_7 | BRL_DOT_8); +} + +static int +putSequence (BrailleContractionData *bcd, ContractionTableOffset offset) { + const BYTE *sequence = getContractionTableItem(bcd, offset); + return putCells(bcd, sequence+1, *sequence); +} + +static int +contractText_native (BrailleContractionData *bcd) { + const wchar_t *srcword = NULL; + BYTE *destword = NULL; + + const wchar_t *srcjoin = NULL; + BYTE *destjoin = NULL; + + BYTE *destlast = NULL; + const wchar_t *literal = NULL; + + unsigned char lineBreakOpportunities[getInputCount(bcd)]; + LineBreakOpportunitiesState lbo; + + prepareLineBreakOpportunitiesState(&lbo); + bcd->previous.opcode = CTO_None; + + while (bcd->input.current < bcd->input.end) { + int wasLiteral = bcd->input.current == literal; + + destlast = bcd->output.current; + setOffset(bcd); + setBefore(bcd); + + if (literal) + if (bcd->input.current >= literal) + if (testCurrent(bcd, CTC_Space) || testPrevious(bcd, CTC_Space)) + literal = NULL; + + if ((!literal && selectRule(bcd, getInputUnconsumed(bcd))) || selectRule(bcd, 1)) { + if (!literal && + ((bcd->current.opcode == CTO_Literal) || + (prefs.expandCurrentWord && + (bcd->input.cursor >= bcd->input.current) && + (bcd->input.cursor < (bcd->input.current + bcd->current.length))))) { + literal = bcd->input.current + bcd->current.length; + + if (!testCurrent(bcd, CTC_Space)) { + if (destjoin) { + bcd->input.current = srcjoin; + bcd->output.current = destjoin; + } else { + bcd->input.current = bcd->input.begin; + bcd->output.current = bcd->output.begin; + } + } + + continue; + } + + if (getContractionTableHeader(bcd)->numberSign && (bcd->previous.opcode != CTO_MidNum) && + !testBefore(bcd, CTC_Digit) && testCurrent(bcd, CTC_Digit)) { + if (!putSequence(bcd, getContractionTableHeader(bcd)->numberSign)) break; + } else if (getContractionTableHeader(bcd)->englishLetterSign && testCurrent(bcd, CTC_Letter)) { + if ((bcd->current.opcode == CTO_Contraction) || + ((bcd->current.opcode != CTO_EndNum) && testBefore(bcd, CTC_Digit)) || + (testCurrent(bcd, CTC_Letter) && + (bcd->current.opcode == CTO_Always) && + (bcd->current.length == 1) && + testBefore(bcd, CTC_Space) && + (((bcd->input.current + 1) == bcd->input.end) || + testNext(bcd, CTC_Space) || + (testNext(bcd, CTC_Punctuation) && + !sameCharacters(bcd, bcd->input.current[1], WC_C('.')) && + !sameCharacters(bcd, bcd->input.current[1], WC_C('\'')))))) { + if (!putSequence(bcd, getContractionTableHeader(bcd)->englishLetterSign)) break; + } + } + + if (prefs.capitalizationMode == CTB_CAP_SIGN) { + if (testCurrent(bcd, CTC_UpperCase)) { + if (!testBefore(bcd, CTC_UpperCase)) { + if (getContractionTableHeader(bcd)->beginCapitalSign && + (bcd->input.current + 1 < bcd->input.end) && testNext(bcd, CTC_UpperCase)) { + if (!putSequence(bcd, getContractionTableHeader(bcd)->beginCapitalSign)) break; + } else if (getContractionTableHeader(bcd)->capitalSign) { + if (!putSequence(bcd, getContractionTableHeader(bcd)->capitalSign)) break; + } + } + } else if (testCurrent(bcd, CTC_LowerCase)) { + if (getContractionTableHeader(bcd)->endCapitalSign && (bcd->input.current - 2 >= bcd->input.begin) && + testPrevious(bcd, CTC_UpperCase) && testRelative(bcd, -2, CTC_UpperCase)) { + if (!putSequence(bcd, getContractionTableHeader(bcd)->endCapitalSign)) break; + } + } + } + + switch (bcd->current.opcode) { + case CTO_LargeSign: + case CTO_LastLargeSign: + if ((bcd->previous.opcode == CTO_LargeSign) && !wasLiteral) { + while ((bcd->output.current > bcd->output.begin) && !bcd->output.current[-1]) bcd->output.current -= 1; + setOffset(bcd); + + { + BYTE **destptrs[] = {&destword, &destjoin, &destlast, NULL}; + BYTE ***destptr = destptrs; + + while (*destptr) { + if (**destptr && (**destptr > bcd->output.current)) **destptr = bcd->output.current; + destptr += 1; + } + } + } + break; + + default: + break; + } + + if (bcd->current.rule->replen && + !((bcd->current.opcode == CTO_Always) && (bcd->current.length == 1))) { + const wchar_t *srcnxt = bcd->input.current + bcd->current.length; + if (!putReplace(bcd, bcd->current.rule, *bcd->input.current)) goto done; + while (++bcd->input.current != srcnxt) clearOffset(bcd); + } else { + const wchar_t *srclim = bcd->input.current + bcd->current.length; + while (1) { + if (!putCharacter(bcd, *bcd->input.current)) goto done; + if (++bcd->input.current == srclim) break; + setOffset(bcd); + } + } + + { + const wchar_t *srcorig = bcd->input.current; + const wchar_t *srcbeg = NULL; + BYTE *destbeg = NULL; + + switch (bcd->current.opcode) { + case CTO_Repeatable: { + const wchar_t *srclim = bcd->input.end - bcd->current.length; + + srcbeg = bcd->input.current - bcd->current.length; + destbeg = destlast; + + while ((bcd->input.current <= srclim) && checkCurrentRule(bcd, bcd->input.current)) { + const wchar_t *srcnxt = bcd->input.current + bcd->current.length; + + do { + clearOffset(bcd); + } while (++bcd->input.current != srcnxt); + } + + break; + } + + case CTO_JoinedWord: + srcbeg = bcd->input.current; + destbeg = bcd->output.current; + + while ((bcd->input.current < bcd->input.end) && testCurrent(bcd, CTC_Space)) { + clearOffset(bcd); + bcd->input.current += 1; + } + break; + + default: + break; + } + + if (srcbeg && (bcd->input.cursor >= srcbeg) && (bcd->input.cursor < bcd->input.current)) { + int repeat = !literal; + literal = bcd->input.current; + + if (repeat) { + bcd->input.current = srcbeg; + bcd->output.current = destbeg; + continue; + } + + bcd->input.current = srcorig; + } + } + } else { + bcd->current.opcode = CTO_Always; + if (!putCharacter(bcd, *bcd->input.current)) break; + bcd->input.current += 1; + } + + findLineBreakOpportunities(bcd, &lbo, lineBreakOpportunities, bcd->input.begin, getInputConsumed(bcd)); + if (lineBreakOpportunities[getInputConsumed(bcd)]) { + srcjoin = bcd->input.current; + destjoin = bcd->output.current; + + if (bcd->current.opcode != CTO_JoinedWord) { + srcword = bcd->input.current; + destword = bcd->output.current; + } + } + + if ((bcd->output.current == bcd->output.begin) || bcd->output.current[-1]) { + bcd->previous.opcode = bcd->current.opcode; + } + } + +done: + if (bcd->input.current < bcd->input.end) { + if (destword && (destword > bcd->output.begin) && + (!(testPrevious(bcd, CTC_Space) || testCurrent(bcd, CTC_Space)) || + (bcd->previous.opcode == CTO_JoinedWord))) { + bcd->input.current = srcword; + bcd->output.current = destword; + } else if (destlast) { + bcd->output.current = destlast; + } + } + + return 1; +} + +static void +finishCharacterEntry_native (BrailleContractionData *bcd, CharacterEntry *entry) { + wchar_t character = entry->value; + + { + const ContractionTableCharacter *ctc = getContractionTableCharacter(bcd, character); + + if (ctc) entry->attributes |= ctc->attributes; + } + + { + SetAlwaysRuleData sar = { + .bcd = bcd, + .character = entry + }; + + if (!handleBestCharacter(character, setAlwaysRule, &sar)) { + entry->always = NULL; + } + } +} + +static const ContractionTableTranslationMethods nativeTranslationMethods = { + .contractText = contractText_native, + .finishCharacterEntry = finishCharacterEntry_native +}; + +const ContractionTableTranslationMethods * +getContractionTableTranslationMethods_native (void) { + return &nativeTranslationMethods; +} diff --git a/Programs/ctb_translate.c b/Programs/ctb_translate.c index 50d8e25abc9ad2c9f6aac918e39313517ebea80e..af1d98b5f43c94c482b330aba799926b4f055fce 100644 --- a/Programs/ctb_translate.c +++ b/Programs/ctb_translate.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -19,1021 +19,15 @@ #include "prologue.h" #include -#include -#ifdef HAVE_ICU -#include -#include -#endif /* HAVE_ICU */ - -#include "ctb.h" -#include "ctb_internal.h" +#include "log.h" +#include "ctb_translate.h" #include "ttb.h" #include "prefs.h" -#include "unicode.h" -#include "charset.h" -#include "ascii.h" -#include "brl_dots.h" -#include "log.h" -#include "file.h" -#include "parse.h" - -typedef struct { - ContractionTable *const table; - - struct { - const wchar_t *begin; - const wchar_t *end; - const wchar_t *current; - const wchar_t *cursor; - int *offsets; - } input; - - struct { - BYTE *begin; - BYTE *end; - BYTE *current; - } output; - - struct { - const ContractionTableRule *rule; - ContractionTableOpcode opcode; - int length; - - wchar_t before; - wchar_t after; - } current; - - struct { - ContractionTableOpcode opcode; - } previous; -} BrailleContractionData; - -static inline unsigned int -getInputCount (BrailleContractionData *bcd) { - return bcd->input.end - bcd->input.begin; -} - -static inline unsigned int -getInputConsumed (BrailleContractionData *bcd) { - return bcd->input.current - bcd->input.begin; -} - -static inline unsigned int -getInputUnconsumed (BrailleContractionData *bcd) { - return bcd->input.end - bcd->input.current; -} - -static inline unsigned int -getOutputCount (BrailleContractionData *bcd) { - return bcd->output.end - bcd->output.begin; -} - -static inline unsigned int -getOutputConsumed (BrailleContractionData *bcd) { - return bcd->output.current - bcd->output.begin; -} - -static inline void -assignOffset (BrailleContractionData *bcd, size_t value) { - if (bcd->input.offsets) bcd->input.offsets[getInputConsumed(bcd)] = value; -} - -static inline void -setOffset (BrailleContractionData *bcd) { - assignOffset(bcd, getOutputConsumed(bcd)); -} - -static inline void -clearOffset (BrailleContractionData *bcd) { - assignOffset(bcd, CTB_NO_OFFSET); -} - -static inline ContractionTableHeader * -getContractionTableHeader (BrailleContractionData *bcd) { - return bcd->table->data.internal.header.fields; -} - -static inline const void * -getContractionTableItem (BrailleContractionData *bcd, ContractionTableOffset offset) { - return &bcd->table->data.internal.header.bytes[offset]; -} - -static const ContractionTableCharacter * -getContractionTableCharacter (BrailleContractionData *bcd, wchar_t character) { - const ContractionTableCharacter *characters = getContractionTableItem(bcd, getContractionTableHeader(bcd)->characters); - int first = 0; - int last = getContractionTableHeader(bcd)->characterCount - 1; - - while (first <= last) { - int current = (first + last) / 2; - const ContractionTableCharacter *ctc = &characters[current]; - - if (ctc->value < character) { - first = current + 1; - } else if (ctc->value > character) { - last = current - 1; - } else { - return ctc; - } - } - - return NULL; -} - -typedef struct { - BrailleContractionData *bcd; - CharacterEntry *character; -} SetAlwaysRuleData; - -static int -setAlwaysRule (wchar_t character, void *data) { - SetAlwaysRuleData *sar = data; - const ContractionTableCharacter *ctc = getContractionTableCharacter(sar->bcd, character); - - if (ctc) { - ContractionTableOffset offset = ctc->always; - - if (offset) { - const ContractionTableRule *rule = getContractionTableItem(sar->bcd, offset); - - if (rule->replen) { - sar->character->always = rule; - return 1; - } - } - } - - return 0; -} - -static CharacterEntry * -getCharacterEntry (BrailleContractionData *bcd, wchar_t character) { - int first = 0; - int last = bcd->table->characters.count - 1; - - while (first <= last) { - int current = (first + last) / 2; - CharacterEntry *entry = &bcd->table->characters.array[current]; - - if (entry->value < character) { - first = current + 1; - } else if (entry->value > character) { - last = current - 1; - } else { - return entry; - } - } - - if (bcd->table->characters.count == bcd->table->characters.size) { - int newSize = bcd->table->characters.size; - newSize = newSize? newSize<<1: 0X80; - - { - CharacterEntry *newArray = realloc(bcd->table->characters.array, (newSize * sizeof(*newArray))); - - if (!newArray) { - logMallocError(); - return NULL; - } - - bcd->table->characters.array = newArray; - bcd->table->characters.size = newSize; - } - } - - memmove(&bcd->table->characters.array[first+1], - &bcd->table->characters.array[first], - (bcd->table->characters.count - first) * sizeof(*bcd->table->characters.array)); - bcd->table->characters.count += 1; - - { - CharacterEntry *entry = &bcd->table->characters.array[first]; - memset(entry, 0, sizeof(*entry)); - entry->value = entry->uppercase = entry->lowercase = character; - - if (iswspace(character)) { - entry->attributes |= CTC_Space; - } else if (iswalpha(character)) { - entry->attributes |= CTC_Letter; - - if (iswupper(character)) { - entry->attributes |= CTC_UpperCase; - entry->lowercase = towlower(character); - } - - if (iswlower(character)) { - entry->attributes |= CTC_LowerCase; - entry->uppercase = towupper(character); - } - } else if (iswdigit(character)) { - entry->attributes |= CTC_Digit; - } else if (iswpunct(character)) { - entry->attributes |= CTC_Punctuation; - } - - if (!bcd->table->command) { - { - const ContractionTableCharacter *ctc = getContractionTableCharacter(bcd, character); - - if (ctc) entry->attributes |= ctc->attributes; - } - - { - SetAlwaysRuleData sar = { - .bcd = bcd, - .character = entry - }; - - if (!handleBestCharacter(character, setAlwaysRule, &sar)) { - entry->always = NULL; - } - } - } - - return entry; - } -} - -static const ContractionTableRule * -getAlwaysRule (BrailleContractionData *bcd, wchar_t character) { - const CharacterEntry *entry = getCharacterEntry(bcd, character); - - return entry? entry->always: NULL; -} - -static wchar_t -getBestCharacter (BrailleContractionData *bcd, wchar_t character) { - const ContractionTableRule *rule = getAlwaysRule(bcd, character); - - return rule? rule->findrep[0]: 0; -} - -static int -sameCharacters (BrailleContractionData *bcd, wchar_t character1, wchar_t character2) { - wchar_t best1 = getBestCharacter(bcd, character1); - - return best1 && (best1 == getBestCharacter(bcd, character2)); -} - -static int -testCharacter (BrailleContractionData *bcd, wchar_t character, ContractionTableCharacterAttributes attributes) { - const CharacterEntry *entry = getCharacterEntry(bcd, character); - return entry && (attributes & entry->attributes); -} - -static inline int -testRelative (BrailleContractionData *bcd, int offset, ContractionTableCharacterAttributes attributes) { - return testCharacter(bcd, bcd->input.current[offset], attributes); -} - -static inline int -testCurrent (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { - return testRelative(bcd, 0, attributes); -} - -static inline int -testPrevious (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { - return testRelative(bcd, -1, attributes); -} - -static inline int -testNext (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { - return testRelative(bcd, 1, attributes); -} - -static inline int -testBefore (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { - return testCharacter(bcd, bcd->current.before, attributes); -} - -static inline int -testAfter (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { - return testCharacter(bcd, bcd->current.after, attributes); -} - -static wchar_t -toLowerCase (BrailleContractionData *bcd, wchar_t character) { - const CharacterEntry *entry = getCharacterEntry(bcd, character); - return entry? entry->lowercase: character; -} - -static int -checkCurrentRule (BrailleContractionData *bcd, const wchar_t *source) { - const wchar_t *character = bcd->current.rule->findrep; - int count = bcd->current.length; - - while (count) { - if (toLowerCase(bcd, *source) != toLowerCase(bcd, *character)) return 0; - --count, ++source, ++character; - } - return 1; -} - -static void -setBefore (BrailleContractionData *bcd) { - bcd->current.before = (bcd->input.current == bcd->input.begin)? WC_C(' '): bcd->input.current[-1]; -} - -static void -setAfter (BrailleContractionData *bcd, int length) { - bcd->current.after = (bcd->input.current + length < bcd->input.end)? bcd->input.current[length]: WC_C(' '); -} - -static int -isBeginning (BrailleContractionData *bcd) { - const wchar_t *ptr = bcd->input.current; - - while (ptr > bcd->input.begin) { - if (!testCharacter(bcd, *--ptr, CTC_Punctuation)) { - if (!testCharacter(bcd, *ptr, CTC_Space)) return 0; - break; - } - } - - return 1; -} - -static int -isEnding (BrailleContractionData *bcd) { - const wchar_t *ptr = bcd->input.current + bcd->current.length; - - while (ptr < bcd->input.end) { - if (!testCharacter(bcd, *ptr, CTC_Punctuation)) { - if (!testCharacter(bcd, *ptr, CTC_Space)) return 0; - break; - } - - ptr += 1; - } - - return 1; -} - -static int -selectRule (BrailleContractionData *bcd, int length) { - int ruleOffset; - int maximumLength; - - if (length < 1) return 0; - if (length == 1) { - const ContractionTableCharacter *ctc = getContractionTableCharacter(bcd, toLowerCase(bcd, *bcd->input.current)); - if (!ctc) return 0; - ruleOffset = ctc->rules; - maximumLength = 1; - } else { - wchar_t characters[2]; - characters[0] = toLowerCase(bcd, bcd->input.current[0]); - characters[1] = toLowerCase(bcd, bcd->input.current[1]); - ruleOffset = getContractionTableHeader(bcd)->rules[CTH(characters)]; - maximumLength = 0; - } - - while (ruleOffset) { - bcd->current.rule = getContractionTableItem(bcd, ruleOffset); - bcd->current.opcode = bcd->current.rule->opcode; - bcd->current.length = bcd->current.rule->findlen; - - if ((length == 1) || - ((bcd->current.length <= length) && - checkCurrentRule(bcd, bcd->input.current))) { - setAfter(bcd, bcd->current.length); - - if (!maximumLength) { - maximumLength = bcd->current.length; - - if (prefs.capitalizationMode != CTB_CAP_NONE) { - typedef enum {CS_Any, CS_Lower, CS_UpperSingle, CS_UpperMultiple} CapitalizationState; -#define STATE(c) (testCharacter(bcd, (c), CTC_UpperCase)? CS_UpperSingle: testCharacter(bcd, (c), CTC_LowerCase)? CS_Lower: CS_Any) - - CapitalizationState current = STATE(bcd->current.before); - int i; - - for (i=0; icurrent.length; i+=1) { - wchar_t character = bcd->input.current[i]; - CapitalizationState next = STATE(character); - - if (i > 0) { - if (((current == CS_Lower) && (next == CS_UpperSingle)) || - ((current == CS_UpperMultiple) && (next == CS_Lower))) { - maximumLength = i; - break; - } - - if ((prefs.capitalizationMode != CTB_CAP_SIGN) && - (next == CS_UpperSingle)) { - maximumLength = i; - break; - } - } - - if ((prefs.capitalizationMode == CTB_CAP_SIGN) && (current > CS_Lower) && (next == CS_UpperSingle)) { - current = CS_UpperMultiple; - } else if (next != CS_Any) { - current = next; - } else if (current == CS_Any) { - current = CS_Lower; - } - } - -#undef STATE - } - } - - if ((bcd->current.length <= maximumLength) && - (!bcd->current.rule->after || testBefore(bcd, bcd->current.rule->after)) && - (!bcd->current.rule->before || testAfter(bcd, bcd->current.rule->before))) { - switch (bcd->current.opcode) { - case CTO_Always: - case CTO_Repeatable: - case CTO_Literal: - return 1; - - case CTO_LargeSign: - case CTO_LastLargeSign: - if (!isBeginning(bcd) || !isEnding(bcd)) bcd->current.opcode = CTO_Always; - return 1; - - case CTO_WholeWord: - if (testBefore(bcd, CTC_Space|CTC_Punctuation) && - testAfter(bcd, CTC_Space|CTC_Punctuation)) - return 1; - break; - - case CTO_Contraction: - if ((bcd->input.current > bcd->input.begin) && sameCharacters(bcd, bcd->input.current[-1], WC_C('\''))) break; - if (isBeginning(bcd) && isEnding(bcd)) return 1; - break; - - case CTO_LowWord: - if (testBefore(bcd, CTC_Space) && testAfter(bcd, CTC_Space) && - (bcd->previous.opcode != CTO_JoinedWord) && - ((bcd->output.current == bcd->output.begin) || !bcd->output.current[-1])) - return 1; - break; - - case CTO_JoinedWord: - if (testBefore(bcd, CTC_Space|CTC_Punctuation) && - !sameCharacters(bcd, bcd->current.before, WC_C('-')) && - (bcd->output.current + bcd->current.rule->replen < bcd->output.end)) { - const wchar_t *end = bcd->input.current + bcd->current.length; - const wchar_t *ptr = end; - - while (ptr < bcd->input.end) { - if (!testCharacter(bcd, *ptr, CTC_Space)) { - if (!testCharacter(bcd, *ptr, CTC_Letter)) break; - if (ptr == end) break; - return 1; - } - - if (ptr++ == bcd->input.cursor) break; - } - } - break; - - case CTO_SuffixableWord: - if (testBefore(bcd, CTC_Space|CTC_Punctuation) && - testAfter(bcd, CTC_Space|CTC_Letter|CTC_Punctuation)) - return 1; - break; - - case CTO_PrefixableWord: - if (testBefore(bcd, CTC_Space|CTC_Letter|CTC_Punctuation) && - testAfter(bcd, CTC_Space|CTC_Punctuation)) - return 1; - break; - - case CTO_BegWord: - if (testBefore(bcd, CTC_Space|CTC_Punctuation) && - testAfter(bcd, CTC_Letter)) - return 1; - break; - - case CTO_BegMidWord: - if (testBefore(bcd, CTC_Letter|CTC_Space|CTC_Punctuation) && - testAfter(bcd, CTC_Letter)) - return 1; - break; - - case CTO_MidWord: - if (testBefore(bcd, CTC_Letter) && testAfter(bcd, CTC_Letter)) - return 1; - break; - - case CTO_MidEndWord: - if (testBefore(bcd, CTC_Letter) && - testAfter(bcd, CTC_Letter|CTC_Space|CTC_Punctuation)) - return 1; - break; - - case CTO_EndWord: - if (testBefore(bcd, CTC_Letter) && - testAfter(bcd, CTC_Space|CTC_Punctuation)) - return 1; - break; - - case CTO_BegNum: - if (testBefore(bcd, CTC_Space|CTC_Punctuation) && - testAfter(bcd, CTC_Digit)) - return 1; - break; - - case CTO_MidNum: - if (testBefore(bcd, CTC_Digit) && testAfter(bcd, CTC_Digit)) - return 1; - break; - - case CTO_EndNum: - if (testBefore(bcd, CTC_Digit) && - testAfter(bcd, CTC_Space|CTC_Punctuation)) - return 1; - break; - - case CTO_PrePunc: - if (testCurrent(bcd, CTC_Punctuation) && isBeginning(bcd) && !isEnding(bcd)) return 1; - break; - - case CTO_PostPunc: - if (testCurrent(bcd, CTC_Punctuation) && !isBeginning(bcd) && isEnding(bcd)) return 1; - break; - - default: - break; - } - } - } - - ruleOffset = bcd->current.rule->next; - } - - return 0; -} - -static int -putCells (BrailleContractionData *bcd, const BYTE *cells, int count) { - if (bcd->output.current + count > bcd->output.end) return 0; - bcd->output.current = mempcpy(bcd->output.current, cells, count); - return 1; -} - -static int -putCell (BrailleContractionData *bcd, BYTE byte) { - return putCells(bcd, &byte, 1); -} - -static int -putReplace (BrailleContractionData *bcd, const ContractionTableRule *rule, wchar_t character) { - const BYTE *cells = (BYTE *)&rule->findrep[rule->findlen]; - int count = rule->replen; - - if ((prefs.capitalizationMode == CTB_CAP_DOT7) && - testCharacter(bcd, character, CTC_UpperCase)) { - if (!putCell(bcd, *cells++ | BRL_DOT_7)) return 0; - if (!(count -= 1)) return 1; - } - - return putCells(bcd, cells, count); -} - -static int -putCharacter (BrailleContractionData *bcd, wchar_t character) { - { - const ContractionTableRule *rule = getAlwaysRule(bcd, character); - if (rule) return putReplace(bcd, rule, character); - } - - if (isBrailleCharacter(character)) { - return putCell(bcd, (character & UNICODE_CELL_MASK)); - } - - { -#ifdef HAVE_WCHAR_H - const wchar_t replacementCharacter = UNICODE_REPLACEMENT_CHARACTER; - if (getCharacterWidth(character) == 0) return 1; -#else /* HAVE_WCHAR_H */ - const wchar_t replacementCharacter = SUB; -#endif /* HAVE_WCHAR_H */ - - if (replacementCharacter != character) { - const ContractionTableRule *rule = getAlwaysRule(bcd, replacementCharacter); - if (rule) return putReplace(bcd, rule, character); - } - } - - return putCell(bcd, BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6 | BRL_DOT_7 | BRL_DOT_8); -} - -static int -putSequence (BrailleContractionData *bcd, ContractionTableOffset offset) { - const BYTE *sequence = getContractionTableItem(bcd, offset); - return putCells(bcd, sequence+1, *sequence); -} #ifdef HAVE_ICU -typedef struct { - unsigned int index; - ULineBreak after; - ULineBreak before; - ULineBreak previous; - ULineBreak indirect; -} LineBreakOpportunitiesState; - -static void -prepareLineBreakOpportunitiesState (LineBreakOpportunitiesState *lbo) { - lbo->index = 0; - lbo->after = U_LB_SPACE; - lbo->before = lbo->after; - lbo->previous = lbo->before; - lbo->indirect = U_LB_SPACE; -} - -static void -findLineBreakOpportunities ( - BrailleContractionData *bcd, - LineBreakOpportunitiesState *lbo, - unsigned char *opportunities, - const wchar_t *characters, unsigned int limit -) { - /* UAX #14: Line Breaking Properties - * http://unicode.org/reports/tr14/ - * Section 6: Line Breaking Algorithm - * - * ! Mandatory break at the indicated position - * ^ No break allowed at the indicated position - * _ Break allowed at the indicated position - * - * H ideographs - * h small kana - * 9 digits - */ - - while (lbo->index <= limit) { - unsigned char *opportunity = &opportunities[lbo->index]; - - lbo->previous = lbo->before; - lbo->before = lbo->after; - lbo->after = u_getIntPropertyValue(characters[lbo->index], UCHAR_LINE_BREAK); - lbo->index += 1; - - /* LB9 Do not break a combining character sequence. - */ - if (lbo->after == U_LB_COMBINING_MARK) { - /* LB10: Treat any remaining combining mark as AL. - */ - if ((lbo->before == U_LB_MANDATORY_BREAK) || - (lbo->before == U_LB_CARRIAGE_RETURN) || - (lbo->before == U_LB_LINE_FEED) || - (lbo->before == U_LB_NEXT_LINE) || - (lbo->before == U_LB_SPACE) || - (lbo->before == U_LB_ZWSPACE)) { - lbo->before = U_LB_ALPHABETIC; - } - - /* treat it as if it has the line breaking class of the base character - */ - lbo->after = lbo->before; - *opportunity = 0; - continue; - } - - if (lbo->before != U_LB_SPACE) lbo->indirect = lbo->before; - - /* LB2: Never break at the start of text. - * sot × - */ - if (opportunity == opportunities) { - *opportunity = 0; - continue; - } - - /* LB4: Always break after hard line breaks - * BK ! - */ - if (lbo->before == U_LB_MANDATORY_BREAK) { - *opportunity = 1; - continue; - } - - /* LB5: Treat CR followed by LF, as well as CR, LF, and NL as hard line breaks. - * CR ^ LF - * CR ! - * LF ! - * NL ! - */ - if ((lbo->before == U_LB_CARRIAGE_RETURN) && (lbo->after == U_LB_LINE_FEED)) { - *opportunity = 0; - continue; - } - if ((lbo->before == U_LB_CARRIAGE_RETURN) || - (lbo->before == U_LB_LINE_FEED) || - (lbo->before == U_LB_NEXT_LINE)) { - *opportunity = 1; - continue; - } - - /* LB6: Do not break before hard line breaks. - * ^ ( BK | CR | LF | NL ) - */ - if ((lbo->after == U_LB_MANDATORY_BREAK) || - (lbo->after == U_LB_CARRIAGE_RETURN) || - (lbo->after == U_LB_LINE_FEED) || - (lbo->after == U_LB_NEXT_LINE)) { - *opportunity = 0; - continue; - } - - /* LB7: Do not break before spaces or zero width space. - * ^ SP - * ^ ZW - */ - if ((lbo->after == U_LB_SPACE) || (lbo->after == U_LB_ZWSPACE)) { - *opportunity = 0; - continue; - } - - /* LB8: Break after zero width space. - * ZW _ - */ - if (lbo->before == U_LB_ZWSPACE) { - *opportunity = 1; - continue; - } - - /* LB11: Do not break before or after Word joiner and related characters. - * ^ WJ - * WJ ^ - */ - if ((lbo->before == U_LB_WORD_JOINER) || (lbo->after == U_LB_WORD_JOINER)) { - *opportunity = 0; - continue; - } - - /* LB12: Do not break before or after NBSP and related characters. - * [^SP] ^ GL - * GL ^ - */ - if ((lbo->before != U_LB_SPACE) && (lbo->after == U_LB_GLUE)) { - *opportunity = 0; - continue; - } - if (lbo->before == U_LB_GLUE) { - *opportunity = 0; - continue; - } - - /* LB13: Do not break before ‘]' or ‘!' or ‘;' or ‘/', even after spaces. - * ^ CL - * ^ EX - * ^ IS - * ^ SY - */ - if ((lbo->after == U_LB_CLOSE_PUNCTUATION) || - (lbo->after == U_LB_EXCLAMATION) || - (lbo->after == U_LB_INFIX_NUMERIC) || - (lbo->after == U_LB_BREAK_SYMBOLS)) { - *opportunity = 0; - continue; - } - - /* LB14: Do not break after ‘[', even after spaces. - * OP SP* ^ - */ - if (lbo->indirect == U_LB_OPEN_PUNCTUATION) { - *opportunity = 0; - continue; - } - - /* LB15: Do not break within ‘"[', even with intervening spaces. - * QU SP* ^ OP - */ - if ((lbo->indirect == U_LB_QUOTATION) && (lbo->after == U_LB_OPEN_PUNCTUATION)) { - *opportunity = 0; - continue; - } - - /* LB16: Do not break within ‘]h', even with intervening spaces. - * CL SP* ^ NS - */ - if ((lbo->indirect == U_LB_CLOSE_PUNCTUATION) && (lbo->after == U_LB_NONSTARTER)) { - *opportunity = 0; - continue; - } - - /* LB17: Do not break within ‘ــ', even with intervening spaces. - * B2 SP* ^ B2 - */ - if ((lbo->indirect == U_LB_BREAK_BOTH) && (lbo->after == U_LB_BREAK_BOTH)) { - *opportunity = 0; - continue; - } - - /* LB18: Break after spaces. - * SP _ - */ - if (lbo->before == U_LB_SPACE) { - *opportunity = 1; - continue; - } - - /* LB19: Do not break before or after quotation marks. - * ^ QU - * QU ^ - */ - if ((lbo->before == U_LB_QUOTATION) || (lbo->after == U_LB_QUOTATION)) { - *opportunity = 0; - continue; - } - - /* LB20: Break before and after unresolved. - * _ CB - * CB _ - */ - if ((lbo->after == U_LB_CONTINGENT_BREAK) || (lbo->before == U_LB_CONTINGENT_BREAK)) { - *opportunity = 1; - continue; - } - - /* LB21: Do not break before hyphen-minus, other hyphens, - * fixed-width spaces, small kana, and other non-starters, - * or lbo->after acute accents. - * ^ BA - * ^ HY - * ^ NS - * BB ^ - */ - if ((lbo->after == U_LB_BREAK_AFTER) || - (lbo->after == U_LB_HYPHEN) || - (lbo->after == U_LB_NONSTARTER) || - (lbo->before == U_LB_BREAK_BEFORE)) { - *opportunity = 0; - continue; - } - - /* LB22: Do not break between two ellipses, - * or between letters or numbers and ellipsis. - * AL ^ IN - * ID ^ IN - * IN ^ IN - * NU ^ IN - */ - if ((lbo->after == U_LB_INSEPARABLE) && - ((lbo->before == U_LB_ALPHABETIC) || - (lbo->before == U_LB_IDEOGRAPHIC) || - (lbo->before == U_LB_INSEPARABLE) || - (lbo->before == U_LB_NUMERIC))) { - *opportunity = 0; - continue; - } - - /* LB23: Do not break within ‘a9', ‘3a', or ‘H%'. - * ID ^ PO - * AL ^ NU - * NU ^ AL - */ - if (((lbo->before == U_LB_IDEOGRAPHIC) && (lbo->after == U_LB_POSTFIX_NUMERIC)) || - ((lbo->before == U_LB_ALPHABETIC) && (lbo->after == U_LB_NUMERIC)) || - ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_ALPHABETIC))) { - *opportunity = 0; - continue; - } - - /* LB24: Do not break between prefix and letters or ideographs. - * PR ^ ID - * PR ^ AL - * PO ^ AL - */ - if (((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_IDEOGRAPHIC)) || - ((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_ALPHABETIC)) || - ((lbo->before == U_LB_POSTFIX_NUMERIC) && (lbo->after == U_LB_ALPHABETIC))) { - *opportunity = 0; - continue; - } - - /* LB25: Do not break between the following pairs of classes relevant to numbers: - * CL ^ PO - * CL ^ PR - * NU ^ PO - * NU ^ PR - * PO ^ OP - * PO ^ NU - * PR ^ OP - * PR ^ NU - * HY ^ NU - * IS ^ NU - * NU ^ NU - * SY ^ NU - */ - if (((lbo->before == U_LB_CLOSE_PUNCTUATION) && (lbo->after == U_LB_POSTFIX_NUMERIC)) || - ((lbo->before == U_LB_CLOSE_PUNCTUATION) && (lbo->after == U_LB_PREFIX_NUMERIC)) || - ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_POSTFIX_NUMERIC)) || - ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_PREFIX_NUMERIC)) || - ((lbo->before == U_LB_POSTFIX_NUMERIC) && (lbo->after == U_LB_OPEN_PUNCTUATION)) || - ((lbo->before == U_LB_POSTFIX_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || - ((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_OPEN_PUNCTUATION)) || - ((lbo->before == U_LB_PREFIX_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || - ((lbo->before == U_LB_HYPHEN) && (lbo->after == U_LB_NUMERIC)) || - ((lbo->before == U_LB_INFIX_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || - ((lbo->before == U_LB_NUMERIC) && (lbo->after == U_LB_NUMERIC)) || - ((lbo->before == U_LB_BREAK_SYMBOLS) && (lbo->after == U_LB_NUMERIC))) { - *opportunity = 0; - continue; - } - - /* LB26: Do not break a Korean syllable. - * JL ^ (JL | JV | H2 | H3) - * (JV | H2) ^ (JV | JT) - * (JT | H3) ^ JT - */ - if ((lbo->before == U_LB_JL) && - ((lbo->after == U_LB_JL) || - (lbo->after == U_LB_JV) || - (lbo->after == U_LB_H2) || - (lbo->after == U_LB_H3))) { - *opportunity = 0; - continue; - } - if (((lbo->before == U_LB_JV) || (lbo->before == U_LB_H2)) && - ((lbo->after == U_LB_JV) || (lbo->after == U_LB_JT))) { - *opportunity = 0; - continue; - } - if (((lbo->before == U_LB_JT) || (lbo->before == U_LB_H3)) && - (lbo->after == U_LB_JT)) { - *opportunity = 0; - continue; - } - - /* LB27: Treat a Korean Syllable Block the same as ID. - * (JL | JV | JT | H2 | H3) ^ IN - * (JL | JV | JT | H2 | H3) ^ PO - * PR ^ (JL | JV | JT | H2 | H3) - */ - if (((lbo->before == U_LB_JL) || (lbo->before == U_LB_JV) || (lbo->before == U_LB_JT) || - (lbo->before == U_LB_H2) || (lbo->before == U_LB_H3)) && - (lbo->after == U_LB_INSEPARABLE)) { - *opportunity = 0; - continue; - } - if (((lbo->before == U_LB_JL) || (lbo->before == U_LB_JV) || (lbo->before == U_LB_JT) || - (lbo->before == U_LB_H2) || (lbo->before == U_LB_H3)) && - (lbo->after == U_LB_POSTFIX_NUMERIC)) { - *opportunity = 0; - continue; - } - if ((lbo->before == U_LB_PREFIX_NUMERIC) && - ((lbo->after == U_LB_JL) || (lbo->after == U_LB_JV) || (lbo->after == U_LB_JT) || - (lbo->after == U_LB_H2) || (lbo->after == U_LB_H3))) { - *opportunity = 0; - continue; - } - - /* LB28: Do not break between alphabetics. - * AL ^ AL - */ - if ((lbo->before == U_LB_ALPHABETIC) && (lbo->after == U_LB_ALPHABETIC)) { - *opportunity = 0; - continue; - } - - /* LB29: Do not break between numeric punctuation and alphabetics. - * IS ^ AL - */ - if ((lbo->before == U_LB_INFIX_NUMERIC) && (lbo->after == U_LB_ALPHABETIC)) { - *opportunity = 0; - continue; - } - - /* LB30: Do not break between letters, numbers, or ordinary symbols - * and opening or closing punctuation. - * (AL | NU) ^ OP - * CL ^ (AL | NU) - */ - if (((lbo->before == U_LB_ALPHABETIC) || (lbo->before == U_LB_NUMERIC)) && - (lbo->after == U_LB_OPEN_PUNCTUATION)) { - *opportunity = 0; - continue; - } - if ((lbo->before == U_LB_CLOSE_PUNCTUATION) && - ((lbo->after == U_LB_ALPHABETIC) || (lbo->after == U_LB_NUMERIC))) { - *opportunity = 0; - continue; - } - - /* Unix options begin with a minus sign. */ - if ((lbo->before == U_LB_HYPHEN) && - (lbo->after != U_LB_SPACE) && - (lbo->previous == U_LB_SPACE)) { - *opportunity = 0; - continue; - } - - /* LB31: Break everywhere else. - * ALL _ - * _ ALL - */ - *opportunity = 1; - } -} +#include +#include static int nextBaseCharacter (const UChar **current, const UChar *end) { @@ -1104,33 +98,6 @@ normalizeText ( } #else /* HAVE_ICU */ -typedef struct { - unsigned int index; - int wasSpace; -} LineBreakOpportunitiesState; - -static void -prepareLineBreakOpportunitiesState (LineBreakOpportunitiesState *lbo) { - lbo->index = 0; - lbo->wasSpace = 0; -} - -static void -findLineBreakOpportunities ( - BrailleContractionData *bcd, - LineBreakOpportunitiesState *lbo, - unsigned char *opportunities, - const wchar_t *characters, unsigned int limit -) { - while (lbo->index <= limit) { - int isSpace = testCharacter(bcd, characters[lbo->index], CTC_Space); - opportunities[lbo->index] = lbo->wasSpace && !isSpace; - - lbo->wasSpace = isSpace; - lbo->index += 1; - } -} - static int normalizeText ( BrailleContractionData *bcd, @@ -1142,533 +109,74 @@ normalizeText ( } #endif /* HAVE_ICU */ -static int -contractTextInternally (BrailleContractionData *bcd) { - const wchar_t *srcword = NULL; - BYTE *destword = NULL; - - const wchar_t *srcjoin = NULL; - BYTE *destjoin = NULL; - - BYTE *destlast = NULL; - const wchar_t *literal = NULL; - - unsigned char lineBreakOpportunities[getInputCount(bcd)]; - LineBreakOpportunitiesState lbo; - - prepareLineBreakOpportunitiesState(&lbo); - bcd->previous.opcode = CTO_None; - - while (bcd->input.current < bcd->input.end) { - int wasLiteral = bcd->input.current == literal; - - destlast = bcd->output.current; - setOffset(bcd); - setBefore(bcd); - - if (literal) - if (bcd->input.current >= literal) - if (testCurrent(bcd, CTC_Space) || testPrevious(bcd, CTC_Space)) - literal = NULL; - - if ((!literal && selectRule(bcd, getInputUnconsumed(bcd))) || selectRule(bcd, 1)) { - if (!literal && - ((bcd->current.opcode == CTO_Literal) || - (prefs.expandCurrentWord && - (bcd->input.cursor >= bcd->input.current) && - (bcd->input.cursor < (bcd->input.current + bcd->current.length))))) { - literal = bcd->input.current + bcd->current.length; - - if (!testCurrent(bcd, CTC_Space)) { - if (destjoin) { - bcd->input.current = srcjoin; - bcd->output.current = destjoin; - } else { - bcd->input.current = bcd->input.begin; - bcd->output.current = bcd->output.begin; - } - } - - continue; - } - - if (getContractionTableHeader(bcd)->numberSign && (bcd->previous.opcode != CTO_MidNum) && - !testBefore(bcd, CTC_Digit) && testCurrent(bcd, CTC_Digit)) { - if (!putSequence(bcd, getContractionTableHeader(bcd)->numberSign)) break; - } else if (getContractionTableHeader(bcd)->englishLetterSign && testCurrent(bcd, CTC_Letter)) { - if ((bcd->current.opcode == CTO_Contraction) || - ((bcd->current.opcode != CTO_EndNum) && testBefore(bcd, CTC_Digit)) || - (testCurrent(bcd, CTC_Letter) && - (bcd->current.opcode == CTO_Always) && - (bcd->current.length == 1) && - testBefore(bcd, CTC_Space) && - (((bcd->input.current + 1) == bcd->input.end) || - testNext(bcd, CTC_Space) || - (testNext(bcd, CTC_Punctuation) && - !sameCharacters(bcd, bcd->input.current[1], WC_C('.')) && - !sameCharacters(bcd, bcd->input.current[1], WC_C('\'')))))) { - if (!putSequence(bcd, getContractionTableHeader(bcd)->englishLetterSign)) break; - } - } - - if (prefs.capitalizationMode == CTB_CAP_SIGN) { - if (testCurrent(bcd, CTC_UpperCase)) { - if (!testBefore(bcd, CTC_UpperCase)) { - if (getContractionTableHeader(bcd)->beginCapitalSign && - (bcd->input.current + 1 < bcd->input.end) && testNext(bcd, CTC_UpperCase)) { - if (!putSequence(bcd, getContractionTableHeader(bcd)->beginCapitalSign)) break; - } else if (getContractionTableHeader(bcd)->capitalSign) { - if (!putSequence(bcd, getContractionTableHeader(bcd)->capitalSign)) break; - } - } - } else if (testCurrent(bcd, CTC_LowerCase)) { - if (getContractionTableHeader(bcd)->endCapitalSign && (bcd->input.current - 2 >= bcd->input.begin) && - testPrevious(bcd, CTC_UpperCase) && testRelative(bcd, -2, CTC_UpperCase)) { - if (!putSequence(bcd, getContractionTableHeader(bcd)->endCapitalSign)) break; - } - } - } - - switch (bcd->current.opcode) { - case CTO_LargeSign: - case CTO_LastLargeSign: - if ((bcd->previous.opcode == CTO_LargeSign) && !wasLiteral) { - while ((bcd->output.current > bcd->output.begin) && !bcd->output.current[-1]) bcd->output.current -= 1; - setOffset(bcd); - - { - BYTE **destptrs[] = {&destword, &destjoin, &destlast, NULL}; - BYTE ***destptr = destptrs; - - while (*destptr) { - if (**destptr && (**destptr > bcd->output.current)) **destptr = bcd->output.current; - destptr += 1; - } - } - } - break; - - default: - break; - } - - if (bcd->current.rule->replen && - !((bcd->current.opcode == CTO_Always) && (bcd->current.length == 1))) { - const wchar_t *srcnxt = bcd->input.current + bcd->current.length; - if (!putReplace(bcd, bcd->current.rule, *bcd->input.current)) goto done; - while (++bcd->input.current != srcnxt) clearOffset(bcd); - } else { - const wchar_t *srclim = bcd->input.current + bcd->current.length; - while (1) { - if (!putCharacter(bcd, *bcd->input.current)) goto done; - if (++bcd->input.current == srclim) break; - setOffset(bcd); - } - } - - { - const wchar_t *srcorig = bcd->input.current; - const wchar_t *srcbeg = NULL; - BYTE *destbeg = NULL; - - switch (bcd->current.opcode) { - case CTO_Repeatable: { - const wchar_t *srclim = bcd->input.end - bcd->current.length; - - srcbeg = bcd->input.current - bcd->current.length; - destbeg = destlast; - - while ((bcd->input.current <= srclim) && checkCurrentRule(bcd, bcd->input.current)) { - const wchar_t *srcnxt = bcd->input.current + bcd->current.length; - - do { - clearOffset(bcd); - } while (++bcd->input.current != srcnxt); - } - - break; - } - - case CTO_JoinedWord: - srcbeg = bcd->input.current; - destbeg = bcd->output.current; - - while ((bcd->input.current < bcd->input.end) && testCurrent(bcd, CTC_Space)) { - clearOffset(bcd); - bcd->input.current += 1; - } - break; - - default: - break; - } - - if (srcbeg && (bcd->input.cursor >= srcbeg) && (bcd->input.cursor < bcd->input.current)) { - int repeat = !literal; - literal = bcd->input.current; +CharacterEntry * +getCharacterEntry (BrailleContractionData *bcd, wchar_t character) { + int first = 0; + int last = bcd->table->characters.count - 1; - if (repeat) { - bcd->input.current = srcbeg; - bcd->output.current = destbeg; - continue; - } + while (first <= last) { + int current = (first + last) / 2; + CharacterEntry *entry = &bcd->table->characters.array[current]; - bcd->input.current = srcorig; - } - } + if (entry->value < character) { + first = current + 1; + } else if (entry->value > character) { + last = current - 1; } else { - bcd->current.opcode = CTO_Always; - if (!putCharacter(bcd, *bcd->input.current)) break; - bcd->input.current += 1; - } - - findLineBreakOpportunities(bcd, &lbo, lineBreakOpportunities, bcd->input.begin, getInputConsumed(bcd)); - if (lineBreakOpportunities[getInputConsumed(bcd)]) { - srcjoin = bcd->input.current; - destjoin = bcd->output.current; - - if (bcd->current.opcode != CTO_JoinedWord) { - srcword = bcd->input.current; - destword = bcd->output.current; - } - } - - if ((bcd->output.current == bcd->output.begin) || bcd->output.current[-1]) { - bcd->previous.opcode = bcd->current.opcode; - } - } - -done: - if (bcd->input.current < bcd->input.end) { - if (destword && (destword > bcd->output.begin) && - (!(testPrevious(bcd, CTC_Space) || testCurrent(bcd, CTC_Space)) || - (bcd->previous.opcode == CTO_JoinedWord))) { - bcd->input.current = srcword; - bcd->output.current = destword; - } else if (destlast) { - bcd->output.current = destlast; + return entry; } } - return 1; -} - -static int -putExternalRequests (BrailleContractionData *bcd) { - typedef enum { - REQ_TEXT, - REQ_NUMBER - } ExternalRequestType; - - typedef struct { - const char *name; - ExternalRequestType type; - - union { - struct { - const wchar_t *start; - size_t count; - } text; - - unsigned int number; - } value; - } ExternalRequestEntry; - - const ExternalRequestEntry externalRequestTable[] = { - { .name = "cursor-position", - .type = REQ_NUMBER, - .value.number = bcd->input.cursor? bcd->input.cursor-bcd->input.begin+1: 0 - }, - - { .name = "expand-current-word", - .type = REQ_NUMBER, - .value.number = prefs.expandCurrentWord - }, - - { .name = "capitalization-mode", - .type = REQ_NUMBER, - .value.number = prefs.capitalizationMode - }, - - { .name = "maximum-length", - .type = REQ_NUMBER, - .value.number = getOutputCount(bcd) - }, - - { .name = "text", - .type = REQ_TEXT, - .value.text = { - .start = bcd->input.begin, - .count = getInputCount(bcd) - } - }, - - { .name = NULL } - }; - - FILE *stream = bcd->table->data.external.standardInput; - const ExternalRequestEntry *req = externalRequestTable; - - while (req->name) { - if (fputs(req->name, stream) == EOF) goto outputError; - if (fputc('=', stream) == EOF) goto outputError; - - switch (req->type) { - case REQ_TEXT: { - const wchar_t *character = req->value.text.start; - const wchar_t *end = character + req->value.text.count; - - while (character < end) { - Utf8Buffer utf8; - size_t utfs = convertWcharToUtf8(*character++, utf8); + if (bcd->table->characters.count == bcd->table->characters.size) { + int newSize = bcd->table->characters.size; + newSize = newSize? newSize<<1: 0X80; - if (!utfs) return 0; - if (fputs(utf8, stream) == EOF) goto outputError; - } + { + CharacterEntry *newArray = realloc(bcd->table->characters.array, (newSize * sizeof(*newArray))); - break; + if (!newArray) { + logMallocError(); + return NULL; } - case REQ_NUMBER: - if (fprintf(stream, "%u", req->value.number) == EOF) goto outputError; - break; - - default: - logMessage(LOG_WARNING, "unimplemented external contraction request property type: %s: %u (%s)", bcd->table->command, req->type, req->name); - return 0; - } - - if (fputc('\n', stream) == EOF) goto outputError; - req += 1; - } - - if (fflush(stream) == EOF) goto outputError; - return 1; - -outputError: - logMessage(LOG_WARNING, "external contraction output error: %s: %s", bcd->table->command, strerror(errno)); - return 0; -} - -static const unsigned char brfTable[0X40] = { - /* 0X20 */ 0, - /* 0X21 ! */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, - /* 0X22 " */ BRL_DOT_5, - /* 0X23 # */ BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X24 $ */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_6, - /* 0X25 % */ BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_6, - /* 0X26 & */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, - /* 0X27 ' */ BRL_DOT_3, - /* 0X28 ( */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, - /* 0X29 ) */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X2A * */ BRL_DOT_1 | BRL_DOT_6, - /* 0X2B + */ BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, - /* 0X2C , */ BRL_DOT_6, - /* 0X2D - */ BRL_DOT_3 | BRL_DOT_6, - /* 0X2E . */ BRL_DOT_4 | BRL_DOT_6, - /* 0X2F / */ BRL_DOT_3 | BRL_DOT_4, - /* 0X30 0 */ BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, - /* 0X31 1 */ BRL_DOT_2, - /* 0X32 2 */ BRL_DOT_2 | BRL_DOT_3, - /* 0X33 3 */ BRL_DOT_2 | BRL_DOT_5, - /* 0X34 4 */ BRL_DOT_2 | BRL_DOT_5 | BRL_DOT_6, - /* 0X35 5 */ BRL_DOT_2 | BRL_DOT_6, - /* 0X36 6 */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5, - /* 0X37 7 */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, - /* 0X38 8 */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_6, - /* 0X39 9 */ BRL_DOT_3 | BRL_DOT_5, - /* 0X3A : */ BRL_DOT_1 | BRL_DOT_5 | BRL_DOT_6, - /* 0X3B ; */ BRL_DOT_5 | BRL_DOT_6, - /* 0X3C < */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_6, - /* 0X3D = */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X3E > */ BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, - /* 0X3F ? */ BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X40 @ */ BRL_DOT_4, - /* 0X41 A */ BRL_DOT_1, - /* 0X42 B */ BRL_DOT_1 | BRL_DOT_2, - /* 0X43 C */ BRL_DOT_1 | BRL_DOT_4, - /* 0X44 D */ BRL_DOT_1 | BRL_DOT_4 | BRL_DOT_5, - /* 0X45 E */ BRL_DOT_1 | BRL_DOT_5, - /* 0X46 F */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4, - /* 0X47 G */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5, - /* 0X48 H */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_5, - /* 0X49 I */ BRL_DOT_2 | BRL_DOT_4, - /* 0X4A J */ BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5, - /* 0X4B K */ BRL_DOT_1 | BRL_DOT_3, - /* 0X4C L */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3, - /* 0X4D M */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4, - /* 0X4E N */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, - /* 0X4F O */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_5, - /* 0X50 P */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4, - /* 0X51 Q */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, - /* 0X52 R */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_5, - /* 0X53 S */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4, - /* 0X54 T */ BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5, - /* 0X55 U */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_6, - /* 0X56 V */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_3 | BRL_DOT_6, - /* 0X57 W */ BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X58 X */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_6, - /* 0X59 Y */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X5A Z */ BRL_DOT_1 | BRL_DOT_3 | BRL_DOT_5 | BRL_DOT_6, - /* 0X5B [ */ BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_6, - /* 0X5C \ */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_5 | BRL_DOT_6, - /* 0X5D ] */ BRL_DOT_1 | BRL_DOT_2 | BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6, - /* 0X5E ^ */ BRL_DOT_4 | BRL_DOT_5, - /* 0X5F _ */ BRL_DOT_4 | BRL_DOT_5 | BRL_DOT_6 -}; - -static int -handleExternalResponse_brf (BrailleContractionData *bcd, const char *value) { - int useDot7 = prefs.capitalizationMode == CTB_CAP_DOT7; - - while (*value && (bcd->output.current < bcd->output.end)) { - unsigned char brf = *value++ & 0XFF; - unsigned char dots = 0; - unsigned char superimpose = 0; - - if ((brf >= 0X60) && (brf <= 0X7F)) { - brf -= 0X20; - } else if ((brf >= 0X41) && (brf <= 0X5A)) { - if (useDot7) superimpose |= BRL_DOT_7; + bcd->table->characters.array = newArray; + bcd->table->characters.size = newSize; } - - if ((brf >= 0X20) && (brf <= 0X5F)) dots = brfTable[brf - 0X20] | superimpose; - *bcd->output.current++ = dots; } - return 1; -} - -static int -handleExternalResponse_consumedLength (BrailleContractionData *bcd, const char *value) { - int length; - - if (!isInteger(&length, value)) return 0; - if (length < 1) return 0; - if (length > getInputCount(bcd)) return 0; - - bcd->input.current = bcd->input.begin + length; - return 1; -} - -static int -handleExternalResponse_outputOffsets (BrailleContractionData *bcd, const char *value) { - if (bcd->input.offsets) { - int previous = CTB_NO_OFFSET; - unsigned int count = getInputCount(bcd); - unsigned int index = 0; - - while (*value && (index < count)) { - int offset; - - { - char *delimiter = strchr(value, ','); + memmove(&bcd->table->characters.array[first+1], + &bcd->table->characters.array[first], + (bcd->table->characters.count - first) * sizeof(*bcd->table->characters.array)); + bcd->table->characters.count += 1; - if (delimiter) { - int ok; + { + CharacterEntry *entry = &bcd->table->characters.array[first]; + memset(entry, 0, sizeof(*entry)); + entry->value = entry->uppercase = entry->lowercase = character; - { - char oldDelimiter = *delimiter; - *delimiter = 0; - ok = isInteger(&offset, value); - *delimiter = oldDelimiter; - } + if (iswspace(character)) { + entry->attributes |= CTC_Space; + } else if (iswalpha(character)) { + entry->attributes |= CTC_Letter; - if (!ok) return 0; - value = delimiter + 1; - } else if (isInteger(&offset, value)) { - value += strlen(value); - } else { - return 0; - } + if (iswupper(character)) { + entry->attributes |= CTC_UpperCase; + entry->lowercase = towlower(character); } - if (offset < ((index == 0)? 0: previous)) return 0; - if (offset >= getOutputCount(bcd)) return 0; - - bcd->input.offsets[index++] = (offset == previous)? CTB_NO_OFFSET: offset; - previous = offset; - } - } - - return 1; -} - -typedef struct { - const char *name; - int (*handler) (BrailleContractionData *bcd, const char *value); - unsigned stop:1; -} ExternalResponseEntry; - -static const ExternalResponseEntry externalResponseTable[] = { - { .name = "brf", - .stop = 1, - .handler = handleExternalResponse_brf - }, - - { .name = "consumed-length", - .handler = handleExternalResponse_consumedLength - }, - - { .name = "output-offsets", - .handler = handleExternalResponse_outputOffsets - }, - - { .name = NULL } -}; - -static int -getExternalResponses (BrailleContractionData *bcd) { - FILE *stream = bcd->table->data.external.standardOutput; - - while (readLine(stream, &bcd->table->data.external.input.buffer, &bcd->table->data.external.input.size)) { - int ok = 0; - int stop = 0; - char *delimiter = strchr(bcd->table->data.external.input.buffer, '='); - - if (delimiter) { - const char *value = delimiter + 1; - const ExternalResponseEntry *rsp = externalResponseTable; - - char oldDelimiter = *delimiter; - *delimiter = 0; - - while (rsp->name) { - if (strcmp(bcd->table->data.external.input.buffer, rsp->name) == 0) { - if (rsp->handler(bcd, value)) ok = 1; - if (rsp->stop) stop = 1; - break; - } - - rsp += 1; + if (iswlower(character)) { + entry->attributes |= CTC_LowerCase; + entry->uppercase = towupper(character); } - - *delimiter = oldDelimiter; + } else if (iswdigit(character)) { + entry->attributes |= CTC_Digit; + } else if (iswpunct(character)) { + entry->attributes |= CTC_Punctuation; } - if (!ok) logMessage(LOG_WARNING, "unexpected external contraction response: %s: %s", bcd->table->command, bcd->table->data.external.input.buffer); - if (stop) return 1; - } - - logMessage(LOG_WARNING, "incomplete external contraction response: %s", bcd->table->command); - return 0; -} - -static int -contractTextExternally (BrailleContractionData *bcd) { - setOffset(bcd); - while (++bcd->input.current < bcd->input.end) clearOffset(bcd); - - if (startContractionCommand(bcd->table)) { - if (putExternalRequests(bcd)) { - if (getExternalResponses(bcd)) { - return 1; - } - } + bcd->table->translationMethods->finishCharacterEntry(bcd, entry); + return entry; } - - stopContractionCommand(bcd->table); - return 0; } static inline int @@ -1815,7 +323,6 @@ contractText ( int contracted; { - int (*const contract) (BrailleContractionData *bcd) = bcd.table->command? contractTextExternally: contractTextInternally; const size_t size = getInputCount(&bcd); wchar_t buffer[size]; unsigned int map[size + 1]; @@ -1843,7 +350,7 @@ contractText ( } } - contracted = contract(&bcd); + contracted = contractionTable->translationMethods->contractText(&bcd); if (bcd.input.offsets) { size_t mapIndex = length; @@ -1866,7 +373,7 @@ contractText ( bcd.input.current = bcd.input.begin + map[bcd.input.current - buffer]; bcd.input.end = oldEnd; } else { - contracted = contract(&bcd); + contracted = contractionTable->translationMethods->contractText(&bcd); } } diff --git a/Programs/ctb_translate.h b/Programs/ctb_translate.h new file mode 100644 index 0000000000000000000000000000000000000000..6f5cecac05d57688e34e8e8204c7ee1f42b82d4c --- /dev/null +++ b/Programs/ctb_translate.h @@ -0,0 +1,148 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2018 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.com/ + * + * This software is maintained by Dave Mielke . + */ + +#ifndef BRLTTY_INCLUDED_CTB_TRANSLATE +#define BRLTTY_INCLUDED_CTB_TRANSLATE + +#include "ctb.h" +#include "ctb_internal.h" +#include "prefs.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef struct { + ContractionTable *const table; + + struct { + const wchar_t *begin; + const wchar_t *end; + const wchar_t *current; + const wchar_t *cursor; + int *offsets; + } input; + + struct { + BYTE *begin; + BYTE *end; + BYTE *current; + } output; + + struct { + const ContractionTableRule *rule; + ContractionTableOpcode opcode; + int length; + + wchar_t before; + wchar_t after; + } current; + + struct { + ContractionTableOpcode opcode; + } previous; +} BrailleContractionData; + +struct ContractionTableTranslationMethodsStruct { + int (*contractText) (BrailleContractionData *bcd); + void (*finishCharacterEntry) (BrailleContractionData *bcd, CharacterEntry *entry); +}; + +static inline unsigned int +getInputCount (BrailleContractionData *bcd) { + return bcd->input.end - bcd->input.begin; +} + +static inline unsigned int +getInputConsumed (BrailleContractionData *bcd) { + return bcd->input.current - bcd->input.begin; +} + +static inline unsigned int +getInputUnconsumed (BrailleContractionData *bcd) { + return bcd->input.end - bcd->input.current; +} + +static inline unsigned int +getOutputCount (BrailleContractionData *bcd) { + return bcd->output.end - bcd->output.begin; +} + +static inline unsigned int +getOutputConsumed (BrailleContractionData *bcd) { + return bcd->output.current - bcd->output.begin; +} + +static inline void +assignOffset (BrailleContractionData *bcd, size_t value) { + if (bcd->input.offsets) bcd->input.offsets[getInputConsumed(bcd)] = value; +} + +static inline void +setOffset (BrailleContractionData *bcd) { + assignOffset(bcd, getOutputConsumed(bcd)); +} + +static inline void +clearOffset (BrailleContractionData *bcd) { + assignOffset(bcd, CTB_NO_OFFSET); +} + +extern CharacterEntry *getCharacterEntry (BrailleContractionData *bcd, wchar_t character); + +static inline int +testCharacter (BrailleContractionData *bcd, wchar_t character, ContractionTableCharacterAttributes attributes) { + const CharacterEntry *entry = getCharacterEntry(bcd, character); + return entry && (attributes & entry->attributes); +} + +static inline int +testRelative (BrailleContractionData *bcd, int offset, ContractionTableCharacterAttributes attributes) { + return testCharacter(bcd, bcd->input.current[offset], attributes); +} + +static inline int +testCurrent (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { + return testRelative(bcd, 0, attributes); +} + +static inline int +testPrevious (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { + return testRelative(bcd, -1, attributes); +} + +static inline int +testNext (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { + return testRelative(bcd, 1, attributes); +} + +static inline int +testBefore (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { + return testCharacter(bcd, bcd->current.before, attributes); +} + +static inline int +testAfter (BrailleContractionData *bcd, ContractionTableCharacterAttributes attributes) { + return testCharacter(bcd, bcd->current.after, attributes); +} + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* BRLTTY_INCLUDED_CTB_TRANSLATE */ diff --git a/Programs/dataarea.c b/Programs/dataarea.c index 25f6f1da0722315307e1c838cede987ee9699150..8abe94e453e3d6d375e46eda80263055aaecee2a 100644 --- a/Programs/dataarea.c +++ b/Programs/dataarea.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/datafile.c b/Programs/datafile.c index f0ca77ec75d529dae0aed4249cb2c93a5c85044f..e70deb506b6da28c3d930c49b26925bfd4dcbbe5 100644 --- a/Programs/datafile.c +++ b/Programs/datafile.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/defaults.h b/Programs/defaults.h index b7fa0c2d18f0d077011dc5672fe7224fbb3b21f7..da0764cc8022b7a4921106e81e70cd785d40bbcf 100644 --- a/Programs/defaults.h +++ b/Programs/defaults.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -65,14 +65,16 @@ extern "C" { #define DEFAULT_CAPITALS_VISIBLE_TIME 60 /* for blinking caps */ #define DEFAULT_CAPITALS_INVISIBLE_TIME 20 -#define DEFAULT_SKIP_IDENTICAL_LINES 0 /* 1 = skip all identical lines after first */ -#define DEFAULT_SKIP_BLANK_BRAILLE_WINDOWS 0 /* 1 = skip blank windows */ +#define DEFAULT_WORD_WRAP 0 +#define DEFAULT_SKIP_IDENTICAL_LINES 0 +#define DEFAULT_SKIP_BLANK_BRAILLE_WINDOWS 0 #define DEFAULT_SKIP_BLANK_BRAILLE_WINDOWS_MODE sbwEndOfLine -#define DEFAULT_SLIDING_BRAILLE_WINDOW 0 /* 1 for on, 0 for off */ +#define DEFAULT_SLIDING_BRAILLE_WINDOW 0 #define DEFAULT_EAGER_SLIDING_BRAILLE_WINDOW 0 #define DEFAULT_BRAILLE_WINDOW_OVERLAP 0 #define DEFAULT_CURSOR_TRACKING_DELAY ctd250ms +#define DEFAULT_TRACK_SCREEN_SCROLL 0 /* 1 for on, 0 for off */ #define DEFAULT_TRACK_SCREEN_POINTER 0 /* 1 for on, 0 for off */ #define DEFAULT_HIGHLIGHT_BRAILLE_WINDOW_LOCATION 0 /* 1 for on, 0 for off */ diff --git a/Programs/device.c b/Programs/device.c index e998fc80e4eef1092b3a356f8fbd546d94f322dd..2eb30da66d361fc1eb7b3b648af219a99414abee 100644 --- a/Programs/device.c +++ b/Programs/device.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -167,31 +167,6 @@ resolveDeviceName (const char *const *names, const char *description) { return device; } -int -isQualifiedDevice (const char **identifier, const char *qualifier) { - const char *delimiter = strchr(*identifier, PARAMETER_QUALIFIER_CHARACTER); - - if (delimiter) { - size_t count = delimiter - *identifier; - - if (!qualifier) return 1; - - if (count) { - if (strncasecmp(*identifier, qualifier, count) == 0) { - *identifier += count + 1; - return 1; - } - } - } - - return 0; -} - -int -isUnqualifiedDevice (const char *identifier) { - return !isQualifiedDevice(&identifier, NULL); -} - char ** getDeviceParameters (const char *const *names, const char *identifier) { char parameters[strlen(names[0]) + 1 + strlen(identifier) + 1]; diff --git a/Programs/driver.c b/Programs/driver.c index 09d179f80264466e340611fe5e69813dab16ad19..21e7b0b68515d10b7d325e2ac23b80c278c54037 100644 --- a/Programs/driver.c +++ b/Programs/driver.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -22,8 +22,8 @@ #include "driver.h" void -unsupportedDevice (const char *identifier) { - logMessage(LOG_WARNING, "unsupported device: %s", identifier); +unsupportedDeviceIdentifier (const char *identifier) { + logMessage(LOG_WARNING, "unsupported device identifier: %s", identifier); } void diff --git a/Programs/drivers.c b/Programs/drivers.c index 5cfa600a28bc5185fb3c700fadbc1483fc2df3eb..ee85447846526cb72fb5cfddbaae7d66ed3bc687 100644 --- a/Programs/drivers.c +++ b/Programs/drivers.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/dynld_dlfcn.c b/Programs/dynld_dlfcn.c index 774ff2d1237b2be846d381b5a48a5f0b03b2ebee..934ecdc5fa196b468b4eb98f195c00294e5cb531 100644 --- a/Programs/dynld_dlfcn.c +++ b/Programs/dynld_dlfcn.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/dynld_dyld.c b/Programs/dynld_dyld.c index daa7ac1271380ecfcbb0f743e5b1748f50ba07f0..344c42d84b1ccc4981e2dcf2f0f9b1004399637d 100644 --- a/Programs/dynld_dyld.c +++ b/Programs/dynld_dyld.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/dynld_grub.c b/Programs/dynld_grub.c index 612eaa2a813c76ba7522bd784f8dac99dc731a80..66acf5913f4589f4d3e596d798d3f9f97564016c 100644 --- a/Programs/dynld_grub.c +++ b/Programs/dynld_grub.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/dynld_none.c b/Programs/dynld_none.c index 69ff2dd97c6a52588f9ae7c09194b9189eb2f393..9fa658cc0fb7d39bafba6759e71b1a06d65225be 100644 --- a/Programs/dynld_none.c +++ b/Programs/dynld_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/dynld_shl.c b/Programs/dynld_shl.c index 799c857f7f3085bc26fb0507468cd5c7ce273d70..e4a858f5a007f12ba480744232e70363a316323e 100644 --- a/Programs/dynld_shl.c +++ b/Programs/dynld_shl.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/dynld_windows.c b/Programs/dynld_windows.c index a9a9de2eec99c3bac017026060750407142e0014..2ee8542c91affcb7b27a7516d4888533c7d69fd6 100644 --- a/Programs/dynld_windows.c +++ b/Programs/dynld_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/file.c b/Programs/file.c index c57d00cd35e1a95deceaacb26a4cb317ea0c3df0..14fa3a8a1105b2e3bc92b625718bece22e39bcc4 100644 --- a/Programs/file.c +++ b/Programs/file.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -42,7 +42,7 @@ int isPathDelimiter (const char character) { - return character == '/'; + return character == FILE_PATH_DELIMITER; } int @@ -203,7 +203,7 @@ ensureFileExtension (const char *path, const char *extension) { int count = 0; strings[count++] = path; - if (!locatePathExtension(path)) strings[count++] = extension; + if (extension && !locatePathExtension(path)) strings[count++] = extension; return joinStrings(strings, count); } diff --git a/Programs/fm_adlib.c b/Programs/fm_adlib.c index c5c30a87786a44c19bbd74708448a53d09efa596..3bf3a5334878cd8c41cb2dc9be54f4f9d3cbd144 100644 --- a/Programs/fm_adlib.c +++ b/Programs/fm_adlib.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/fm_none.c b/Programs/fm_none.c index 421b55f8afaaa40a7aa8a762f7da9ad80d496135..e8162ac034e2dd85e09a530b1076b737868dc8c4 100644 --- a/Programs/fm_none.c +++ b/Programs/fm_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/gio.c b/Programs/gio.c index 3ff294c1881fc6ff9bca8851777bf36390b291b9..94252bffdd2320d76204a4f225f84613d2385011 100644 --- a/Programs/gio.c +++ b/Programs/gio.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -575,7 +575,7 @@ gioNewHandleInputObject ( } } - if (asyncSetAlarmIn(&hio->pollAlarm, 0, handleInputAlarm, hio)) { + if (asyncNewRelativeAlarm(&hio->pollAlarm, 0, handleInputAlarm, hio)) { if (asyncResetAlarmEvery(hio->pollAlarm, pollInterval)) { return hio; } diff --git a/Programs/gio_bluetooth.c b/Programs/gio_bluetooth.c index 1cd83e6eb2262a17ae8ea2ea2d61c1130defe7b0..442ed79884b93ada3dc003708f3dedd80f32a7a0 100644 --- a/Programs/gio_bluetooth.c +++ b/Programs/gio_bluetooth.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -92,7 +92,7 @@ isBluetoothSupported (const GioDescriptor *descriptor) { static int testBluetoothIdentifier (const char **identifier) { - return isBluetoothDevice(identifier); + return isBluetoothDeviceIdentifier(identifier); } static const GioOptions * diff --git a/Programs/gio_internal.h b/Programs/gio_internal.h index 9004e82123fe198f007948f6cb6ed4323b8c0f18..fcdf48b676c5eafdfff4e0f7b2591f148165f3ad 100644 --- a/Programs/gio_internal.h +++ b/Programs/gio_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/gio_null.c b/Programs/gio_null.c index ac4cb9342df219660c9a7cbf3013ffb9db1dd031..1f192370917da5f10923b1f6c51a8c56c2465c35 100644 --- a/Programs/gio_null.c +++ b/Programs/gio_null.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -23,7 +23,7 @@ #include "log.h" #include "io_generic.h" #include "gio_internal.h" -#include "device.h" +#include "parse.h" struct GioHandleStruct { int place_holder; @@ -69,7 +69,7 @@ isNullSupported (const GioDescriptor *descriptor) { static int testNullIdentifier (const char **identifier) { - return isQualifiedDevice(identifier, "null"); + return hasQualifier(identifier, "null"); } static const GioOptions * diff --git a/Programs/gio_serial.c b/Programs/gio_serial.c index e52a2996bfa19bad71c26a44eafd1b0934bb2931..e9f039dafec192c454a775833f8e885192abfa69 100644 --- a/Programs/gio_serial.c +++ b/Programs/gio_serial.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -95,7 +95,7 @@ isSerialSupported (const GioDescriptor *descriptor) { static int testSerialIdentifier (const char **identifier) { - return isSerialDevice(identifier); + return isSerialDeviceIdentifier(identifier); } static const GioOptions * diff --git a/Programs/gio_usb.c b/Programs/gio_usb.c index 927cfdd3bfab95e8074e21b6ac4a7e64bcc1eda4..bf10d908ca6c184355a2946593ff5fa19187dae1 100644 --- a/Programs/gio_usb.c +++ b/Programs/gio_usb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -289,7 +289,7 @@ isUsbSupported (const GioDescriptor *descriptor) { static int testUsbIdentifier (const char **identifier) { - return isUsbDevice(identifier); + return isUsbDeviceIdentifier(identifier); } static const GioOptions * diff --git a/Programs/hidkeys.c b/Programs/hidkeys.c index f3842ff1df3705cce964fb817b7b75f0af05faf5..1bcf2afcac44b12ac12efc635df070e10e3825f8 100644 --- a/Programs/hidkeys.c +++ b/Programs/hidkeys.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hidkeys.h b/Programs/hidkeys.h index e7360d61af5791e3cc7bb3035e423a7cb1d9f27c..e9767a3a6dfb619178aaa474c46b5f3b749ac681 100644 --- a/Programs/hidkeys.h +++ b/Programs/hidkeys.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd.c b/Programs/hostcmd.c index bfc7a8eb2b12096bc9ba218cc118236fe6dcdf62..e8a5a0eab0ce50f50f556f70893828d914685cee 100644 --- a/Programs/hostcmd.c +++ b/Programs/hostcmd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_internal.h b/Programs/hostcmd_internal.h index 04fb1a9024e6e5628ea383e8fd22886cdffe7baa..105d74bbc32fec0b273abc5f65898ba4f1fd8f86 100644 --- a/Programs/hostcmd_internal.h +++ b/Programs/hostcmd_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_none.c b/Programs/hostcmd_none.c index 36a0ee7474f69b90c1d0ecc57baaa1567fb46601..497d64b88ba41828f5a0d4f1d78c6fc9a863ca11 100644 --- a/Programs/hostcmd_none.c +++ b/Programs/hostcmd_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_none.h b/Programs/hostcmd_none.h index a76fad2323820b64d549e4e7a7075f3d24813f36..e9f88057931f9ec850b41d12c28d6f7b02e2808f 100644 --- a/Programs/hostcmd_none.h +++ b/Programs/hostcmd_none.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_unix.c b/Programs/hostcmd_unix.c index 1d7f9737355b68e83e71e84b3d72a5a927e5205d..88c6fb7b0633e7533aea3fc2882716b8df1c07f1 100644 --- a/Programs/hostcmd_unix.c +++ b/Programs/hostcmd_unix.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_unix.h b/Programs/hostcmd_unix.h index 4e575128d0493d3a435c60c9dc7b617ff75a7209..658119d6534844a360ab2967e131a1f22c21e425 100644 --- a/Programs/hostcmd_unix.h +++ b/Programs/hostcmd_unix.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_windows.c b/Programs/hostcmd_windows.c index 93883312828bafd40bd24fdaeba38b5019fec038..8dd9412e0843ad18269798e01ab2718410403911 100644 --- a/Programs/hostcmd_windows.c +++ b/Programs/hostcmd_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/hostcmd_windows.h b/Programs/hostcmd_windows.h index e570c275244950756a8e425f205678776a6059d4..33048667ed2390e78653fd0a00e0134c96a66927 100644 --- a/Programs/hostcmd_windows.h +++ b/Programs/hostcmd_windows.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/io_misc.c b/Programs/io_misc.c index eb9a53649cd215f493af19b958ee91c69fbada9d..f6c79e825a6b57dc6b0a254fbdb5c2f5090fa117 100644 --- a/Programs/io_misc.c +++ b/Programs/io_misc.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd.c b/Programs/kbd.c index 1078997c088787e8a219bab8717f8bd3edab09c5..cece72e92706334fafdb88289a36b1079e70e0de 100644 --- a/Programs/kbd.c +++ b/Programs/kbd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd.h b/Programs/kbd.h index 123e525af7a6a94c97beaf04658e0e0702ac5b13..22eb5ada6197483d6fab4e16305ea09300dab775 100644 --- a/Programs/kbd.h +++ b/Programs/kbd.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd_android.c b/Programs/kbd_android.c index a72106e65d1cc7cd96499a7f4e1028a31725db29..e1cb82ccae95f38e5e41a2a2bb9cfdea7b4bf322 100644 --- a/Programs/kbd_android.c +++ b/Programs/kbd_android.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd_android.h b/Programs/kbd_android.h index afb067815d12763647b04a0ddbf54a00b0b69918..fb79e5180973d718ddf0caa09944873296c0f770 100644 --- a/Programs/kbd_android.h +++ b/Programs/kbd_android.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd_internal.h b/Programs/kbd_internal.h index 10fb70fd0fa392af552d566b4c11cd34191cee8f..1e6d385b22885de97f6ffd0ea8adeb56f3baf982 100644 --- a/Programs/kbd_internal.h +++ b/Programs/kbd_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd_keycodes.c b/Programs/kbd_keycodes.c index 9f8bb42caf5ec7c70fa05da887dd017026c145f5..aa8a03447912a997a66ea9ba4464973cdd4c3386 100644 --- a/Programs/kbd_keycodes.c +++ b/Programs/kbd_keycodes.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/kbd_linux.c b/Programs/kbd_linux.c index 4d629284fe8e415f437bc42fe95b3fa207d28b4b..7c23fabe4cdb22cedf18ae8b130068f7f7fc8a3e 100644 --- a/Programs/kbd_linux.c +++ b/Programs/kbd_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -880,9 +880,9 @@ ASYNC_INPUT_CALLBACK(handleKobjectUeventString) { snprintf(path, sizeof(path), "/dev/input/event%d", event); if ((kio->kix->device.path = strdup(path))) { - if (asyncSetAlarmIn(&kio->kix->udevDelay, - LINUX_INPUT_DEVICE_OPEN_DELAY, - openLinuxInputDevice, kio)) { + if (asyncNewRelativeAlarm(&kio->kix->udevDelay, + LINUX_INPUT_DEVICE_OPEN_DELAY, + openLinuxInputDevice, kio)) { break; } } else { diff --git a/Programs/kbd_none.c b/Programs/kbd_none.c index 43a03114b349f5fa453709232f0d3ea0170766bb..a7208b37eee96931fb9bb77451028c081a20aac3 100644 --- a/Programs/kbd_none.c +++ b/Programs/kbd_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_audit.c b/Programs/ktb_audit.c index bedbce4d5b7341cf26d1744b1a0cca1629ed7c5f..f6654fae2a498376c771e555512dfa9c5e523997 100644 --- a/Programs/ktb_audit.c +++ b/Programs/ktb_audit.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_cmds.c b/Programs/ktb_cmds.c index 8f6a7a37ef9c2058c9c3389e227606a5f137cb0c..242f1dfc5c1756ed38abfb487e77acd52ffe6182 100644 --- a/Programs/ktb_cmds.c +++ b/Programs/ktb_cmds.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_compile.c b/Programs/ktb_compile.c index 48571ff449eff9d32818c727e4fc4ccce5b10520..eb64d115ad2333d909b66e4a1eeb1fbddb432168 100644 --- a/Programs/ktb_compile.c +++ b/Programs/ktb_compile.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -1031,6 +1031,83 @@ static DATA_OPERANDS_PROCESSOR(processIfNotKeyOperands) { return processKeyTestOperands(file, 0, data); } +static DATA_CONDITION_TESTER(testPlatformName) { + static const wchar_t *const platforms[] = { +#ifdef __ANDROID__ + WS_C("android"), +#endif /* __ANDROID__ */ + +#ifdef __APPLE__ + WS_C("apple"), +#endif /* __APPLE__ */ + +#ifdef __CYGWIN__ + WS_C("cygwin"), +#endif /* __CYGWIN__ */ + +#ifdef __MSDOS__ + WS_C("dos"), +#endif /* __MSDOS__ */ + +#ifdef GRUB_RUNTIME + WS_C("grub"), +#endif /* GRUB_RUNTIME */ + +#ifdef __linux__ + WS_C("linux"), +#endif /* __linux__ */ + +#ifdef __MINGW32__ + WS_C("mingw32"), +#endif /* __MINGW32__ */ + +#ifdef __MINGW64__ + WS_C("mingw64"), +#endif /* __MINGW64__ */ + +#ifdef __OpenBSD__ + WS_C("openbsd"), +#endif /* __OpenBSD__ */ + +#ifdef __sun__ + WS_C("sun"), +#endif /* __sun__ */ + +#ifdef WINDOWS + WS_C("windows"), +#endif /* WINDOWS */ + + NULL + }; + + const wchar_t *const *platform = platforms; + + while (*platform) { + if (identifier->length == wcslen(*platform)) { + if (wcsncmp(*platform, identifier->characters, identifier->length) == 0) { + return 1; + } + } + + platform += 1; + } + + return 0; +} + +static int +processPlatformTestOperands (DataFile *file, int isDefined, void *data) { + return processConditionOperands(file, testPlatformName, !isDefined, "platform name", data); +} + +static DATA_OPERANDS_PROCESSOR(processIfPlatformOperands) { + return processPlatformTestOperands(file, 1, data); +} + +static DATA_OPERANDS_PROCESSOR(processIfNotPlatformOperands) { + return processPlatformTestOperands(file, 0, data); +} + static DATA_OPERANDS_PROCESSOR(processIncludeWrapper) { KeyTableData *ktd = data; int result; @@ -1178,6 +1255,8 @@ static DATA_OPERANDS_PROCESSOR(processKeyTableOperands) { {.name=WS_C("hotkey"), .processor=processHotkeyOperands}, {.name=WS_C("ifkey"), .processor=processIfKeyOperands, .unconditional=1}, {.name=WS_C("ifnotkey"), .processor=processIfNotKeyOperands, .unconditional=1}, + {.name=WS_C("ifplatform"), .processor=processIfPlatformOperands, .unconditional=1}, + {.name=WS_C("ifnotplatform"), .processor=processIfNotPlatformOperands, .unconditional=1}, {.name=WS_C("ignore"), .processor=processIgnoreOperands}, {.name=WS_C("include"), .processor=processIncludeWrapper}, {.name=WS_C("map"), .processor=processMapOperands}, diff --git a/Programs/ktb_inspect.h b/Programs/ktb_inspect.h index e7489a44a8fd226f7a6aab71d7cc2f53688c0e54..1834b168818cd0848e2be26ea9e35697d916c22c 100644 --- a/Programs/ktb_inspect.h +++ b/Programs/ktb_inspect.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_internal.h b/Programs/ktb_internal.h index f789313f88325bad6a937514d58a07287f33a0ff..b4f0c9feed7277b74e061492135708ac85dc74b7 100644 --- a/Programs/ktb_internal.h +++ b/Programs/ktb_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_keyboard.c b/Programs/ktb_keyboard.c index 4d797888c6a68b6db17c91e5d9ff4d841033bd6c..bd83f30b5538f2c0b42098fc9b6e112a8744c1cd 100644 --- a/Programs/ktb_keyboard.c +++ b/Programs/ktb_keyboard.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_keyboard.h b/Programs/ktb_keyboard.h index ab3e3c6a7da534d581315bd58457ae6cd352b9e0..70ce1c6c8be078580544465b97056156f8f17ad1 100644 --- a/Programs/ktb_keyboard.h +++ b/Programs/ktb_keyboard.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_list.c b/Programs/ktb_list.c index 047cbec2ba8f126060f1ba433416fa820cf56d09..a0587210581e4df99691e43cb4a80d8b7b162359 100644 --- a/Programs/ktb_list.c +++ b/Programs/ktb_list.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_list.h b/Programs/ktb_list.h index a48e3d45028050f6be8a0626b0e1aa7d2a3d6f4a..cc6e728f45370c5ec7470339429a18ea96758fb3 100644 --- a/Programs/ktb_list.h +++ b/Programs/ktb_list.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ktb_translate.c b/Programs/ktb_translate.c index 02e6dbbfd45b6eeaa01bf8109da526d92ccb6a1a..f8e691f667cece600109ad7b995a846925acd919 100644 --- a/Programs/ktb_translate.c +++ b/Programs/ktb_translate.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -76,8 +76,8 @@ setAutoreleaseAlarm (KeyTable *table) { } else if (table->autorelease.alarm) { asyncResetAlarmIn(table->autorelease.alarm, table->autorelease.time); } else { - asyncSetAlarmIn(&table->autorelease.alarm, table->autorelease.time, - handleKeyAutoreleaseAlarm, table); + asyncNewRelativeAlarm(&table->autorelease.alarm, table->autorelease.time, + handleKeyAutoreleaseAlarm, table); } } @@ -389,8 +389,8 @@ ASYNC_ALARM_CALLBACK(handleLongPressAlarm) { static void setLongPressAlarm (KeyTable *table, unsigned char when) { - asyncSetAlarmIn(&table->longPress.alarm, PREFERENCES_TIME(when), - handleLongPressAlarm, table); + asyncNewRelativeAlarm(&table->longPress.alarm, PREFERENCES_TIME(when), + handleLongPressAlarm, table); } static int diff --git a/Programs/learn.c b/Programs/learn.c index 44cef8a4b55359d06058d842eae8988e11646f30..e4e9f6986f92bf857a41cb085114906373dcd1aa 100644 --- a/Programs/learn.c +++ b/Programs/learn.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/learn.h b/Programs/learn.h index 9bfa1270bcb8ebd4bfc69c069eb6d4083e1b694f..dd390abaa9e56fcbc8140b5ce570c0a979e29144 100644 --- a/Programs/learn.h +++ b/Programs/learn.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/leds.c b/Programs/leds.c index d60087681f49c1da28e1670f72292ad44d55a6f2..6a1bffb0d589701a64debde7755b6a4de4b8a244 100644 --- a/Programs/leds.c +++ b/Programs/leds.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/leds_linux.c b/Programs/leds_linux.c index a2a5bf0dd29c1e4f62ee41d91bd98cbe4c82dccc..2c1008d6349005906b1521f0f675821f4098b85d 100644 --- a/Programs/leds_linux.c +++ b/Programs/leds_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/leds_none.c b/Programs/leds_none.c index b349308e1237289a2daacf0dd349ed5294af7cc9..b9c4e79ea6327c9fe289e3b7bbdc4d13b6199450 100644 --- a/Programs/leds_none.c +++ b/Programs/leds_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/lock.c b/Programs/lock.c index d4f0170b2f924eade023a5acfb8ed2265f7b1fdb..d9a70fe4010edb35743d0177b406cd4d6b85c27b 100644 --- a/Programs/lock.c +++ b/Programs/lock.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/log.c b/Programs/log.c index 4914f770fbacfbcf37f61d1c1acdfca932e277b8..3cf2909b22609ecbd0afca75b03de1d13d12d1e1 100644 --- a/Programs/log.c +++ b/Programs/log.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/log_history.c b/Programs/log_history.c index c06b5b7085f613eb67996f46d74a9dfacaabcdaf..559012e98689ac23bb63f2b1f206178c99839d70 100644 --- a/Programs/log_history.c +++ b/Programs/log_history.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/menu.c b/Programs/menu.c index 532ef59aa6f9102a2510f4109006e7d917b1a3dc..cc431ed27eda654f3e00591a7748a37a9aa69fdd 100644 --- a/Programs/menu.c +++ b/Programs/menu.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/menu_prefs.c b/Programs/menu_prefs.c index afc3e4123e0a0d91311140554771bf310244d9ff..7dde17c0b65d1cde6a1f4f4a322f23902ad8a231 100644 --- a/Programs/menu_prefs.c +++ b/Programs/menu_prefs.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -341,6 +341,7 @@ changedStatusField (unsigned char index, unsigned char setting) { if (!haveStatusCells()) return 0; if (!braille->statusFields) return 0; if (*braille->statusFields != sfGeneric) return 0; + /* fall through */ case sfEnd: if (prefs.statusFields[index+1] != sfEnd) return 0; @@ -716,6 +717,10 @@ makePreferencesMenu (void) { { SUBMENU(navigationSubmenu, rootMenu, strtext("Navigation Options")); + { + NAME(strtext("Word Wrap")); + ITEM(newBooleanMenuItem(navigationSubmenu, &prefs.wordWrap, &itemName)); + } { NAME(strtext("Skip Identical Lines")); ITEM(newBooleanMenuItem(navigationSubmenu, &prefs.skipIdenticalLines, &itemName)); @@ -767,6 +772,11 @@ makePreferencesMenu (void) { ITEM(newEnumeratedMenuItem(navigationSubmenu, &prefs.cursorTrackingDelay, &itemName, strings)); } + { + NAME(strtext("Track Screen Scroll")); + ITEM(newBooleanMenuItem(navigationSubmenu, &prefs.trackScreenScroll, &itemName)); + } + #ifdef HAVE_LIBGPM { NAME(strtext("Track Screen Pointer")); diff --git a/Programs/menu_prefs.h b/Programs/menu_prefs.h index 8e99b974741efe69501cff4ef72d95d9b556c377..05fc65bb299872aac58c2ee4383043be5dd84bc7 100644 --- a/Programs/menu_prefs.h +++ b/Programs/menu_prefs.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/message.c b/Programs/message.c index fc9034bdc091954abc8a490ddb768fcbd5192834..95aa53ccd7c27734db7088ca81492e9140b7592d 100644 --- a/Programs/message.c +++ b/Programs/message.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -76,9 +76,6 @@ handleMessageCommands (int command, void *data) { MessageData *mgd = data; switch (command & BRL_MSK_CMD) { - case BRL_CMD_NOOP: - return 1; - case BRL_CMD_LNUP: case BRL_CMD_PRDIFLN: case BRL_CMD_FWINLTSKIP: diff --git a/Programs/midi.c b/Programs/midi.c index 40ebea90dcf867785268b34dee2a22389076346b..2c5f0c61cbe2aa077c80eca8e68f0e823911ff4f 100644 --- a/Programs/midi.c +++ b/Programs/midi.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/midi_alsa.c b/Programs/midi_alsa.c index af9d477d3b22f2e487fc1d36d582909c1db643c5..3afb55d4ebe44e093f75ec3f97ca9c9b83d6603b 100644 --- a/Programs/midi_alsa.c +++ b/Programs/midi_alsa.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -23,7 +23,6 @@ #include "log.h" #include "parse.h" #include "timing.h" -#include "dynld.h" #include "midi.h" struct MidiDeviceStruct { @@ -35,59 +34,28 @@ struct MidiDeviceStruct { unsigned char note; }; -#define MIDI_ALSA_SYMBOL(name) static typeof(snd_##name) *midiAlsa_##name -#define MIDI_ALSA_LOCATE(name) findSharedSymbol(midiAlsaLibrary, "snd_"#name, &midiAlsa_##name) - -static void *midiAlsaLibrary = NULL; -MIDI_ALSA_SYMBOL(strerror); -MIDI_ALSA_SYMBOL(seq_alloc_queue); -MIDI_ALSA_SYMBOL(seq_client_info_get_client); -MIDI_ALSA_SYMBOL(seq_client_info_get_name); -MIDI_ALSA_SYMBOL(seq_client_info_set_client); -MIDI_ALSA_SYMBOL(seq_client_info_sizeof); -MIDI_ALSA_SYMBOL(seq_close); -MIDI_ALSA_SYMBOL(seq_connect_to); -MIDI_ALSA_SYMBOL(seq_control_queue); -MIDI_ALSA_SYMBOL(seq_create_simple_port); -MIDI_ALSA_SYMBOL(seq_drain_output); -MIDI_ALSA_SYMBOL(seq_event_output); -MIDI_ALSA_SYMBOL(seq_get_queue_status); -MIDI_ALSA_SYMBOL(seq_open); -MIDI_ALSA_SYMBOL(seq_port_info_get_capability); -MIDI_ALSA_SYMBOL(seq_port_info_get_name); -MIDI_ALSA_SYMBOL(seq_port_info_get_port); -MIDI_ALSA_SYMBOL(seq_port_info_set_client); -MIDI_ALSA_SYMBOL(seq_port_info_set_port); -MIDI_ALSA_SYMBOL(seq_port_info_sizeof); -MIDI_ALSA_SYMBOL(seq_query_next_client); -MIDI_ALSA_SYMBOL(seq_query_next_port); -MIDI_ALSA_SYMBOL(seq_queue_status_free); -MIDI_ALSA_SYMBOL(seq_queue_status_get_real_time); -MIDI_ALSA_SYMBOL(seq_queue_status_malloc); -MIDI_ALSA_SYMBOL(seq_set_client_name); - -#define snd_seq_control_queue midiAlsa_seq_control_queue +#define snd_seq_control_queue snd_seq_control_queue static int findMidiDevice (MidiDevice *midi, int errorLevel, int *client, int *port) { - snd_seq_client_info_t *clientInformation = malloc(midiAlsa_seq_client_info_sizeof()); + snd_seq_client_info_t *clientInformation = malloc(snd_seq_client_info_sizeof()); if (clientInformation) { - memset(clientInformation, 0, midiAlsa_seq_client_info_sizeof()); - midiAlsa_seq_client_info_set_client(clientInformation, -1); + memset(clientInformation, 0, snd_seq_client_info_sizeof()); + snd_seq_client_info_set_client(clientInformation, -1); - while (midiAlsa_seq_query_next_client(midi->sequencer, clientInformation) >= 0) { - int clientIdentifier = midiAlsa_seq_client_info_get_client(clientInformation); - snd_seq_port_info_t *portInformation = malloc(midiAlsa_seq_port_info_sizeof()); + while (snd_seq_query_next_client(midi->sequencer, clientInformation) >= 0) { + int clientIdentifier = snd_seq_client_info_get_client(clientInformation); + snd_seq_port_info_t *portInformation = malloc(snd_seq_port_info_sizeof()); if (portInformation) { - memset(portInformation, 0, midiAlsa_seq_port_info_sizeof()); - midiAlsa_seq_port_info_set_client(portInformation, clientIdentifier); - midiAlsa_seq_port_info_set_port(portInformation, -1); + memset(portInformation, 0, snd_seq_port_info_sizeof()); + snd_seq_port_info_set_client(portInformation, clientIdentifier); + snd_seq_port_info_set_port(portInformation, -1); - while (midiAlsa_seq_query_next_port(midi->sequencer, portInformation) >= 0) { - int portIdentifier = midiAlsa_seq_port_info_get_port(portInformation); - int actualCapabilities = midiAlsa_seq_port_info_get_capability(portInformation); + while (snd_seq_query_next_port(midi->sequencer, portInformation) >= 0) { + int portIdentifier = snd_seq_port_info_get_port(portInformation); + int actualCapabilities = snd_seq_port_info_get_capability(portInformation); const int neededCapabilties = SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE; if (((actualCapabilities & neededCapabilties) == neededCapabilties) && @@ -95,8 +63,8 @@ findMidiDevice (MidiDevice *midi, int errorLevel, int *client, int *port) { *client = clientIdentifier; *port = portIdentifier; logMessage(LOG_DEBUG, "Using ALSA MIDI device: %d[%s] %d[%s]", - clientIdentifier, midiAlsa_seq_client_info_get_name(clientInformation), - portIdentifier, midiAlsa_seq_port_info_get_name(portInformation)); + clientIdentifier, snd_seq_client_info_get_name(clientInformation), + portIdentifier, snd_seq_port_info_get_name(portInformation)); free(portInformation); free(clientInformation); @@ -139,17 +107,17 @@ parseMidiDevice (MidiDevice *midi, int errorLevel, const char *device, int *clie if (isInteger(&clientIdentifier, clientSpecifier)) { if ((clientIdentifier >= 0) && (clientIdentifier <= 0XFFFF)) clientOk = 1; } else { - snd_seq_client_info_t *info = malloc(midiAlsa_seq_client_info_sizeof()); + snd_seq_client_info_t *info = malloc(snd_seq_client_info_sizeof()); if (info) { - memset(info, 0, midiAlsa_seq_client_info_sizeof()); - midiAlsa_seq_client_info_set_client(info, -1); + memset(info, 0, snd_seq_client_info_sizeof()); + snd_seq_client_info_set_client(info, -1); - while (midiAlsa_seq_query_next_client(midi->sequencer, info) >= 0) { - const char *name = midiAlsa_seq_client_info_get_name(info); + while (snd_seq_query_next_client(midi->sequencer, info) >= 0) { + const char *name = snd_seq_client_info_get_name(info); if (strstr(name, clientSpecifier)) { - clientIdentifier = midiAlsa_seq_client_info_get_client(info); + clientIdentifier = snd_seq_client_info_get_client(info); clientOk = 1; logMessage(LOG_INFO, "Using ALSA MIDI client: %d[%s]", clientIdentifier, name); @@ -170,18 +138,18 @@ parseMidiDevice (MidiDevice *midi, int errorLevel, const char *device, int *clie if (isInteger(&portIdentifier, portSpecifier)) { if ((portIdentifier >= 0) && (portIdentifier <= 0XFFFF)) portOk = 1; } else { - snd_seq_port_info_t *info = malloc(midiAlsa_seq_port_info_sizeof()); + snd_seq_port_info_t *info = malloc(snd_seq_port_info_sizeof()); if (info) { - memset(info, 0, midiAlsa_seq_port_info_sizeof()); - midiAlsa_seq_port_info_set_client(info, clientIdentifier); - midiAlsa_seq_port_info_set_port(info, -1); + memset(info, 0, snd_seq_port_info_sizeof()); + snd_seq_port_info_set_client(info, clientIdentifier); + snd_seq_port_info_set_port(info, -1); - while (midiAlsa_seq_query_next_port(midi->sequencer, info) >= 0) { - const char *name = midiAlsa_seq_port_info_get_name(info); + while (snd_seq_query_next_port(midi->sequencer, info) >= 0) { + const char *name = snd_seq_port_info_get_name(info); if (strstr(name, portSpecifier)) { - portIdentifier = midiAlsa_seq_port_info_get_port(info); + portIdentifier = snd_seq_port_info_get_port(info); portOk = 1; logMessage(LOG_INFO, "Using ALSA MIDI port: %d[%s]", portIdentifier, name); @@ -227,14 +195,14 @@ parseMidiDevice (MidiDevice *midi, int errorLevel, const char *device, int *clie static void updateMidiStatus (MidiDevice *midi) { - midiAlsa_seq_get_queue_status(midi->sequencer, midi->queue, midi->status); + snd_seq_get_queue_status(midi->sequencer, midi->queue, midi->status); } static void startMidiTimer (MidiDevice *midi) { if (!midi->time.tv_sec && !midi->time.tv_nsec) { updateMidiStatus(midi); - midi->time = *midiAlsa_seq_queue_status_get_real_time(midi->status); + midi->time = *snd_seq_queue_status_get_real_time(midi->status); } } @@ -248,52 +216,18 @@ MidiDevice * openMidiDevice (int errorLevel, const char *device) { MidiDevice *midi; - if (!midiAlsaLibrary) { - if (!(midiAlsaLibrary = loadSharedObject("libasound.so.2"))) { - logMessage(LOG_ERR, "Unable to load ALSA MIDI library."); - return NULL; - } - - MIDI_ALSA_LOCATE(strerror); - MIDI_ALSA_LOCATE(seq_alloc_queue); - MIDI_ALSA_LOCATE(seq_client_info_get_client); - MIDI_ALSA_LOCATE(seq_client_info_get_name); - MIDI_ALSA_LOCATE(seq_client_info_set_client); - MIDI_ALSA_LOCATE(seq_client_info_sizeof); - MIDI_ALSA_LOCATE(seq_close); - MIDI_ALSA_LOCATE(seq_connect_to); - MIDI_ALSA_LOCATE(seq_control_queue); - MIDI_ALSA_LOCATE(seq_create_simple_port); - MIDI_ALSA_LOCATE(seq_drain_output); - MIDI_ALSA_LOCATE(seq_event_output); - MIDI_ALSA_LOCATE(seq_get_queue_status); - MIDI_ALSA_LOCATE(seq_open); - MIDI_ALSA_LOCATE(seq_port_info_get_capability); - MIDI_ALSA_LOCATE(seq_port_info_get_name); - MIDI_ALSA_LOCATE(seq_port_info_get_port); - MIDI_ALSA_LOCATE(seq_port_info_set_client); - MIDI_ALSA_LOCATE(seq_port_info_set_port); - MIDI_ALSA_LOCATE(seq_port_info_sizeof); - MIDI_ALSA_LOCATE(seq_query_next_client); - MIDI_ALSA_LOCATE(seq_query_next_port); - MIDI_ALSA_LOCATE(seq_queue_status_free); - MIDI_ALSA_LOCATE(seq_queue_status_get_real_time); - MIDI_ALSA_LOCATE(seq_queue_status_malloc); - MIDI_ALSA_LOCATE(seq_set_client_name); - } - if ((midi = malloc(sizeof(*midi)))) { const char *sequencerName = "default"; int result; - if ((result = midiAlsa_seq_open(&midi->sequencer, sequencerName, SND_SEQ_OPEN_OUTPUT, 0)) >= 0) { - midiAlsa_seq_set_client_name(midi->sequencer, PACKAGE_NAME); + if ((result = snd_seq_open(&midi->sequencer, sequencerName, SND_SEQ_OPEN_OUTPUT, 0)) >= 0) { + snd_seq_set_client_name(midi->sequencer, PACKAGE_NAME); - if ((midi->port = midiAlsa_seq_create_simple_port(midi->sequencer, "out0", + if ((midi->port = snd_seq_create_simple_port(midi->sequencer, "out0", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ, SND_SEQ_PORT_TYPE_APPLICATION)) >= 0) { - if ((midi->queue = midiAlsa_seq_alloc_queue(midi->sequencer)) >= 0) { - if ((result = midiAlsa_seq_queue_status_malloc(&midi->status)) >= 0) { + if ((midi->queue = snd_seq_alloc_queue(midi->sequencer)) >= 0) { + if ((result = snd_seq_queue_status_malloc(&midi->status)) >= 0) { int client = 0; int port = 0; int deviceOk; @@ -307,38 +241,38 @@ openMidiDevice (int errorLevel, const char *device) { if (deviceOk) { logMessage(LOG_DEBUG, "Connecting to ALSA MIDI device: %d:%d", client, port); - if ((result = midiAlsa_seq_connect_to(midi->sequencer, midi->port, client, port)) >= 0) { + if ((result = snd_seq_connect_to(midi->sequencer, midi->port, client, port)) >= 0) { if ((result = snd_seq_start_queue(midi->sequencer, midi->queue, NULL)) >= 0) { stopMidiTimer(midi); return midi; } else { logMessage(errorLevel, "Cannot start ALSA MIDI queue: %d:%d: %s", - client, port, midiAlsa_strerror(result)); + client, port, snd_strerror(result)); } } else { logMessage(errorLevel, "Cannot connect to ALSA MIDI device: %d:%d: %s", - client, port, midiAlsa_strerror(result)); + client, port, snd_strerror(result)); } } - midiAlsa_seq_queue_status_free(midi->status); + snd_seq_queue_status_free(midi->status); } else { logMessage(errorLevel, "Cannot allocate ALSA MIDI queue status container: %s", - midiAlsa_strerror(result)); + snd_strerror(result)); } } else { logMessage(errorLevel, "Cannot allocate ALSA MIDI queue: %s", - midiAlsa_strerror(result)); + snd_strerror(result)); } } else { logMessage(errorLevel, "Cannot create ALSA MIDI output port: %s", - midiAlsa_strerror(midi->port)); + snd_strerror(midi->port)); } - midiAlsa_seq_close(midi->sequencer); + snd_seq_close(midi->sequencer); } else { logMessage(errorLevel, "Cannot open ALSA sequencer: %s: %s", - sequencerName, midiAlsa_strerror(result)); + sequencerName, snd_strerror(result)); } free(midi); @@ -350,8 +284,8 @@ openMidiDevice (int errorLevel, const char *device) { void closeMidiDevice (MidiDevice *midi) { - midiAlsa_seq_queue_status_free(midi->status); - midiAlsa_seq_close(midi->sequencer); + snd_seq_queue_status_free(midi->status); + snd_seq_close(midi->sequencer); free(midi); } @@ -362,7 +296,7 @@ flushMidiDevice (MidiDevice *midi) { updateMidiStatus(midi); { - const snd_seq_real_time_t *time = midiAlsa_seq_queue_status_get_real_time(midi->status); + const snd_seq_real_time_t *time = snd_seq_queue_status_get_real_time(midi->status); int seconds = midi->time.tv_sec - time->tv_sec; int nanoseconds = midi->time.tv_nsec - time->tv_nsec; duration = (seconds * 1000) + (nanoseconds / 1000000); @@ -392,11 +326,11 @@ static int sendMidiEvent (MidiDevice *midi, snd_seq_event_t *event) { int result; - if ((result = midiAlsa_seq_event_output(midi->sequencer, event)) >= 0) { - midiAlsa_seq_drain_output(midi->sequencer); + if ((result = snd_seq_event_output(midi->sequencer, event)) >= 0) { + snd_seq_drain_output(midi->sequencer); return 1; } else { - logMessage(LOG_ERR, "ALSA MIDI write error: %s", midiAlsa_strerror(result)); + logMessage(LOG_ERR, "ALSA MIDI write error: %s", snd_strerror(result)); } return 0; } diff --git a/Programs/midi_darwin.c b/Programs/midi_darwin.c index b2a21e93c9a5f22a72536657f43321ddd16e26e2..f2c422ba3a02d919c7aceb99ea2de2dceceecef4 100644 --- a/Programs/midi_darwin.c +++ b/Programs/midi_darwin.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/midi_none.c b/Programs/midi_none.c index a6a62f5bf9f43b6bbc39385965b1228f00c2ed9a..93ea33a35ce0eaa179e9dc1b590d175706e6eaac 100644 --- a/Programs/midi_none.c +++ b/Programs/midi_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/midi_oss.c b/Programs/midi_oss.c index adbd376bfe73e0f32a266898aa6f8e40507546fa..6e26399c6a2da79b0235f4320c594bc76a343528 100644 --- a/Programs/midi_oss.c +++ b/Programs/midi_oss.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/midi_windows.c b/Programs/midi_windows.c index 7b83ccdf738ebe47cada5585a0313146c21dfcfe..a9b69fe3b5876df9ad1bb0d83337c2680783875c 100644 --- a/Programs/midi_windows.c +++ b/Programs/midi_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mkdrvtab b/Programs/mkdrvtab index 9a0b6f0a65a29ae13cb2949337dac2955a59f6a4..c6ba266f770e319ab9cb739128ab3281e30d6898 100755 --- a/Programs/mkdrvtab +++ b/Programs/mkdrvtab @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Programs/mntfs_linux.c b/Programs/mntfs_linux.c index 3ed47b9202b0acfc862094889a3c7c6948fe4da7..a4d4d48b747d5f43b0299ef7e12bcbd6ba215dd4 100644 --- a/Programs/mntfs_linux.c +++ b/Programs/mntfs_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntfs_none.c b/Programs/mntfs_none.c index 34e2d02d102cd5c023dc22fb72b022eabfc6055b..9015bfedf9a873acd056c29c7dc8d61e28fee348 100644 --- a/Programs/mntfs_none.c +++ b/Programs/mntfs_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt.c b/Programs/mntpt.c index 8953cbb3f7c83ab43a7b18a25e1a35ba9a03566e..0e08ec40031afd23e9e375c175ab374419907d66 100644 --- a/Programs/mntpt.c +++ b/Programs/mntpt.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -91,7 +91,7 @@ updateMountsTable (MountEntry *entry) { } if (retry) { - asyncSetAlarmIn(NULL, MOUNT_TABLE_UPDATE_RETRY_INTERVAL, retryMountsTableUpdate, entry); + asyncNewRelativeAlarm(NULL, MOUNT_TABLE_UPDATE_RETRY_INTERVAL, retryMountsTableUpdate, entry); } else { if (entry->mountPath) free(entry->mountPath); if (entry->mountReference) free(entry->mountReference); diff --git a/Programs/mntpt_internal.h b/Programs/mntpt_internal.h index c0ed49bbfd9dbdda72ddd20800b94dc0bfc6bc86..d2e986a9db06066eaf29151a92f2966fcaea0fbb 100644 --- a/Programs/mntpt_internal.h +++ b/Programs/mntpt_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt_mntent.c b/Programs/mntpt_mntent.c index 994cd22c78690ead4b012a8927de929b25e85828..be877e99002b48b4c009b9b63d46d637af0f61bf 100644 --- a/Programs/mntpt_mntent.c +++ b/Programs/mntpt_mntent.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt_mntent.h b/Programs/mntpt_mntent.h index 9f3545eb521a16a2caa3a8fbd3ac1eb3153532a0..78238a9ecfa36903de26b3cd52f1cc19e41ed084 100644 --- a/Programs/mntpt_mntent.h +++ b/Programs/mntpt_mntent.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt_mnttab.c b/Programs/mntpt_mnttab.c index 6dd3488f14a6017585bb7a8917059e57b1c617ad..65a8f2d7d0cd9bf78e5c23f92c7c788de5da3b47 100644 --- a/Programs/mntpt_mnttab.c +++ b/Programs/mntpt_mnttab.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt_mnttab.h b/Programs/mntpt_mnttab.h index 6622fbdfff87bc6445fd5c250ed2ae398caaf475..707e5beaddc445e6ef122d23f3a44240414007d6 100644 --- a/Programs/mntpt_mnttab.h +++ b/Programs/mntpt_mnttab.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt_none.c b/Programs/mntpt_none.c index 1b978d26150154dc864073f7d52c59aae548576b..e3b53ed670295e10e86a4ecac40f38ec435e6226 100644 --- a/Programs/mntpt_none.c +++ b/Programs/mntpt_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/mntpt_none.h b/Programs/mntpt_none.h index 0b202bfac18e483fb3dd2b7e79207779592ed819..d6e2bedd2eabfec9a8fc0280290da719c8cb1742 100644 --- a/Programs/mntpt_none.h +++ b/Programs/mntpt_none.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/notes.c b/Programs/notes.c index e8450ecc1770fca1b34e5ce278943c08b7513df2..f4c5eccf79737b5d906447fc2d55d1f67283eb6b 100644 --- a/Programs/notes.c +++ b/Programs/notes.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/notes_beep.c b/Programs/notes_beep.c index a7c80b59b56c9448ea8f338cd404b12266daa6f2..52b1c58803b9bdde810ba5474cedff95ad31feda 100644 --- a/Programs/notes_beep.c +++ b/Programs/notes_beep.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/notes_fm.c b/Programs/notes_fm.c index b2adcaebf97f8f2914594637ccc65c19b676e84d..f27ed797aee9cc4af56e94985b2efd8da416356f 100644 --- a/Programs/notes_fm.c +++ b/Programs/notes_fm.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/notes_midi.c b/Programs/notes_midi.c index 95e13cc66f2228cc690b0d598f035379fca51572..9ac8ebc4e5ff5eb348905617baaffde7b3716821 100644 --- a/Programs/notes_midi.c +++ b/Programs/notes_midi.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/notes_pcm.c b/Programs/notes_pcm.c index 2e2f0317ca4223620ce74d73df053d56e21fc016..f31de5647eabf4749d71b072cbece3c835206594 100644 --- a/Programs/notes_pcm.c +++ b/Programs/notes_pcm.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/options.c b/Programs/options.c index 896fa83737fffafcde7c2039441f192d7dc27030..5db0413242f668f58f63ec8d48ac6257a7ad0ce1 100644 --- a/Programs/options.c +++ b/Programs/options.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/parameters.h b/Programs/parameters.h index 73835dbd38f932631cb0b3a46fc578d4598a7d32..eac6f217171edeebc06b9279294a3654a1b4bd92 100644 --- a/Programs/parameters.h +++ b/Programs/parameters.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/params_linux.c b/Programs/params_linux.c index f6092cf84a9e9057778caf30369ce6acc5b1a193..448e2247d3c70330eab08ddfb1592f77fe1dfcf5 100644 --- a/Programs/params_linux.c +++ b/Programs/params_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/params_none.c b/Programs/params_none.c index f248218bc159d4f7130c61e008edcbf8120b3cc9..a06446c0cf8f01fced395906e8fecc31f377079b 100644 --- a/Programs/params_none.c +++ b/Programs/params_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/parse.c b/Programs/parse.c index e7535177636fc9bf7949f20f3f3f071ee6e37661..9528f1757304158b6f213842cdbb19fe9efbed68 100644 --- a/Programs/parse.c +++ b/Programs/parse.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -342,6 +342,28 @@ validateFloat (float *value, const char *string, const float *minimum, const flo } #endif /* NO_FLOAT */ +int +hasQualifier (const char **identifier, const char *qualifier) { + const char *delimiter = strchr(*identifier, PARAMETER_QUALIFIER_CHARACTER); + if (!delimiter) return 0; + + size_t count = delimiter - *identifier; + if (memchr(*identifier, FILE_PATH_DELIMITER, count)) return 0; + + if (qualifier) { + if (count != strlen(qualifier)) return 0; + if (strncasecmp(*identifier, qualifier, count) != 0) return 0; + } + + *identifier += count + 1; + return 1; +} + +int +hasNoQualifier (const char *identifier) { + return !hasQualifier(&identifier, NULL); +} + static int parseParameters ( char **values, diff --git a/Programs/pcm.c b/Programs/pcm.c index 3a8468ab69c2ac7667b79469bdeab6726b8c0c87..8282a70fac007fd12550804d4fa31708804d477e 100644 --- a/Programs/pcm.c +++ b/Programs/pcm.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_alsa.c b/Programs/pcm_alsa.c index 28a12041ef97ce3698e25c386c4a2c2e8e7c6d8c..7618bdc0180792d0125d362061b22243c62e56d2 100644 --- a/Programs/pcm_alsa.c +++ b/Programs/pcm_alsa.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -23,7 +23,6 @@ #include "log.h" #include "timing.h" -#include "dynld.h" #include "pcm.h" struct PcmDeviceStruct { @@ -35,43 +34,9 @@ struct PcmDeviceStruct { unsigned int periodTime; }; -#define PCM_ALSA_SYMBOL(name) static typeof(snd_##name) *pcmAlsa_##name -#define PCM_ALSA_LOCATE(name) findSharedSymbol(pcmAlsaLibrary, "snd_"#name, &pcmAlsa_##name) - -static void *pcmAlsaLibrary = NULL; -PCM_ALSA_SYMBOL(strerror); -PCM_ALSA_SYMBOL(pcm_open); -PCM_ALSA_SYMBOL(pcm_close); -PCM_ALSA_SYMBOL(pcm_nonblock); -PCM_ALSA_SYMBOL(pcm_hw_params_malloc); -PCM_ALSA_SYMBOL(pcm_hw_params_any); -PCM_ALSA_SYMBOL(pcm_hw_params_set_access); -PCM_ALSA_SYMBOL(pcm_hw_params_get_rate); -PCM_ALSA_SYMBOL(pcm_hw_params_get_sbits); -PCM_ALSA_SYMBOL(pcm_hw_params_get_format); -PCM_ALSA_SYMBOL(pcm_hw_params_set_format); -PCM_ALSA_SYMBOL(pcm_hw_params_get_rate_min); -PCM_ALSA_SYMBOL(pcm_hw_params_get_rate_max); -PCM_ALSA_SYMBOL(pcm_hw_params_set_rate_near); -PCM_ALSA_SYMBOL(pcm_hw_params_get_channels); -PCM_ALSA_SYMBOL(pcm_hw_params_get_channels_min); -PCM_ALSA_SYMBOL(pcm_hw_params_get_channels_max); -PCM_ALSA_SYMBOL(pcm_hw_params_set_channels_near); -PCM_ALSA_SYMBOL(pcm_hw_params_set_buffer_time_near); -PCM_ALSA_SYMBOL(pcm_hw_params_set_period_time_near); -PCM_ALSA_SYMBOL(pcm_hw_params); -PCM_ALSA_SYMBOL(pcm_hw_params_get_sbits); -PCM_ALSA_SYMBOL(pcm_hw_params_get_period_size); -PCM_ALSA_SYMBOL(pcm_hw_params_free); -PCM_ALSA_SYMBOL(pcm_prepare); -PCM_ALSA_SYMBOL(pcm_writei); -PCM_ALSA_SYMBOL(pcm_drain); -PCM_ALSA_SYMBOL(pcm_drop); -PCM_ALSA_SYMBOL(pcm_resume); - static void logPcmError (int level, const char *action, int code) { - logMessage(level, "ALSA PCM %s error: %s", action, pcmAlsa_strerror(code)); + logMessage(level, "ALSA PCM %s error: %s", action, snd_strerror(code)); } static int @@ -85,7 +50,7 @@ configurePcmSampleFormat (PcmDevice *pcm, int errorLevel) { const snd_pcm_format_t *format = formats; while (*format != SND_PCM_FORMAT_UNKNOWN) { - int result = pcmAlsa_pcm_hw_params_set_format(pcm->handle, pcm->hardwareParameters, *format); + int result = snd_pcm_hw_params_set_format(pcm->handle, pcm->hardwareParameters, *format); if (result >= 0) return 1; if (result != -EINVAL) { @@ -106,12 +71,12 @@ configurePcmSampleRate (PcmDevice *pcm, int errorLevel) { unsigned int minimum; unsigned int maximum; - if ((result = pcmAlsa_pcm_hw_params_get_rate_min(pcm->hardwareParameters, &minimum, NULL)) < 0) { + if ((result = snd_pcm_hw_params_get_rate_min(pcm->hardwareParameters, &minimum, NULL)) < 0) { logPcmError(errorLevel, "get rate min", result); return 0; } - if ((result = pcmAlsa_pcm_hw_params_get_rate_max(pcm->hardwareParameters, &maximum, NULL)) < 0) { + if ((result = snd_pcm_hw_params_get_rate_max(pcm->hardwareParameters, &maximum, NULL)) < 0) { logPcmError(errorLevel, "get rate max", result); return 0; } @@ -122,7 +87,7 @@ configurePcmSampleRate (PcmDevice *pcm, int errorLevel) { } pcm->sampleRate = MIN(MAX(16000, minimum), maximum); - if ((result = pcmAlsa_pcm_hw_params_set_rate_near(pcm->handle, pcm->hardwareParameters, &pcm->sampleRate, NULL)) < 0) { + if ((result = snd_pcm_hw_params_set_rate_near(pcm->handle, pcm->hardwareParameters, &pcm->sampleRate, NULL)) < 0) { logPcmError(errorLevel, "set rate near", result); return 0; } @@ -136,12 +101,12 @@ configurePcmChannelCount (PcmDevice *pcm, int errorLevel) { unsigned int minimum; unsigned int maximum; - if ((result = pcmAlsa_pcm_hw_params_get_channels_min(pcm->hardwareParameters, &minimum)) < 0) { + if ((result = snd_pcm_hw_params_get_channels_min(pcm->hardwareParameters, &minimum)) < 0) { logPcmError(errorLevel, "get channels min", result); return 0; } - if ((result = pcmAlsa_pcm_hw_params_get_channels_max(pcm->hardwareParameters, &maximum)) < 0) { + if ((result = snd_pcm_hw_params_get_channels_max(pcm->hardwareParameters, &maximum)) < 0) { logPcmError(errorLevel, "get channels max", result); return 0; } @@ -152,7 +117,7 @@ configurePcmChannelCount (PcmDevice *pcm, int errorLevel) { } pcm->channelCount = minimum; - if ((result = pcmAlsa_pcm_hw_params_set_channels_near(pcm->handle, pcm->hardwareParameters, &pcm->channelCount)) < 0) { + if ((result = snd_pcm_hw_params_set_channels_near(pcm->handle, pcm->hardwareParameters, &pcm->channelCount)) < 0) { logPcmError(errorLevel, "set channels near", result); return 0; } @@ -164,61 +129,24 @@ PcmDevice * openPcmDevice (int errorLevel, const char *device) { PcmDevice *pcm; - if (!pcmAlsaLibrary) { - if (!(pcmAlsaLibrary = loadSharedObject("libasound.so.2"))) { - logMessage(LOG_ERR, "Unable to load ALSA PCM library."); - return NULL; - } - - PCM_ALSA_LOCATE(strerror); - PCM_ALSA_LOCATE(pcm_open); - PCM_ALSA_LOCATE(pcm_close); - PCM_ALSA_LOCATE(pcm_nonblock); - PCM_ALSA_LOCATE(pcm_hw_params_malloc); - PCM_ALSA_LOCATE(pcm_hw_params_any); - PCM_ALSA_LOCATE(pcm_hw_params_set_access); - PCM_ALSA_LOCATE(pcm_hw_params_get_channels); - PCM_ALSA_LOCATE(pcm_hw_params_get_channels_min); - PCM_ALSA_LOCATE(pcm_hw_params_get_channels_max); - PCM_ALSA_LOCATE(pcm_hw_params_set_channels_near); - PCM_ALSA_LOCATE(pcm_hw_params_get_format); - PCM_ALSA_LOCATE(pcm_hw_params_set_format); - PCM_ALSA_LOCATE(pcm_hw_params_get_rate); - PCM_ALSA_LOCATE(pcm_hw_params_get_sbits); - PCM_ALSA_LOCATE(pcm_hw_params_get_rate_min); - PCM_ALSA_LOCATE(pcm_hw_params_get_rate_max); - PCM_ALSA_LOCATE(pcm_hw_params_get_period_size); - PCM_ALSA_LOCATE(pcm_hw_params_set_rate_near); - PCM_ALSA_LOCATE(pcm_hw_params_set_buffer_time_near); - PCM_ALSA_LOCATE(pcm_hw_params_set_period_time_near); - PCM_ALSA_LOCATE(pcm_hw_params); - PCM_ALSA_LOCATE(pcm_hw_params_get_sbits); - PCM_ALSA_LOCATE(pcm_hw_params_free); - PCM_ALSA_LOCATE(pcm_prepare); - PCM_ALSA_LOCATE(pcm_writei); - PCM_ALSA_LOCATE(pcm_drain); - PCM_ALSA_LOCATE(pcm_drop); - PCM_ALSA_LOCATE(pcm_resume); - } - if ((pcm = malloc(sizeof(*pcm)))) { int result; if (!*device) device = "default"; - if ((result = pcmAlsa_pcm_open(&pcm->handle, device, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) >= 0) { - pcmAlsa_pcm_nonblock(pcm->handle, 0); + if ((result = snd_pcm_open(&pcm->handle, device, SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) >= 0) { + snd_pcm_nonblock(pcm->handle, 0); - if ((result = pcmAlsa_pcm_hw_params_malloc(&pcm->hardwareParameters)) >= 0) { - if ((result = pcmAlsa_pcm_hw_params_any(pcm->handle, pcm->hardwareParameters)) >= 0) { - if ((result = pcmAlsa_pcm_hw_params_set_access(pcm->handle, pcm->hardwareParameters, SND_PCM_ACCESS_RW_INTERLEAVED)) >= 0) { + if ((result = snd_pcm_hw_params_malloc(&pcm->hardwareParameters)) >= 0) { + if ((result = snd_pcm_hw_params_any(pcm->handle, pcm->hardwareParameters)) >= 0) { + if ((result = snd_pcm_hw_params_set_access(pcm->handle, pcm->hardwareParameters, SND_PCM_ACCESS_RW_INTERLEAVED)) >= 0) { if (configurePcmSampleFormat(pcm, errorLevel)) { if (configurePcmSampleRate(pcm, errorLevel)) { if (configurePcmChannelCount(pcm, errorLevel)) { pcm->bufferTime = 500000; - if ((result = pcmAlsa_pcm_hw_params_set_buffer_time_near(pcm->handle, pcm->hardwareParameters, &pcm->bufferTime, NULL)) >= 0) { + if ((result = snd_pcm_hw_params_set_buffer_time_near(pcm->handle, pcm->hardwareParameters, &pcm->bufferTime, NULL)) >= 0) { pcm->periodTime = pcm->bufferTime / 8; - if ((result = pcmAlsa_pcm_hw_params_set_period_time_near(pcm->handle, pcm->hardwareParameters, &pcm->periodTime, NULL)) >= 0) { - if ((result = pcmAlsa_pcm_hw_params(pcm->handle, pcm->hardwareParameters)) >= 0) { + if ((result = snd_pcm_hw_params_set_period_time_near(pcm->handle, pcm->hardwareParameters, &pcm->periodTime, NULL)) >= 0) { + if ((result = snd_pcm_hw_params(pcm->handle, pcm->hardwareParameters)) >= 0) { logMessage(LOG_DEBUG, "ALSA PCM: Chan=%u Rate=%u BufTim=%u PerTim=%u", pcm->channelCount, pcm->sampleRate, pcm->bufferTime, pcm->periodTime); return pcm; } else { @@ -240,12 +168,12 @@ openPcmDevice (int errorLevel, const char *device) { logPcmError(errorLevel, "get hardware parameters", result); } - pcmAlsa_pcm_hw_params_free(pcm->hardwareParameters); + snd_pcm_hw_params_free(pcm->hardwareParameters); } else { logPcmError(errorLevel, "hardware parameters allocation", result); } - pcmAlsa_pcm_close(pcm->handle); + snd_pcm_close(pcm->handle); } else { logPcmError(errorLevel, "open", result); } @@ -261,14 +189,14 @@ openPcmDevice (int errorLevel, const char *device) { void closePcmDevice (PcmDevice *pcm) { awaitPcmOutput(pcm); - pcmAlsa_pcm_close(pcm->handle); - pcmAlsa_pcm_hw_params_free(pcm->hardwareParameters); + snd_pcm_close(pcm->handle); + snd_pcm_hw_params_free(pcm->hardwareParameters); free(pcm); } static int getPcmFrameSize (PcmDevice *pcm) { - return getPcmChannelCount(pcm) * (pcmAlsa_pcm_hw_params_get_sbits(pcm->hardwareParameters) / 8); + return getPcmChannelCount(pcm) * (snd_pcm_hw_params_get_sbits(pcm->hardwareParameters) / 8); } int @@ -279,23 +207,23 @@ writePcmData (PcmDevice *pcm, const unsigned char *buffer, int count) { while (framesLeft > 0) { int result; - if ((result = pcmAlsa_pcm_writei(pcm->handle, buffer, framesLeft)) > 0) { + if ((result = snd_pcm_writei(pcm->handle, buffer, framesLeft)) > 0) { framesLeft -= result; buffer += result * frameSize; } else { switch (result) { case -EPIPE: - if ((result = pcmAlsa_pcm_prepare(pcm->handle)) < 0) { + if ((result = snd_pcm_prepare(pcm->handle)) < 0) { logPcmError(LOG_WARNING, "underrun recovery - prepare", result); return 0; } continue; case -ESTRPIPE: - while ((result = pcmAlsa_pcm_resume(pcm->handle)) == -EAGAIN) approximateDelay(1); + while ((result = snd_pcm_resume(pcm->handle)) == -EAGAIN) approximateDelay(1); if (result < 0) { - if ((result = pcmAlsa_pcm_prepare(pcm->handle)) < 0) { + if ((result = snd_pcm_prepare(pcm->handle)) < 0) { logPcmError(LOG_WARNING, "resume - prepare", result); return 0; } @@ -312,7 +240,7 @@ getPcmBlockSize (PcmDevice *pcm) { snd_pcm_uframes_t frames; int result; - if ((result = pcmAlsa_pcm_hw_params_get_period_size(pcm->hardwareParameters, &frames, NULL)) >= 0) { + if ((result = snd_pcm_hw_params_get_period_size(pcm->hardwareParameters, &frames, NULL)) >= 0) { return frames * getPcmFrameSize(pcm); } else { logPcmError(LOG_ERR, "get period size", result); @@ -330,7 +258,7 @@ setPcmSampleRate (PcmDevice *pcm, int rate) { int result; pcm->sampleRate = rate; - if ((result = pcmAlsa_pcm_hw_params_set_rate_near(pcm->handle, pcm->hardwareParameters, &pcm->sampleRate, NULL)) < 0) { + if ((result = snd_pcm_hw_params_set_rate_near(pcm->handle, pcm->hardwareParameters, &pcm->sampleRate, NULL)) < 0) { logPcmError(LOG_ERR, "set rate near", result); } @@ -347,7 +275,7 @@ setPcmChannelCount (PcmDevice *pcm, int channels) { int result; pcm->channelCount = channels; - if ((result = pcmAlsa_pcm_hw_params_set_channels_near(pcm->handle, pcm->hardwareParameters, &pcm->channelCount)) < 0) { + if ((result = snd_pcm_hw_params_set_channels_near(pcm->handle, pcm->hardwareParameters, &pcm->channelCount)) < 0) { logPcmError(LOG_ERR, "set channels near", result); } @@ -374,7 +302,7 @@ getPcmAmplitudeFormat (PcmDevice *pcm) { snd_pcm_format_t format; int result; - if ((result = pcmAlsa_pcm_hw_params_get_format(pcm->hardwareParameters, &format)) < 0) { + if ((result = snd_pcm_hw_params_get_format(pcm->hardwareParameters, &format)) < 0) { logPcmError(LOG_ERR, "get format", result); } else { const AmplitudeFormatEntry *entry = amplitudeFormatTable; @@ -396,7 +324,7 @@ setPcmAmplitudeFormat (PcmDevice *pcm, PcmAmplitudeFormat format) { ++entry; } - if ((result = pcmAlsa_pcm_hw_params_set_format(pcm->handle, pcm->hardwareParameters, entry->external)) < 0) { + if ((result = snd_pcm_hw_params_set_format(pcm->handle, pcm->hardwareParameters, entry->external)) < 0) { logPcmError(LOG_ERR, "set format", result); return getPcmAmplitudeFormat(pcm); } @@ -411,11 +339,11 @@ forcePcmOutput (PcmDevice *pcm) { void awaitPcmOutput (PcmDevice *pcm) { int result; - if ((result = pcmAlsa_pcm_drain(pcm->handle)) < 0) logPcmError(LOG_WARNING, "drain", result); + if ((result = snd_pcm_drain(pcm->handle)) < 0) logPcmError(LOG_WARNING, "drain", result); } void cancelPcmOutput (PcmDevice *pcm) { int result; - if ((result = pcmAlsa_pcm_drop(pcm->handle)) < 0) logPcmError(LOG_WARNING, "drop", result); + if ((result = snd_pcm_drop(pcm->handle)) < 0) logPcmError(LOG_WARNING, "drop", result); } diff --git a/Programs/pcm_android.c b/Programs/pcm_android.c index 81a29d511216f1199a460a0c60297eb860614111..e890f87fe61f0e24658f7b3c7c8d96206d88354b 100644 --- a/Programs/pcm_android.c +++ b/Programs/pcm_android.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_audio.c b/Programs/pcm_audio.c index 05e3a214693d90918e54761f12608bd139357a40..d96720844cd2a82eb021b616c77aade7100500e3 100644 --- a/Programs/pcm_audio.c +++ b/Programs/pcm_audio.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_hpux.c b/Programs/pcm_hpux.c index 82e8b8e7d17c2a0c7848a5051d3ec653ba84bb2b..415a33a2426a28811ee952ff55210161b4dee3c2 100644 --- a/Programs/pcm_hpux.c +++ b/Programs/pcm_hpux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_none.c b/Programs/pcm_none.c index 9e2fa9e27bdf7931346d4659d82d05b806b1d990..4f8a0f1995198a27a99a26b4192f3de407759bb3 100644 --- a/Programs/pcm_none.c +++ b/Programs/pcm_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_oss.c b/Programs/pcm_oss.c index 4e88a79549f881c763bfb8a08ea253b33d951e9b..44b76d2ad7c4ed7b3215a28fc15901216c2b032b 100644 --- a/Programs/pcm_oss.c +++ b/Programs/pcm_oss.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_qsa.c b/Programs/pcm_qsa.c index 83b7937cf382f4dfa4ea1b9cba50420c185fef80..d78e49f11a7d9bf7b8f790e4262366aff6296649 100644 --- a/Programs/pcm_qsa.c +++ b/Programs/pcm_qsa.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pcm_windows.c b/Programs/pcm_windows.c index 925d1189d3b4e2ffcb1a6addbc55028c0a9396b1..3f2fd759163559d1365d4002e08c7befa0d2d9f9 100644 --- a/Programs/pcm_windows.c +++ b/Programs/pcm_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pgmpath_linux.c b/Programs/pgmpath_linux.c index b5d18a8be97475481986067b6e82ecc741c63807..6258a07fe7e4a5ecefda317c87837a771333de53 100644 --- a/Programs/pgmpath_linux.c +++ b/Programs/pgmpath_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pgmpath_none.c b/Programs/pgmpath_none.c index 0e62185164c700c1b7ed9f80f45c03a310e3acc3..556207b5c3ddef61fdbdf8bd976a65a2978beaf9 100644 --- a/Programs/pgmpath_none.c +++ b/Programs/pgmpath_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pgmpath_solaris.c b/Programs/pgmpath_solaris.c index 31f2462a371a312b534575c7c0d4d3e5715817b4..8253892e8025e0f243ab76b743d32b939bf7ffcb 100644 --- a/Programs/pgmpath_solaris.c +++ b/Programs/pgmpath_solaris.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pgmpath_windows.c b/Programs/pgmpath_windows.c index 6a4cb33c38416aeab9dfefb2d800b5e09e4b6254..179ceb29295c46ab4b06c0461fe1a87b373cb13b 100644 --- a/Programs/pgmpath_windows.c +++ b/Programs/pgmpath_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pid.c b/Programs/pid.c index 2e2ab53d4ae07ced103498c99fccc3f6c7bd9bc5..32b85afb804e7ebbb8910654f93dc2e1a8f4dfbf 100644 --- a/Programs/pid.c +++ b/Programs/pid.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pipe.c b/Programs/pipe.c index b79b398bdb70215f58c4a84a55d2d15e7c8666ed..790fe5a22590ddb877d6432f5d4716e3a951317a 100644 --- a/Programs/pipe.c +++ b/Programs/pipe.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/pipe.h b/Programs/pipe.h index af36c20fbebe8e20dd2c708b0fb0c23e605c14ee..87e2fd5b8bf257d61f363e4cf7f45334f292f9eb 100644 --- a/Programs/pipe.h +++ b/Programs/pipe.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_glibc.c b/Programs/ports_glibc.c index a80c6dcf604c2f0881004fd742fed53e8546361f..86a6e6416a2a0f45ff5cb6aa733b4c0a1152e803 100644 --- a/Programs/ports_glibc.c +++ b/Programs/ports_glibc.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_grub.c b/Programs/ports_grub.c index 0c8eb6b8427183988581e5234fe4934b8b10f167..b7df5a9451174fc30686d2c6f671f762cd3e9f15 100644 --- a/Programs/ports_grub.c +++ b/Programs/ports_grub.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_kfreebsd.c b/Programs/ports_kfreebsd.c index f982268f8511cfc2e51415c5a4a06dbf0aecb791..f9c7a80e5d1dd9d96d2123a64eac112bccef74dc 100644 --- a/Programs/ports_kfreebsd.c +++ b/Programs/ports_kfreebsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_msdos.c b/Programs/ports_msdos.c index dc6759cddd2817b1fcc49c99205549a7a4828180..c0326e64b3b1bc05a510fcea6ec20bef7cb14602 100644 --- a/Programs/ports_msdos.c +++ b/Programs/ports_msdos.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_none.c b/Programs/ports_none.c index 87e280f04ed8ebda97785a0d9afec193738d3ae3..aac7b0238a2be0b68f546be25acf9d2711c1904f 100644 --- a/Programs/ports_none.c +++ b/Programs/ports_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_windows.c b/Programs/ports_windows.c index d3c8196c512ebba3e3c783d5769246a5402f3f4c..de1187b991ca6f66464ca0b1b1d148d53e885e7a 100644 --- a/Programs/ports_windows.c +++ b/Programs/ports_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ports_x86.h b/Programs/ports_x86.h index 0b7e77dc4edb648142004314390625805d526bdd..42286ff0e23dc1efbea3d96e901fa78e6b2a4dbf 100644 --- a/Programs/ports_x86.h +++ b/Programs/ports_x86.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/prefs.c b/Programs/prefs.c index 9425a78f92b2c8ff8729941acb0017900ac695a2..ae9bab381cac39d97bf548912c30301ac92e1367 100644 --- a/Programs/prefs.c +++ b/Programs/prefs.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/prefs_internal.h b/Programs/prefs_internal.h index db8736a3e59efe04ef772baea3af217d198227c9..5de21fe6c5a85e283d5eb7cbfd8d83656275e303 100644 --- a/Programs/prefs_internal.h +++ b/Programs/prefs_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/prefs_table.c b/Programs/prefs_table.c index e96a69a920a482c7334f464d0c15a565645f5bc5..02bbc5aa86be89d01a54b6c0994db9b32fba440f 100644 --- a/Programs/prefs_table.c +++ b/Programs/prefs_table.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -249,6 +249,12 @@ const PreferenceEntry preferenceTable[] = { .setting = &prefs.capitalsInvisibleTime }, + { .name = "word-wrap", + .defaultValue = DEFAULT_WORD_WRAP, + .settingNames = &preferenceStringTable_boolean, + .setting = &prefs.wordWrap + }, + { .name = "skip-identical-lines", .defaultValue = DEFAULT_SKIP_IDENTICAL_LINES, .settingNames = &preferenceStringTable_boolean, @@ -290,6 +296,12 @@ const PreferenceEntry preferenceTable[] = { .setting = &prefs.cursorTrackingDelay }, + { .name = "track-screen-scroll", + .defaultValue = DEFAULT_TRACK_SCREEN_SCROLL, + .settingNames = &preferenceStringTable_boolean, + .setting = &prefs.trackScreenScroll + }, + { .name = "track-screen-pointer", .defaultValue = DEFAULT_TRACK_SCREEN_POINTER, .settingNames = &preferenceStringTable_boolean, diff --git a/Programs/profile.c b/Programs/profile.c index 98d6e9edb6c27001acb0dcc9d674f33aa2e99968..4e263caf803617051e39129ceb460fc1dcfb64cf 100644 --- a/Programs/profile.c +++ b/Programs/profile.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/profile.h b/Programs/profile.h index a1983c06ba0bf92e10bcd33bb974aa6b778e6999..e2196b9f75037479fa73beabbf59a62a0bf7b80e 100644 --- a/Programs/profile.h +++ b/Programs/profile.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/profile_types.h b/Programs/profile_types.h index db2f327f53b455bb90bc57989c2cc5e7cb6a69e0..5ec5b81a45a80e24bc4cd9f333839f5e8ef97397 100644 --- a/Programs/profile_types.h +++ b/Programs/profile_types.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/program.c b/Programs/program.c index 00012dce64399d171f7ffe6e26283e7a6dc4bc58..801b37ac3a08c29d67904a9e813de5689c7338f0 100644 --- a/Programs/program.c +++ b/Programs/program.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/queue.c b/Programs/queue.c index 508f6c0612c78bf23b79facde3ff4a2cf01e9507..ef28463317f49b320b8485f8970600054f986073 100644 --- a/Programs/queue.c +++ b/Programs/queue.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/reldeps.mk b/Programs/reldeps.mk index a812e8a9655593cf1c8133b4b1b75c200cc8b5af..605a8ede09a3c120de84b00255c7acfd8909f27b 100644 --- a/Programs/reldeps.mk +++ b/Programs/reldeps.mk @@ -1648,6 +1648,7 @@ ctb_compile.$O: $(SRC_TOP)Headers/prologue.h ctb_compile.$O: $(BLD_TOP)config.h ctb_compile.$O: $(BLD_TOP)forbuild.h ctb_compile.$O: $(SRC_TOP)Headers/log.h +ctb_compile.$O: $(SRC_TOP)Headers/parse.h ctb_compile.$O: $(SRC_TOP)Headers/file.h ctb_compile.$O: $(SRC_TOP)Headers/get_sockets.h ctb_compile.$O: $(SRC_TOP)Headers/ctb.h @@ -1659,25 +1660,63 @@ ctb_compile.$O: $(SRC_TOP)Headers/dataarea.h ctb_compile.$O: $(SRC_TOP)Headers/brl_dots.h ctb_compile.$O: $(SRC_TOP)Headers/hostcmd.h +# Dependencies for ctb_external.$O: +ctb_external.$O: $(SRC_DIR)/ctb_external.c +ctb_external.$O: $(SRC_TOP)Headers/prologue.h +ctb_external.$O: $(BLD_TOP)config.h +ctb_external.$O: $(BLD_TOP)forbuild.h +ctb_external.$O: $(SRC_TOP)Headers/log.h +ctb_external.$O: $(SRC_TOP)Headers/ctb.h +ctb_external.$O: $(SRC_TOP)Headers/ctb_types.h +ctb_external.$O: $(SRC_TOP)Headers/prefs.h +ctb_external.$O: $(SRC_DIR)/ctb_internal.h +ctb_external.$O: $(SRC_DIR)/ctb_translate.h +ctb_external.$O: $(SRC_TOP)Headers/brl_dots.h +ctb_external.$O: $(SRC_TOP)Headers/file.h +ctb_external.$O: $(SRC_TOP)Headers/get_sockets.h +ctb_external.$O: $(SRC_TOP)Headers/parse.h +ctb_external.$O: $(SRC_TOP)Headers/charset.h +ctb_external.$O: $(SRC_TOP)Headers/lock.h + +# Dependencies for ctb_louis.$O: +ctb_louis.$O: $(SRC_DIR)/ctb_louis.c +ctb_louis.$O: $(SRC_TOP)Headers/prologue.h +ctb_louis.$O: $(BLD_TOP)config.h +ctb_louis.$O: $(BLD_TOP)forbuild.h +ctb_louis.$O: $(SRC_TOP)Headers/log.h +ctb_louis.$O: $(SRC_TOP)Headers/ctb.h +ctb_louis.$O: $(SRC_TOP)Headers/ctb_types.h +ctb_louis.$O: $(SRC_TOP)Headers/prefs.h +ctb_louis.$O: $(SRC_DIR)/ctb_internal.h +ctb_louis.$O: $(SRC_DIR)/ctb_translate.h + +# Dependencies for ctb_native.$O: +ctb_native.$O: $(SRC_DIR)/ctb_native.c +ctb_native.$O: $(SRC_TOP)Headers/prologue.h +ctb_native.$O: $(BLD_TOP)config.h +ctb_native.$O: $(BLD_TOP)forbuild.h +ctb_native.$O: $(SRC_TOP)Headers/log.h +ctb_native.$O: $(SRC_TOP)Headers/ctb.h +ctb_native.$O: $(SRC_TOP)Headers/ctb_types.h +ctb_native.$O: $(SRC_TOP)Headers/prefs.h +ctb_native.$O: $(SRC_DIR)/ctb_internal.h +ctb_native.$O: $(SRC_DIR)/ctb_translate.h +ctb_native.$O: $(SRC_TOP)Headers/brl_dots.h +ctb_native.$O: $(SRC_TOP)Headers/unicode.h +ctb_native.$O: $(SRC_TOP)Headers/ascii.h + # Dependencies for ctb_translate.$O: ctb_translate.$O: $(SRC_DIR)/ctb_translate.c ctb_translate.$O: $(SRC_TOP)Headers/prologue.h ctb_translate.$O: $(BLD_TOP)config.h ctb_translate.$O: $(BLD_TOP)forbuild.h +ctb_translate.$O: $(SRC_TOP)Headers/log.h ctb_translate.$O: $(SRC_TOP)Headers/ctb.h ctb_translate.$O: $(SRC_TOP)Headers/ctb_types.h +ctb_translate.$O: $(SRC_TOP)Headers/prefs.h ctb_translate.$O: $(SRC_DIR)/ctb_internal.h +ctb_translate.$O: $(SRC_DIR)/ctb_translate.h ctb_translate.$O: $(SRC_TOP)Headers/ttb.h -ctb_translate.$O: $(SRC_TOP)Headers/prefs.h -ctb_translate.$O: $(SRC_TOP)Headers/unicode.h -ctb_translate.$O: $(SRC_TOP)Headers/charset.h -ctb_translate.$O: $(SRC_TOP)Headers/lock.h -ctb_translate.$O: $(SRC_TOP)Headers/ascii.h -ctb_translate.$O: $(SRC_TOP)Headers/brl_dots.h -ctb_translate.$O: $(SRC_TOP)Headers/log.h -ctb_translate.$O: $(SRC_TOP)Headers/file.h -ctb_translate.$O: $(SRC_TOP)Headers/get_sockets.h -ctb_translate.$O: $(SRC_TOP)Headers/parse.h # Dependencies for dataarea.$O: dataarea.$O: $(SRC_DIR)/dataarea.c @@ -1879,7 +1918,7 @@ gio_null.$O: $(SRC_TOP)Headers/io_generic.h gio_null.$O: $(SRC_TOP)Headers/serial_types.h gio_null.$O: $(SRC_TOP)Headers/usb_types.h gio_null.$O: $(SRC_DIR)/gio_internal.h -gio_null.$O: $(SRC_TOP)Headers/device.h +gio_null.$O: $(SRC_TOP)Headers/parse.h # Dependencies for gio_serial.$O: gio_serial.$O: $(SRC_DIR)/gio_serial.c @@ -2388,7 +2427,6 @@ midi_alsa.$O: $(BLD_TOP)forbuild.h midi_alsa.$O: $(SRC_TOP)Headers/log.h midi_alsa.$O: $(SRC_TOP)Headers/parse.h midi_alsa.$O: $(SRC_TOP)Headers/timing.h -midi_alsa.$O: $(SRC_TOP)Headers/dynld.h midi_alsa.$O: $(SRC_TOP)Headers/midi.h # Dependencies for midi_darwin.$O: @@ -2597,7 +2635,6 @@ pcm_alsa.$O: $(BLD_TOP)config.h pcm_alsa.$O: $(BLD_TOP)forbuild.h pcm_alsa.$O: $(SRC_TOP)Headers/log.h pcm_alsa.$O: $(SRC_TOP)Headers/timing.h -pcm_alsa.$O: $(SRC_TOP)Headers/dynld.h pcm_alsa.$O: $(SRC_TOP)Headers/pcm.h # Dependencies for pcm_android.$O: @@ -3776,6 +3813,7 @@ update.$O: $(BLD_TOP)config.h update.$O: $(BLD_TOP)forbuild.h update.$O: $(SRC_DIR)/parameters.h update.$O: $(SRC_TOP)Headers/log.h +update.$O: $(SRC_TOP)Headers/alert.h update.$O: $(SRC_TOP)Headers/report.h update.$O: $(SRC_TOP)Headers/strfmt.h update.$O: $(SRC_TOP)Headers/strfmth.h diff --git a/Programs/report.c b/Programs/report.c index a5722613413143580c3e62007156ef8bc71626ae..32d1ae76f0cb1424d1fc05c9c79a7af593897a32 100644 --- a/Programs/report.c +++ b/Programs/report.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/revision.c b/Programs/revision.c index 23266498ec9feae1a1d4319b5c543d81e5df881d..7d878c7da2509046565e28fece1757e77d14f36b 100644 --- a/Programs/revision.c +++ b/Programs/revision.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/revision_identifier.h b/Programs/revision_identifier.h index 4741bf9f5cc01e701716e02ce7d83e9b3f4eb48a..46da1c42ea436c5d5782420ac79fe0957776cc2d 100644 --- a/Programs/revision_identifier.h +++ b/Programs/revision_identifier.h @@ -1 +1 @@ -"BRLTTY-5.5" +"BRLTTY-5.6" diff --git a/Programs/routing.c b/Programs/routing.c index 0e3e718fe3d72fb3ce0a01cc522fb291af801a36..8edd27429b001d5a9d198bd9ffa613e0ad0e7ce6 100644 --- a/Programs/routing.c +++ b/Programs/routing.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -40,7 +40,7 @@ #include "routing.h" /* - * These control the performance of cursor routing. The optimal settings + * These control the performance of cursor crd. The optimal settings * will depend heavily on system load, etc. See the documentation for * further details. * NOTE: if you try to route the cursor to an invalid place, BRLTTY won't @@ -58,22 +58,38 @@ typedef enum { typedef struct { #ifdef HAVE_SIGNAL_H - sigset_t signalMask; + struct { + sigset_t mask; + } signal; #endif /* HAVE_SIGNAL_H */ - int screenNumber; - int screenRows; - int screenColumns; - - int verticalDelta; - ScreenCharacter *rowBuffer; - - int cury, curx; - int oldy, oldx; - - long timeSum; - int timeCount; -} RoutingData; + struct { + int number; + int width; + int height; + } screen; + + struct { + int scroll; + int row; + ScreenCharacter *buffer; + } vertical; + + struct { + int column; + int row; + } current; + + struct { + int column; + int row; + } previous; + + struct { + long sum; + int count; + } time; +} CursorRoutingData; typedef enum { CURSOR_DIR_LEFT, @@ -99,181 +115,149 @@ typedef enum { CURSOR_AXIS_VERTICAL } CursorAxis; -static void -adjustHorizontalCoordinate (int *y, int *x, int amount) { - *x += amount; -} - -static void -adjustVerticalCoordinate (int *y, int *x, int amount) { - *y += amount; -} - typedef struct { const CursorDirectionEntry *forward; const CursorDirectionEntry *backward; - void (*adjustCoordinate) (int *y, int *x, int amount); } CursorAxisEntry; static const CursorAxisEntry cursorAxisTable[] = { [CURSOR_AXIS_HORIZONTAL] = { .forward = &cursorDirectionTable[CURSOR_DIR_RIGHT], - .backward = &cursorDirectionTable[CURSOR_DIR_LEFT], - .adjustCoordinate = adjustHorizontalCoordinate + .backward = &cursorDirectionTable[CURSOR_DIR_LEFT] } , [CURSOR_AXIS_VERTICAL] = { .forward = &cursorDirectionTable[CURSOR_DIR_DOWN], - .backward = &cursorDirectionTable[CURSOR_DIR_UP], - .adjustCoordinate = adjustVerticalCoordinate + .backward = &cursorDirectionTable[CURSOR_DIR_UP] } }; #define logRouting(...) logMessage(LOG_CATEGORY(CURSOR_ROUTING), __VA_ARGS__) static int -readScreenRow (RoutingData *routing, ScreenCharacter *buffer, int row) { - if (!buffer) buffer = routing->rowBuffer; - return readScreen(0, row, routing->screenColumns, 1, buffer); +readRow (CursorRoutingData *crd, ScreenCharacter *buffer, int row) { + if (!buffer) buffer = crd->vertical.buffer; + if (readScreenRow(row, crd->screen.width, buffer)) return 1; + logRouting("read failed: row=%d", row); + return 0; } static int -getCurrentPosition (RoutingData *routing) { +getCurrentPosition (CursorRoutingData *crd) { ScreenDescription description; describeScreen(&description); - if (description.number != routing->screenNumber) { - logRouting("screen changed: num=%d", description.number); - routing->screenNumber = description.number; + if (description.number != crd->screen.number) { + logRouting("screen changed: %d -> %d", crd->screen.number, description.number); + crd->screen.number = description.number; return 0; } - if (!routing->rowBuffer) { - routing->screenRows = description.rows; - routing->screenColumns = description.cols; - routing->verticalDelta = 0; + if (!crd->vertical.buffer) { + crd->screen.width = description.cols; + crd->screen.height = description.rows; + crd->vertical.scroll = 0; - if (!(routing->rowBuffer = calloc(routing->screenColumns, sizeof(*routing->rowBuffer)))) { + if (!(crd->vertical.buffer = malloc(ARRAY_SIZE(crd->vertical.buffer, crd->screen.width)))) { logMallocError(); goto error; } logRouting("screen: num=%d cols=%d rows=%d", - routing->screenNumber, - routing->screenColumns, routing->screenRows); - } else if ((routing->screenRows != description.rows) || - (routing->screenColumns != description.cols)) { - logRouting("size changed: cols=%d rows=%d", + crd->screen.number, + crd->screen.width, crd->screen.height); + } else if ((crd->screen.width != description.cols) || + (crd->screen.height != description.rows)) { + logRouting("size changed: %dx%d -> %dx%d", + crd->screen.width, crd->screen.height, description.cols, description.rows); goto error; } - routing->cury = description.posy - routing->verticalDelta; - routing->curx = description.posx; - - if (readScreenRow(routing, NULL, description.posy)) return 1; - logRouting("read failed: row=%d", description.posy); + crd->current.row = description.posy + crd->vertical.scroll; + crd->current.column = description.posx; + return 1; error: - routing->screenNumber = -1; + crd->screen.number = -1; return 0; } static void -moveCursor (RoutingData *routing, const CursorDirectionEntry *direction) { -#ifdef SIGUSR1 - sigset_t oldMask; - sigprocmask(SIG_BLOCK, &routing->signalMask, &oldMask); -#endif /* SIGUSR1 */ +handleVerticalScrolling (CursorRoutingData *crd, int direction) { + int firstRow = crd->vertical.row; + int currentRow = firstRow; - logRouting("move: %s", direction->name); - insertScreenKey(direction->key); + int bestRow = firstRow; + int bestLength = 0; -#ifdef SIGUSR1 - sigprocmask(SIG_SETMASK, &oldMask, NULL); -#endif /* SIGUSR1 */ -} + do { + ScreenCharacter buffer[crd->screen.width]; + if (!readRow(crd, buffer, currentRow)) break; -static int -awaitCursorMotion (RoutingData *routing, int direction, const CursorAxisEntry *axis) { - int moved = 0; - long int timeout = routing->timeSum / routing->timeCount; - TimeValue start; + int length; + { + int before = crd->current.column; + int after = before; - int trgy = routing->cury; - int trgx = routing->curx; + while (buffer[before].text == crd->vertical.buffer[before].text) + if (--before < 0) + break; - routing->oldy = routing->cury; - routing->oldx = routing->curx; + while (buffer[after].text == crd->vertical.buffer[after].text) + if (++after >= crd->screen.width) + break; - axis->adjustCoordinate(&trgy, &trgx, direction); - getMonotonicTime(&start); + length = after - before - 1; + } - while (1) { - long int time; - TimeValue now; + if (length > bestLength) { + bestRow = currentRow; + if ((bestLength = length) == crd->screen.width) break; + } - int oldy; - int oldx; + currentRow -= direction; + } while ((currentRow >= 0) && (currentRow < crd->screen.height)); - asyncWait(ROUTING_INTERVAL); - getMonotonicTime(&now); - time = millisecondsBetween(&start, &now) + 1; + int delta = bestRow - firstRow; + crd->vertical.scroll -= delta; + crd->current.row -= delta; +} - { - int row = routing->cury + routing->verticalDelta; - int bestRow = row; - int bestLength = 0; - - do { - ScreenCharacter buffer[routing->screenColumns]; - if (!readScreenRow(routing, buffer, row)) break; - - { - int before = routing->curx; - int after = before; - - while (buffer[before].text == routing->rowBuffer[before].text) - if (--before < 0) - break; - - while (buffer[after].text == routing->rowBuffer[after].text) - if (++after >= routing->screenColumns) - break; - - { - int length = after - before - 1; - if (length > bestLength) { - bestRow = row; - if ((bestLength = length) == routing->screenColumns) break; - } - } - } +static int +awaitCursorMotion (CursorRoutingData *crd, int direction) { + crd->previous.column = crd->current.column; + crd->previous.row = crd->current.row; - row -= direction; - } while ((row >= 0) && (row < routing->screenRows)); + TimeValue start; + getMonotonicTime(&start); - routing->verticalDelta = bestRow - routing->cury; - } + int moved = 0; + long int timeout = crd->time.sum / crd->time.count; + + while (1) { + asyncWait(ROUTING_INTERVAL); - oldy = routing->cury; - oldx = routing->curx; - if (!getCurrentPosition(routing)) return 0; + TimeValue now; + getMonotonicTime(&now); + long int time = millisecondsBetween(&start, &now) + 1; - if ((routing->cury != oldy) || (routing->curx != oldx)) { + int oldy = crd->current.row; + int oldx = crd->current.column; + if (!getCurrentPosition(crd)) return 0; + + if ((crd->current.row != oldy) || (crd->current.column != oldx)) { logRouting("moved: [%d,%d] -> [%d,%d] (%ldms)", - oldx, oldy, routing->curx, routing->cury, time); + oldx, oldy, crd->current.column, crd->current.row, time); if (!moved) { moved = 1; timeout = (time * 2) + 1; - routing->timeSum += time * 8; - routing->timeCount += 1; + crd->time.sum += time * 8; + crd->time.count += 1; } - if ((routing->cury == trgy) && (routing->curx == trgx)) break; - if (ROUTING_INTERVAL) { start = now; } else { @@ -281,21 +265,41 @@ awaitCursorMotion (RoutingData *routing, int direction, const CursorAxisEntry *a getMonotonicTime(&start); } } else if (time > timeout) { - if (!moved) logRouting("timed out: %ldms", timeout); break; } } + handleVerticalScrolling(crd, direction); + return 1; +} + +static int +moveCursor (CursorRoutingData *crd, const CursorDirectionEntry *direction) { + crd->vertical.row = crd->current.row - crd->vertical.scroll; + if (!readRow(crd, NULL, crd->vertical.row)) return 0; + +#ifdef SIGUSR1 + sigset_t oldMask; + sigprocmask(SIG_BLOCK, &crd->signal.mask, &oldMask); +#endif /* SIGUSR1 */ + + logRouting("move: %s", direction->name); + insertScreenKey(direction->key); + +#ifdef SIGUSR1 + sigprocmask(SIG_SETMASK, &oldMask, NULL); +#endif /* SIGUSR1 */ + return 1; } static RoutingResult -adjustCursorPosition (RoutingData *routing, int where, int trgy, int trgx, const CursorAxisEntry *axis) { +adjustCursorPosition (CursorRoutingData *crd, int where, int trgy, int trgx, const CursorAxisEntry *axis) { logRouting("to: [%d,%d]", trgx, trgy); while (1) { - int dify = trgy - routing->cury; - int difx = (trgx < 0)? 0: (trgx - routing->curx); + int dify = trgy - crd->current.row; + int difx = (trgx < 0)? 0: (trgx - crd->current.column); int dir; /* determine which direction the cursor needs to move in */ @@ -308,32 +312,32 @@ adjustCursorPosition (RoutingData *routing, int where, int trgy, int trgx, const } /* tell the cursor to move in the needed direction */ - moveCursor(routing, ((dir > 0)? axis->forward: axis->backward)); - if (!awaitCursorMotion(routing, dir, axis)) return CRR_FAIL; + if (!moveCursor(crd, ((dir > 0)? axis->forward: axis->backward))) return CRR_FAIL; + if (!awaitCursorMotion(crd, dir)) return CRR_FAIL; - if (routing->cury != routing->oldy) { - if (routing->oldy != trgy) { - if (((routing->cury - routing->oldy) * dir) > 0) { - int dif = trgy - routing->cury; + if (crd->current.row != crd->previous.row) { + if (crd->previous.row != trgy) { + if (((crd->current.row - crd->previous.row) * dir) > 0) { + int dif = trgy - crd->current.row; if ((dif * dify) >= 0) continue; if (where > 0) { - if (routing->cury > trgy) return CRR_NEAR; + if (crd->current.row > trgy) return CRR_NEAR; } else if (where < 0) { - if (routing->cury < trgy) return CRR_NEAR; + if (crd->current.row < trgy) return CRR_NEAR; } else { if ((dif * dif) < (dify * dify)) return CRR_NEAR; } } } - } else if (routing->curx != routing->oldx) { - if (((routing->curx - routing->oldx) * dir) > 0) { - int dif = trgx - routing->curx; - if (routing->cury != trgy) continue; + } else if (crd->current.column != crd->previous.column) { + if (((crd->current.column - crd->previous.column) * dir) > 0) { + int dif = trgx - crd->current.column; + if (crd->current.row != trgy) continue; if ((dif * difx) >= 0) continue; if (where > 0) { - if (routing->curx > trgx) return CRR_NEAR; + if (crd->current.column > trgx) return CRR_NEAR; } else if (where < 0) { - if (routing->curx < trgx) return CRR_NEAR; + if (crd->current.column < trgx) return CRR_NEAR; } else { if ((dif * dif) < (difx * difx)) return CRR_NEAR; } @@ -346,19 +350,19 @@ adjustCursorPosition (RoutingData *routing, int where, int trgy, int trgx, const * try going back to the previous position since it was obviously * the nearest ever reached. */ - moveCursor(routing, ((dir > 0)? axis->backward: axis->forward)); - return awaitCursorMotion(routing, -dir, axis)? CRR_NEAR: CRR_FAIL; + if (!moveCursor(crd, ((dir > 0)? axis->backward: axis->forward))) return CRR_FAIL; + return awaitCursorMotion(crd, -dir)? CRR_NEAR: CRR_FAIL; } } static RoutingResult -adjustCursorHorizontally (RoutingData *routing, int where, int row, int column) { - return adjustCursorPosition(routing, where, row, column, &cursorAxisTable[CURSOR_AXIS_HORIZONTAL]); +adjustCursorHorizontally (CursorRoutingData *crd, int where, int row, int column) { + return adjustCursorPosition(crd, where, row, column, &cursorAxisTable[CURSOR_AXIS_HORIZONTAL]); } static RoutingResult -adjustCursorVertically (RoutingData *routing, int where, int row) { - return adjustCursorPosition(routing, where, row, -1, &cursorAxisTable[CURSOR_AXIS_VERTICAL]); +adjustCursorVertically (CursorRoutingData *crd, int where, int row) { + return adjustCursorPosition(crd, where, row, -1, &cursorAxisTable[CURSOR_AXIS_VERTICAL]); } typedef struct { @@ -369,32 +373,32 @@ typedef struct { static RoutingStatus routeCursor (const RoutingParameters *parameters) { - RoutingData routing; + CursorRoutingData crd; #ifdef SIGUSR1 /* Set up the signal mask. */ - sigemptyset(&routing.signalMask); - sigaddset(&routing.signalMask, SIGUSR1); - sigprocmask(SIG_UNBLOCK, &routing.signalMask, NULL); + sigemptyset(&crd.signal.mask); + sigaddset(&crd.signal.mask, SIGUSR1); + sigprocmask(SIG_UNBLOCK, &crd.signal.mask, NULL); #endif /* SIGUSR1 */ /* initialize the routing data structure */ - routing.screenNumber = parameters->screen; - routing.rowBuffer = NULL; - routing.timeSum = ROUTING_TIMEOUT; - routing.timeCount = 1; + crd.screen.number = parameters->screen; + crd.vertical.buffer = NULL; + crd.time.sum = ROUTING_TIMEOUT; + crd.time.count = 1; - if (getCurrentPosition(&routing)) { - logRouting("from: [%d,%d]", routing.curx, routing.cury); + if (getCurrentPosition(&crd)) { + logRouting("from: [%d,%d]", crd.current.column, crd.current.row); if (parameters->column < 0) { - adjustCursorVertically(&routing, 0, parameters->row); + adjustCursorVertically(&crd, 0, parameters->row); } else { - if (adjustCursorVertically(&routing, -1, parameters->row) != CRR_FAIL) { - if (adjustCursorHorizontally(&routing, 0, parameters->row, parameters->column) == CRR_NEAR) { - if (routing.cury < parameters->row) { - if (adjustCursorVertically(&routing, 1, routing.cury+1) != CRR_FAIL) { - adjustCursorHorizontally(&routing, 0, parameters->row, parameters->column); + if (adjustCursorVertically(&crd, -1, parameters->row) != CRR_FAIL) { + if (adjustCursorHorizontally(&crd, 0, parameters->row, parameters->column) == CRR_NEAR) { + if (crd.current.row < parameters->row) { + if (adjustCursorVertically(&crd, 1, crd.current.row+1) != CRR_FAIL) { + adjustCursorHorizontally(&crd, 0, parameters->row, parameters->column); } } } @@ -402,11 +406,11 @@ routeCursor (const RoutingParameters *parameters) { } } - if (routing.rowBuffer) free(routing.rowBuffer); + if (crd.vertical.buffer) free(crd.vertical.buffer); - if (routing.screenNumber != parameters->screen) return ROUTING_ERROR; - if (routing.cury != parameters->row) return ROUTING_WRONG_ROW; - if ((parameters->column >= 0) && (routing.curx != parameters->column)) return ROUTING_WRONG_COLUMN; + if (crd.screen.number != parameters->screen) return ROUTING_ERROR; + if (crd.current.row != parameters->row) return ROUTING_WRONG_ROW; + if ((parameters->column >= 0) && (crd.current.column != parameters->column)) return ROUTING_WRONG_COLUMN; return ROUTING_DONE; } diff --git a/Programs/routing.h b/Programs/routing.h index b2e010f63dcb37250c9f167e20a554d188bf0376..17536b6d574e52a651bcd52c4376150a90a7b70c 100644 --- a/Programs/routing.h +++ b/Programs/routing.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr.c b/Programs/scr.c index 00200e080d018eb0292ab8a18664dfb2c7c933a4..fa06caa219b10d8b12172920a8a502caf00c60f9 100644 --- a/Programs/scr.c +++ b/Programs/scr.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr.h b/Programs/scr.h index 1666b0326368f06d1d9ee2424253680756f17c96..5664a4f798cf8123699e2447720bc2ddc78aac17 100644 --- a/Programs/scr.h +++ b/Programs/scr.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -47,6 +47,16 @@ extern int userVirtualTerminal (int number); extern int handleScreenCommands (int command, void *data); extern KeyTableCommandContext getScreenCommandContext (void); +static inline int +readScreenRows (int row, int width, int height, ScreenCharacter *buffer) { + return readScreen(0, row, width, height, buffer); +} + +static inline int +readScreenRow (int row, int width, ScreenCharacter *buffer) { + return readScreenRows(row, width, 1, buffer); +} + /* Routines which apply to the routing screen. * An extra `thread' for the cursor routing subprocess. * This is needed because the forked subprocess shares its parent's diff --git a/Programs/scr_base.c b/Programs/scr_base.c index afb3caa1c7a74c7c826a914ac99de9f15a68f509..75b81e9900cdcfda6e3ef25e407071e725a504a9 100644 --- a/Programs/scr_base.c +++ b/Programs/scr_base.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_driver.c b/Programs/scr_driver.c index 0b2b5ca6b5873883efa2cfdb3aeac4b8d956fda6..da9a036834f19075ade69f2cbb939017462aa144 100644 --- a/Programs/scr_driver.c +++ b/Programs/scr_driver.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_frozen.c b/Programs/scr_frozen.c index 14c0a9fb46386f76579a1fab7a95f50d4169eaca..eda1243a8940c03ac727272c6f71e3608606b722 100644 --- a/Programs/scr_frozen.c +++ b/Programs/scr_frozen.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -45,9 +45,9 @@ ASYNC_ALARM_CALLBACK(handleFreezeReminderAlarm) { static int startFreezeReminderAlarm (void) { if (freezeReminderAlarm) return 1; - return asyncSetAlarmIn(&freezeReminderAlarm, - SCREEN_FREEZE_REMINDER_INTERVAL, - handleFreezeReminderAlarm, NULL); + return asyncNewRelativeAlarm(&freezeReminderAlarm, + SCREEN_FREEZE_REMINDER_INTERVAL, + handleFreezeReminderAlarm, NULL); } static void diff --git a/Programs/scr_frozen.h b/Programs/scr_frozen.h index ca4b8effbbd151b3adc0d06215cdc5210de8d6bf..525220e68c1aba109ba4b332fb5f30ec7d48d829 100644 --- a/Programs/scr_frozen.h +++ b/Programs/scr_frozen.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_gpm.c b/Programs/scr_gpm.c index 15d9687e3f54b78e26d6eec2038b9b86a4ba0836..a2648e058526bb74823de42561d3baf390ccdd6d 100644 --- a/Programs/scr_gpm.c +++ b/Programs/scr_gpm.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -62,7 +62,7 @@ gpmOpenConnection (void) { if (Gpm_Open(&options, -1) == -1) { logMessage(LOG_DEBUG, "GPM open error: %s", strerror(errno)); - asyncSetAlarmIn(NULL, GPM_CONNECTION_RESET_DELAY, gpmResetConnection, NULL); + asyncNewRelativeAlarm(NULL, GPM_CONNECTION_RESET_DELAY, gpmResetConnection, NULL); gpmConnectionState = GCS_FAILED; return 0; } diff --git a/Programs/scr_help.c b/Programs/scr_help.c index 568e0d51876c8153ea1efd4158aa2a76614e344b..9d09d1bf19f8e4ab396ce8c1e201edd028b82d56 100644 --- a/Programs/scr_help.c +++ b/Programs/scr_help.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_help.h b/Programs/scr_help.h index a883d452128f623a5356844c3a545f272b39d864..c5dc6a3c388ed6aafd00cee0e407a8ca2f75954a 100644 --- a/Programs/scr_help.h +++ b/Programs/scr_help.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_internal.h b/Programs/scr_internal.h index f3417fe8f2309f5d4249fd3e68015a87d3b619a8..b3043a967548e0d2d99c86b4f00c31df1d6b9782 100644 --- a/Programs/scr_internal.h +++ b/Programs/scr_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_main.c b/Programs/scr_main.c index fc8cbac419ceb73303b6c5fb393891511c66d8eb..37560cfdf33d796d37f89fd31d5f86e5cc5e2b63 100644 --- a/Programs/scr_main.c +++ b/Programs/scr_main.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_menu.c b/Programs/scr_menu.c index d2895a096adb784f8c692daee59a06df40f8f782..7f96aa90501a8635a582830b8d1e0d496ac2f3b5 100644 --- a/Programs/scr_menu.c +++ b/Programs/scr_menu.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_menu.h b/Programs/scr_menu.h index 539adf052a86b5e1165b91e9e81c08d67f07e35a..ce65c8661c6034c57a1f2844eeda3acff941ff49 100644 --- a/Programs/scr_menu.h +++ b/Programs/scr_menu.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_real.c b/Programs/scr_real.c index 3639e5637b2439f8107d4d17cf496a3a1033c135..d6b2db3bbee59ba71c2d86fefee2c44c8d0902b0 100644 --- a/Programs/scr_real.c +++ b/Programs/scr_real.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_special.c b/Programs/scr_special.c index 484589f0bc75883976259faa39864ea48ab48dd8..b3fb99dd7136f218597e30f529a15c4bb6d00e21 100644 --- a/Programs/scr_special.c +++ b/Programs/scr_special.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_special.h b/Programs/scr_special.h index 25caaa84d22b094f3c30c0d4119265a3416413e8..dc71fd7588531a36a0aa1db7b830527eefe29493 100644 --- a/Programs/scr_special.h +++ b/Programs/scr_special.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scr_utils.c b/Programs/scr_utils.c index 59d70f5c038938b22b3848b61b8f9a41d08095cd..84e0ef3c9ffced6c04d07edb3b4a188b0e24edaf 100644 --- a/Programs/scr_utils.c +++ b/Programs/scr_utils.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/scrtest.c b/Programs/scrtest.c index 64fe009e4c7a5fb65eca6f7c3a44af9222952f5b..9f68970830f5e6b7113230496a80130df0d71249 100644 --- a/Programs/scrtest.c +++ b/Programs/scrtest.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial.c b/Programs/serial.c index c17837b864c71b7daf75b7f67738c206e0763bb3..51b7184b0680242f1ece213a4e3ab6db9b44a88e 100644 --- a/Programs/serial.c +++ b/Programs/serial.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -866,12 +866,12 @@ serialGetStream (SerialDevice *serial) { } int -isSerialDevice (const char **identifier) { +isSerialDeviceIdentifier (const char **identifier) { #ifdef ALLOW_DOS_DEVICE_NAMES if (isDosDevice(*identifier, "COM")) return 1; #endif /* ALLOW_DOS_DEVICE_NAMES */ - if (isQualifiedDevice(identifier, "serial")) return 1; - if (isUnqualifiedDevice(*identifier)) return 1; + if (hasQualifier(identifier, "serial")) return 1; + if (hasNoQualifier(*identifier)) return 1; return 0; } diff --git a/Programs/serial_grub.c b/Programs/serial_grub.c index a82c23389e43f70daa943524c244f00ba674141c..5dd6b535f594a600dd2f9c312396ac8b52c370ff 100644 --- a/Programs/serial_grub.c +++ b/Programs/serial_grub.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_grub.h b/Programs/serial_grub.h index e742630f85c5ecf00cb877892c1dcfd18aea29cc..42e3cb3b5479eb9b5d71ab07ea948d60b06b10da 100644 --- a/Programs/serial_grub.h +++ b/Programs/serial_grub.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_internal.h b/Programs/serial_internal.h index 1af3f6b6267873e2528e03e5a06e74e75102d640..23b68ad9540e4bee2c418cab8fdbf19acd3e1e78 100644 --- a/Programs/serial_internal.h +++ b/Programs/serial_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_msdos.c b/Programs/serial_msdos.c index 640317b7ca9cf11f9a48488099bb62caaea095c8..431fa224561cb7cd6ef04529a0e2ca7d06b96c86 100644 --- a/Programs/serial_msdos.c +++ b/Programs/serial_msdos.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_msdos.h b/Programs/serial_msdos.h index 40ed97f6fd4da061bbc9fb4bda3701de3a00c9e1..0710f72f56f27cfde754eab421a0fb4aa416898f 100644 --- a/Programs/serial_msdos.h +++ b/Programs/serial_msdos.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_none.c b/Programs/serial_none.c index 4b9a9b38be7abd3b187cb067f3df9e0e355331a3..130d74f6dbbc2aba5d024bd0c8b509f2032e64d5 100644 --- a/Programs/serial_none.c +++ b/Programs/serial_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_none.h b/Programs/serial_none.h index b03b2bcdd7c5f93366eb025cbb5eb1a52feae7ee..650796d8264c9df18d9257ac612f8055aa23d128 100644 --- a/Programs/serial_none.h +++ b/Programs/serial_none.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_termios.c b/Programs/serial_termios.c index ec55fcc044c097a9b50bd318327ebdca3215dc09..49de58fd23e3984b87f1db793e23c8127c6db64b 100644 --- a/Programs/serial_termios.c +++ b/Programs/serial_termios.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_termios.h b/Programs/serial_termios.h index 7b87ade23616ff36ec41a09fb7f2bc3bd4a83f76..73924ff499ad9bad8966be8423b8ff4865adcd6b 100644 --- a/Programs/serial_termios.h +++ b/Programs/serial_termios.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_uart.h b/Programs/serial_uart.h index 2879b26a18d27ce6b156ba16c6385f89973f23e8..28dae275ece25d0c058d93e6ef8a6bf2c750f6a2 100644 --- a/Programs/serial_uart.h +++ b/Programs/serial_uart.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_windows.c b/Programs/serial_windows.c index b554949155d257c73dc9ae18d06ccc3848a006c5..dfafcda83c6ba4ecdf92ab28a5c37d434a08421b 100644 --- a/Programs/serial_windows.c +++ b/Programs/serial_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/serial_windows.h b/Programs/serial_windows.h index 14b18690457f4b7728a0e1c5831824f7459d7a63..0fc423e2d472c3c990d9123451d472798ca03025 100644 --- a/Programs/serial_windows.h +++ b/Programs/serial_windows.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/service_libsystemd.c b/Programs/service_libsystemd.c index 60b88d4d5b8041290fc77c7dfa68bcbd319dbbe0..3286cf7d45c649a6727abdc7468b2c7938d9355d 100644 --- a/Programs/service_libsystemd.c +++ b/Programs/service_libsystemd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/service_none.c b/Programs/service_none.c index 16a9e8e13c9c21c5e56ebd07979c2a57af7b7b5e..92907fb2cb8c313201bcb49f93b879f9861d9228 100644 --- a/Programs/service_none.c +++ b/Programs/service_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/service_windows.c b/Programs/service_windows.c index bbfccf36d0860ab3e775be9d235a73642924ab71..60468d71f0696f86ef1bdf16b7f59c2f7751ddc8 100644 --- a/Programs/service_windows.c +++ b/Programs/service_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ses.c b/Programs/ses.c index 5ef58d710d166d2d871fc13caaee392011148518..87f6e54b2f09aff595bd240b62cb5152eae9be42 100644 --- a/Programs/ses.c +++ b/Programs/ses.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ses.h b/Programs/ses.h index a052d8056b4168ba8385852dd3059bd394154f90..535fefe415f6e9f99b3dba9e36d2d752a292305f 100644 --- a/Programs/ses.h +++ b/Programs/ses.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk.c b/Programs/spk.c index 8cc761b22d1516b9ebae1016bc53f0abd51d6c6a..9ce0437af60f09655549e1313faa37a755c8c9f2 100644 --- a/Programs/spk.c +++ b/Programs/spk.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk_base.c b/Programs/spk_base.c index 8bbacc2952c6856495fecbe813dddc042feb7daa..b6c2ce950334555e4e5f0874f7c3da0d35cd987f 100644 --- a/Programs/spk_base.c +++ b/Programs/spk_base.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk_driver.c b/Programs/spk_driver.c index 7c125df9a1685a780d12ad9396d2e4a5e426cecd..b3a2f48bbfbb03209968b88547f31152416eeb4f 100644 --- a/Programs/spk_driver.c +++ b/Programs/spk_driver.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk_input.c b/Programs/spk_input.c index 1f9c13479fc3af3c4c576eb5f39d8f0af2ab5186..81fd1bc3582fe214c505fd0ad868c6a9eff01c58 100644 --- a/Programs/spk_input.c +++ b/Programs/spk_input.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk_input.h b/Programs/spk_input.h index 34fd2718759041e5a31fe55a16ce8356a402b977..52599bfb88c494a1bb11874d11a1b82da9969912 100644 --- a/Programs/spk_input.h +++ b/Programs/spk_input.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk_thread.c b/Programs/spk_thread.c index 385eaf4d9a3b1af500e0820b22e4141c11173809..ce59035a7e69ac304a1470275d3298e025416876 100644 --- a/Programs/spk_thread.c +++ b/Programs/spk_thread.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spk_thread.h b/Programs/spk_thread.h index 8ce706bcc43bbe15284c08b8d99dce111db0aefc..db85b46a3c39a27594476ceee865b847559dceb5 100644 --- a/Programs/spk_thread.h +++ b/Programs/spk_thread.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/spktest.c b/Programs/spktest.c index ddfd58dea58433b5fb0ef6203126581d6bc7f8ec..dec61d0cab046e66ee48c68801cf1657f3f123d6 100644 --- a/Programs/spktest.c +++ b/Programs/spktest.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/status.c b/Programs/status.c index 445d33a485d5fd328291c72e3d8bc1689031d9a2..ad706ca5014784647ce78f80d02d374cb38f030e 100644 --- a/Programs/status.c +++ b/Programs/status.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/status.h b/Programs/status.h index 9a66d600ef033702bf31c784670d220599309e06..ff1d0a36c359f999d6b708265181def787fe551a 100644 --- a/Programs/status.h +++ b/Programs/status.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/sys_darwin.c b/Programs/sys_darwin.c index 0acc2db5f344e0f4796f9dda149bf3e14defd6b5..d8ebd876cd617c7876bc799ce3597718bf828afc 100644 --- a/Programs/sys_darwin.c +++ b/Programs/sys_darwin.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/sys_freebsd.c b/Programs/sys_freebsd.c index cb71ab8d5bf23863054ac9ff549228369c9e1a5d..9b714cc15b2d691b449b271a858466d861ef089f 100644 --- a/Programs/sys_freebsd.c +++ b/Programs/sys_freebsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/sys_kfreebsd.c b/Programs/sys_kfreebsd.c index cb71ab8d5bf23863054ac9ff549228369c9e1a5d..9b714cc15b2d691b449b271a858466d861ef089f 100644 --- a/Programs/sys_kfreebsd.c +++ b/Programs/sys_kfreebsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/sys_netbsd.c b/Programs/sys_netbsd.c index 50d8e1ff352ad6803f329493a50731f8750e49d7..f6beb5fc86c003cc32e3745c42beeae2e229dbdf 100644 --- a/Programs/sys_netbsd.c +++ b/Programs/sys_netbsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/sys_openbsd.c b/Programs/sys_openbsd.c index 50d8e1ff352ad6803f329493a50731f8750e49d7..f6beb5fc86c003cc32e3745c42beeae2e229dbdf 100644 --- a/Programs/sys_openbsd.c +++ b/Programs/sys_openbsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/sys_solaris.c b/Programs/sys_solaris.c index 84cb25700cb4e1000ad5311c50e660f68ef2327e..b3a06ab1a1c9c97529399c80df0d95a40d196cf7 100644 --- a/Programs/sys_solaris.c +++ b/Programs/sys_solaris.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/system_darwin.c b/Programs/system_darwin.c index 01d77e41bd2985840b9201248168b05c77a6806b..c1723c292a1b4a94602b35daab9e1b87c680cbb4 100644 --- a/Programs/system_darwin.c +++ b/Programs/system_darwin.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/system_java.c b/Programs/system_java.c index 0dcf3521298b3528db7b34de36d44108caf7556f..f844681b18e8cb839555ea5d5babb5e1fd9a98bc 100644 --- a/Programs/system_java.c +++ b/Programs/system_java.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/system_linux.c b/Programs/system_linux.c index d46ec790e15d076b6d8357edd2732191b0741c0f..43e36e3b0b8c85c40235a47c55b7541613d65aff 100644 --- a/Programs/system_linux.c +++ b/Programs/system_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/system_msdos.c b/Programs/system_msdos.c index d0855d1f86714a2b54a5594928db1ccabb3909b7..1496162ad14e7dc8c15c398ba234047c2acb27e9 100644 --- a/Programs/system_msdos.c +++ b/Programs/system_msdos.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/system_none.c b/Programs/system_none.c index 307b688dbfbb6bff1a54371f5cbd812021adc7da..acf83e5a164b7399d6445597014fca821a646657 100644 --- a/Programs/system_none.c +++ b/Programs/system_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/system_windows.c b/Programs/system_windows.c index bd7612759586cd6172e7fbee409194ace51bec41..19131257bcadb5a167d5f6853b563f596acb9404 100644 --- a/Programs/system_windows.c +++ b/Programs/system_windows.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/tbl2hex.c b/Programs/tbl2hex.c index d4786a4c76299cc68844e1d27ec1ee8409908fb3..224e53bb59d8175d29a6bdbb82aff13b4014e29d 100644 --- a/Programs/tbl2hex.c +++ b/Programs/tbl2hex.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -251,3 +251,20 @@ main (int argc, char *argv[]) { return exitStatus; } + +#include "ctb_internal.h" + +const ContractionTableTranslationMethods * +getContractionTableTranslationMethods_native (void) { + return NULL; +} + +const ContractionTableTranslationMethods * +getContractionTableTranslationMethods_external (void) { + return NULL; +} + +const ContractionTableTranslationMethods * +getContractionTableTranslationMethods_louis (void) { + return NULL; +} diff --git a/Programs/thread.c b/Programs/thread.c index c07fdca55bc8b32ab2ed2ac7c2f913153bb69339..7b91abf72174583bf7864ecf2e9e574a510caecd 100644 --- a/Programs/thread.c +++ b/Programs/thread.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/timing.c b/Programs/timing.c index 2e7269d45a070d72a0c556629b6aea724a97535d..765a6256767cfc504950a584523eaf8657c21245 100644 --- a/Programs/timing.c +++ b/Programs/timing.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_compile.c b/Programs/ttb_compile.c index d11b2587b903f2e43d47782e846c4ac7bd8f8834..d04793697e5c41cd8b3157b36709d0f447b3a5b2 100644 --- a/Programs/ttb_compile.c +++ b/Programs/ttb_compile.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_compile.h b/Programs/ttb_compile.h index 4fe1240d9315bc361ea943e52dc856abe20d00c9..cd96f8c4f6d7685c536481d3a3ec6c3f2ed2b67d 100644 --- a/Programs/ttb_compile.h +++ b/Programs/ttb_compile.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_gnome.c b/Programs/ttb_gnome.c index 2f6a3176ce44e42d3561852a27c3d50ad8944395..069686217f89bec7ee4058a12af29bb631ebdc63 100644 --- a/Programs/ttb_gnome.c +++ b/Programs/ttb_gnome.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_internal.h b/Programs/ttb_internal.h index f2c656f461166e6200f4cf44440821da4725b22f..030ad99d299437967d67b00348bfaf6e8bf55f01 100644 --- a/Programs/ttb_internal.h +++ b/Programs/ttb_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_louis.c b/Programs/ttb_louis.c index 29e92a8fcbdefe64ba53f238016a641ea1936856..7f5d5854e1edfc2f936a7ed5b28e2c257650c93d 100644 --- a/Programs/ttb_louis.c +++ b/Programs/ttb_louis.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_native.c b/Programs/ttb_native.c index ed44553cab292dc29694115f987c81cf21af840d..40a584063e71b9c934c791c9c3777e54b9054a3a 100644 --- a/Programs/ttb_native.c +++ b/Programs/ttb_native.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/ttb_translate.c b/Programs/ttb_translate.c index c89e42ced326764bf52df7ce7637cb71d47d6920..3e1e348d991c77fdc34dba906b12ed5612b3fb47 100644 --- a/Programs/ttb_translate.c +++ b/Programs/ttb_translate.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/tune.c b/Programs/tune.c index d8e4e22469afcd75aa147072eceece82135b1651..cafbb07234202ad92d98b613d1247f41e4fc729e 100644 --- a/Programs/tune.c +++ b/Programs/tune.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -76,7 +76,7 @@ openTuneDevice (void) { if (noteMethods) { if ((noteDevice = noteMethods->construct(openErrorLevel)) != NULL) { - asyncSetAlarmIn(&tuneDeviceCloseTimer, timeout, handleTuneDeviceCloseTimeout, NULL); + asyncNewRelativeAlarm(&tuneDeviceCloseTimer, timeout, handleTuneDeviceCloseTimeout, NULL); return 1; } } diff --git a/Programs/tune_build.c b/Programs/tune_build.c index cec94947bf12ddda6d00125b88b3563ba34df3a9..8a5a62184eebd77d310a8c6e233bc01a7f04790d 100644 --- a/Programs/tune_build.c +++ b/Programs/tune_build.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/tune_utils.c b/Programs/tune_utils.c index 344b714a10cbbf0f17c39a233c1b1145eb516dbc..ff880668479b8786bb530323ddc3e9c21083bb7a 100644 --- a/Programs/tune_utils.c +++ b/Programs/tune_utils.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/unicode.c b/Programs/unicode.c index e0ee1fb03dc89ef875892c55d0ee5f4d8f54b846..e898d7346e6cf5d20e98543e32217161d97ab9ec 100644 --- a/Programs/unicode.c +++ b/Programs/unicode.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/update.c b/Programs/update.c index 8059531097c53214560e211c016455e8dd6368e0..4b4c7b1db36240844db7854597e25a3f6dcd3a4e 100644 --- a/Programs/update.c +++ b/Programs/update.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -23,6 +23,7 @@ #include "parameters.h" #include "log.h" +#include "alert.h" #include "report.h" #include "strfmt.h" #include "update.h" @@ -305,6 +306,81 @@ showInfo (void) { return writeBrailleText(mode, text); } +static int +saveScreenCharacters ( + ScreenCharacter **buffer, size_t *size, + const ScreenCharacter *characters, size_t count +) { + size_t newSize = count * sizeof(*characters); + + if (newSize > *size) { + ScreenCharacter *newBuffer = malloc(newSize); + + if (!newBuffer) { + logMallocError(); + return 0; + } + + if (*buffer) free(*buffer); + *buffer = newBuffer; + *size = newSize; + } + + memcpy(*buffer, characters, newSize); + return 1; +} + +static void +checkScreenScroll (int track) { + const int rowCount = 3; + + static int oldScreen = -1; + static int oldRow = -1; + static int oldWidth = 0; + static size_t oldSize = 0; + static ScreenCharacter *oldCharacters = NULL; + + int newScreen = scr.number; + int newWidth = scr.cols; + size_t newCount = newWidth * rowCount; + ScreenCharacter newCharacters[newCount]; + + int newRow = ses->winy; + int newTop = newRow - (rowCount - 1); + + if (newTop < 0) { + newCount = 0; + } else { + readScreenRows(newTop, newWidth, rowCount, newCharacters); + + if (track && prefs.trackScreenScroll && oldCharacters && + (newScreen == oldScreen) && (newWidth == oldWidth) && + (newRow == oldRow)) { + while (newTop > 0) { + if ((scr.posy >= newTop) && (scr.posy <= newRow)) break; + + if (isSameRow(oldCharacters, newCharacters, newCount, isSameCharacter)) { + if (newRow != ses->winy) { + ses->winy = newRow; + alert(ALERT_SCROLL_UP); + } + + break; + } + + readScreenRows(--newTop, newWidth, rowCount, newCharacters); + newRow -= 1; + } + } + } + + if (saveScreenCharacters(&oldCharacters, &oldSize, newCharacters, newCount)) { + oldScreen = newScreen; + oldRow = ses->winy; + oldWidth = newWidth; + } +} + #ifdef ENABLE_SPEECH_SUPPORT static int wasAutospeaking; @@ -324,7 +400,7 @@ autospeak (AutospeakMode mode) { int newWidth = scr.cols; ScreenCharacter newCharacters[newWidth]; - readScreen(0, ses->winy, newWidth, 1, newCharacters); + readScreenRow(ses->winy, newWidth, newCharacters); if (!spk.track.isActive) { const ScreenCharacter *characters = newCharacters; @@ -517,29 +593,13 @@ autospeak (AutospeakMode mode) { } } - { - size_t newSize = newWidth * sizeof(*oldCharacters); - - if (newSize > oldSize) { - ScreenCharacter *newBuffer = malloc(newSize); - - if (!newBuffer) { - logMallocError(); - return; - } - - oldCharacters = newBuffer; - oldSize = newSize; - } - - memcpy(oldCharacters, newCharacters, newSize); + if (saveScreenCharacters(&oldCharacters, &oldSize, newCharacters, newWidth)) { + oldScreen = newScreen; + oldX = newX; + oldY = newY; + oldWidth = newWidth; + cursorAssumedStable = 0; } - - oldScreen = newScreen; - oldX = newX; - oldY = newY; - oldWidth = newWidth; - cursorAssumedStable = 0; } void @@ -581,8 +641,6 @@ writeBrailleWindow (BrailleDisplay *brl, const wchar_t *text) { static void doUpdate (void) { - int screenPointerMoved = 0; - logMessage(LOG_CATEGORY(UPDATE_EVENTS), "starting"); unrequireAllBlinkDescriptors(); refreshScreen(); @@ -621,6 +679,9 @@ doUpdate (void) { } } + int screenPointerHasMoved = 0; + int trackScreenScroll = 0; + if (ses->trackScreenCursor) { #ifdef ENABLE_SPEECH_SUPPORT if (!spk.track.isActive) @@ -638,25 +699,33 @@ doUpdate (void) { } /* If the cursor moves in cursor tracking mode: */ - if (!isRouting() && (scr.posx != ses->trkx || scr.posy != ses->trky)) { - int oldx = ses->winx; - int oldy = ses->winy; - - trackScreenCursor(0); - logMessage(LOG_CATEGORY(CURSOR_TRACKING), - "scr=%u csr=[%u,%u]->[%u,%u] win=[%u,%u]->[%u,%u]", - scr.number, - ses->trkx, ses->trky, scr.posx, scr.posy, - oldx, oldy, ses->winx, ses->winy); - - ses->spkx = ses->trkx = scr.posx; - ses->spky = ses->trky = scr.posy; - } else if (checkScreenPointer()) { - screenPointerMoved = 1; + if (!isRouting()) { + if ((scr.posx != ses->trkx) || (scr.posy != ses->trky)) { + int oldx = ses->winx; + int oldy = ses->winy; + + trackScreenCursor(0); + logMessage(LOG_CATEGORY(CURSOR_TRACKING), + "scr=%u csr=[%u,%u]->[%u,%u] win=[%u,%u]->[%u,%u]", + scr.number, + ses->trkx, ses->trky, scr.posx, scr.posy, + oldx, oldy, ses->winx, ses->winy); + + ses->spkx = ses->trkx = scr.posx; + ses->spky = ses->trky = scr.posy; + } else if (checkScreenPointer()) { + screenPointerHasMoved = 1; + } else { + trackScreenScroll = 1; + } } } + } else { + trackScreenScroll = 1; } + checkScreenScroll(trackScreenScroll); + #ifdef ENABLE_SPEECH_SUPPORT if (spk.canAutospeak) { int isAutospeaking = isAutospeakActive(); @@ -673,7 +742,7 @@ doUpdate (void) { /* There are a few things to take care of if the display has moved. */ if ((ses->winx != oldwinx) || (ses->winy != oldwiny)) { - if (!screenPointerMoved) highlightBrailleWindowLocation(); + if (!screenPointerHasMoved) highlightBrailleWindowLocation(); /* Attributes are blinking. * We could check to see if we changed screen, but that doesn't @@ -819,9 +888,15 @@ doUpdate (void) { #endif /* ENABLE_CONTRACTED_BRAILLE */ { int windowColumns = MIN(textCount, scr.cols-ses->winx); - ScreenCharacter characters[textLength]; + ScreenCharacter characters[textLength]; readScreen(ses->winx, ses->winy, windowColumns, brl.textRows, characters); + + if (prefs.wordWrap) { + int columns = getWordWrapLength(ses->winy, ses->winx, windowColumns); + if (columns < windowColumns) windowColumns = columns; + } + if (windowColumns < textCount) { /* We got a rectangular piece of text with readScreen but the display * is in an off-right position with some cells at the end blank @@ -1015,7 +1090,7 @@ ASYNC_ALARM_CALLBACK(handleUpdateAlarm) { static void setUpdateAlarm (void) { if (!updateSuspendCount && !updateAlarm) { - asyncSetAlarmTo(&updateAlarm, &updateTime, handleUpdateAlarm, NULL); + asyncNewAbsoluteAlarm(&updateAlarm, &updateTime, handleUpdateAlarm, NULL); } } diff --git a/Programs/update.h b/Programs/update.h index bf5fd35f2d31ecd23fe3d7f5933d235f641b5b55..4c8cb2c2fb7b597c4d76006e5b6790af88b41393 100644 --- a/Programs/update.h +++ b/Programs/update.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb.c b/Programs/usb.c index 4ffb49e54c4ff797e9a88e82e861006d0a344e6e..7a52cf400755cbf4843d6a8bdca5f0e549ad31b8 100644 --- a/Programs/usb.c +++ b/Programs/usb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -1119,8 +1119,8 @@ usbSchedulePendingInputRequest (UsbEndpoint *endpoint) { if (!*delay) *delay = 1; *delay = MIN(*delay, USB_INPUT_INTERRUPT_DELAY_MAXIMUM); - asyncSetAlarmIn(&endpoint->direction.input.pending.alarm, *delay, - usbHandleSchedulePendingInputRequest, endpoint); + asyncNewRelativeAlarm(&endpoint->direction.input.pending.alarm, *delay, + usbHandleSchedulePendingInputRequest, endpoint); *delay += 1; } @@ -1640,6 +1640,6 @@ usbCloseChannel (UsbChannel *channel) { } int -isUsbDevice (const char **identifier) { - return isQualifiedDevice(identifier, "usb"); +isUsbDeviceIdentifier (const char **identifier) { + return hasQualifier(identifier, "usb"); } diff --git a/Programs/usb_adapters.c b/Programs/usb_adapters.c index 7e7bb72a03fb00ef392a0d2b93e33813c4c6b5c2..02030053549962224eefdf21e2201f82b4c3806e 100644 --- a/Programs/usb_adapters.c +++ b/Programs/usb_adapters.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_adapters.h b/Programs/usb_adapters.h index 33c6305630f3dd6ba561b6d09109ba58dc1d80ea..b5806447ab3c1b11b291a19fe7cd5967f1060b29 100644 --- a/Programs/usb_adapters.h +++ b/Programs/usb_adapters.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_android.c b/Programs/usb_android.c index 6515b20ed4cc7141c3a29b43898b9e0be35148f2..8ef0e83e3ebbd457b610d374161564aaedcefe3c 100644 --- a/Programs/usb_android.c +++ b/Programs/usb_android.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_belkin.c b/Programs/usb_belkin.c index 23a02a2673e2ca0558a7011bbf3647f02f5dc1cc..ed4c1bbc206168247966620d5628d65d841b19b6 100644 --- a/Programs/usb_belkin.c +++ b/Programs/usb_belkin.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_belkin.h b/Programs/usb_belkin.h index 475d3434861ef3204dd0569276462eab0c6b64ad..fca3f743deed7b1d63d8e4e3deb77aadb483799d 100644 --- a/Programs/usb_belkin.h +++ b/Programs/usb_belkin.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_bsd.h b/Programs/usb_bsd.h index b106e135840e82dd6aa6f2d1d04a118265dc0db5..c073e21d32224e5a76602ce9a3a4403f78b57508 100644 --- a/Programs/usb_bsd.h +++ b/Programs/usb_bsd.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_cdc_acm.c b/Programs/usb_cdc_acm.c index f9d1d04e65eaf6d4119f084be971e9a084494075..42d557ca94afef246428dac65a0eeeef24236749 100644 --- a/Programs/usb_cdc_acm.c +++ b/Programs/usb_cdc_acm.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_cdc_acm.h b/Programs/usb_cdc_acm.h index 388faa01ad18cea89a5d50b54cb03159395c9e9c..c15e7fc67c58fb6a68ef9b2894a1cc723d4a46b8 100644 --- a/Programs/usb_cdc_acm.h +++ b/Programs/usb_cdc_acm.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_cp2101.c b/Programs/usb_cp2101.c index 9a3229c876254bcc86db65168cfdd8800e7cc5f5..7df7b2a29621d5a487ecea26dc82a9f915419e05 100644 --- a/Programs/usb_cp2101.c +++ b/Programs/usb_cp2101.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_cp2101.h b/Programs/usb_cp2101.h index 26d587cf7bc208c617cf7d9571eac14aa4c719e6..e2c114d1f0e0d1accc00f9a970796306934bba9f 100644 --- a/Programs/usb_cp2101.h +++ b/Programs/usb_cp2101.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_cp2110.c b/Programs/usb_cp2110.c index 133c39e754e78e6862c180c94d8a9809e6c6707b..7dd4510b589fc7ccc004ecce791d4afc5bb361dd 100644 --- a/Programs/usb_cp2110.c +++ b/Programs/usb_cp2110.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_cp2110.h b/Programs/usb_cp2110.h index c05aba0e9003fc07d3924e0122a5b28c573efbf3..6969914ceb971bdefb1f7f65c80cb0fd8e0b7eff 100644 --- a/Programs/usb_cp2110.h +++ b/Programs/usb_cp2110.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_darwin.c b/Programs/usb_darwin.c index fa4819eb898990cc6c4e6f93e12a66801dbdbde6..6b708c82e95d0bdcce9da423ea545a94b8da692c 100644 --- a/Programs/usb_darwin.c +++ b/Programs/usb_darwin.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_freebsd.c b/Programs/usb_freebsd.c index 6645a14935d6be331decea9a269d46d9ec2aa6bc..96d50603de06c23ae00000cee7ca507f381413d1 100644 --- a/Programs/usb_freebsd.c +++ b/Programs/usb_freebsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_ftdi.c b/Programs/usb_ftdi.c index 1f55ed6776c05bd9960c66c63f417aa6f11e79e9..19e52c5847502f8d9ef0a93960459e676f7ec7d2 100644 --- a/Programs/usb_ftdi.c +++ b/Programs/usb_ftdi.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_ftdi.h b/Programs/usb_ftdi.h index d48eefb7227e7dbb592f3d70060d1936e10c3df0..877b55b8809777fff2a9a8183a51cdd50d40a901 100644 --- a/Programs/usb_ftdi.h +++ b/Programs/usb_ftdi.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_grub.c b/Programs/usb_grub.c index be1a0b3f5c637825181834b1c2c91e7e159fc9ad..2bf84bd815c39526238a8d92d7753afca9ff4875 100644 --- a/Programs/usb_grub.c +++ b/Programs/usb_grub.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_hid.c b/Programs/usb_hid.c index 80662e15021bafed48acbda057a27893b4e77ca6..f044230aae2de1ba8b1ab36625240fcf127d11a9 100644 --- a/Programs/usb_hid.c +++ b/Programs/usb_hid.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_internal.h b/Programs/usb_internal.h index e41f2066b3a93a977c03e6ddc6194e6140336943..335841a944703f736785a843bd7c41ad8c16d5e9 100644 --- a/Programs/usb_internal.h +++ b/Programs/usb_internal.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_kfreebsd.c b/Programs/usb_kfreebsd.c index 95a8a93804df38ca701038147590a996f9e16db2..c4235fec32b0527a8bad0526ee4e4d276ada1585 100644 --- a/Programs/usb_kfreebsd.c +++ b/Programs/usb_kfreebsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_libusb-1.0.c b/Programs/usb_libusb-1.0.c index 00377cd6c9a84922a83075eba986f67e7dfdfd60..8b3a5f6f01391ac380f3dc3f88746244e4e17c7b 100644 --- a/Programs/usb_libusb-1.0.c +++ b/Programs/usb_libusb-1.0.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_libusb.c b/Programs/usb_libusb.c index 295a58cc0ac3a1de94ee671d6a82df256692147b..aa36d6d62777384c7216438c326ac5a1919cfc31 100644 --- a/Programs/usb_libusb.c +++ b/Programs/usb_libusb.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_linux.c b/Programs/usb_linux.c index 9d33acfd006ff277a1f295ccd8bfc23083fe66d1..b10ac09dc82ca983ac736b445ad54127d432f37a 100644 --- a/Programs/usb_linux.c +++ b/Programs/usb_linux.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_netbsd.c b/Programs/usb_netbsd.c index 7c692d190e877a13b042d5cc14f7077a59deb907..0bf8f9e46fa67c7d17ab699ca0dbfe10920dbca1 100644 --- a/Programs/usb_netbsd.c +++ b/Programs/usb_netbsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_none.c b/Programs/usb_none.c index be1a0b3f5c637825181834b1c2c91e7e159fc9ad..2bf84bd815c39526238a8d92d7753afca9ff4875 100644 --- a/Programs/usb_none.c +++ b/Programs/usb_none.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_openbsd.c b/Programs/usb_openbsd.c index 7c692d190e877a13b042d5cc14f7077a59deb907..0bf8f9e46fa67c7d17ab699ca0dbfe10920dbca1 100644 --- a/Programs/usb_openbsd.c +++ b/Programs/usb_openbsd.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_serial.c b/Programs/usb_serial.c index 8b811853aee6f59a0d669bbac5d071ac635771d8..ad292ca69818e35290c8f82c198e5d2b7df31e20 100644 --- a/Programs/usb_serial.c +++ b/Programs/usb_serial.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_serial.h b/Programs/usb_serial.h index 7e11888e6302e24d71f178b5e1418f38fa3ffb1f..d0f49f63ca9a99bdbc00cef28ecb5032a20b142d 100644 --- a/Programs/usb_serial.h +++ b/Programs/usb_serial.h @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/usb_solaris.c b/Programs/usb_solaris.c index 3d8e79fae7dd7ffeddbe891015c120f11dd5e78d..7a2c686066721f9e907d65e43f2bf1f77c5275f3 100644 --- a/Programs/usb_solaris.c +++ b/Programs/usb_solaris.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/variables.c b/Programs/variables.c index 25828b428b74470d3033ca05a5c5833ae5c81678..9ff0b0afd866832936f15027945b76eef13582c1 100644 --- a/Programs/variables.c +++ b/Programs/variables.c @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * diff --git a/Programs/xbrlapi.c b/Programs/xbrlapi.c index d6b83f3639ec4a1133370a4ae7eb954662bacda3..038761bfc50e2cf5fa966819f8a9d5066c58acfb 100644 --- a/Programs/xbrlapi.c +++ b/Programs/xbrlapi.c @@ -1,14 +1,14 @@ /* * XBrlAPI - A background process tinkering with X for proper BrlAPI behavior * - * Copyright (C) 2003-2017 by Samuel Thibault + * Copyright (C) 2003-2018 by Samuel Thibault * * XBrlAPI comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -351,7 +351,7 @@ static struct window *window_of_Window(Window win) { static int del_window(Window win) { struct window **pred; struct window *cur; - + for (pred=&WINHASH(win); cur = *pred, cur && cur->win!=win; pred=&cur->next); if (cur) { @@ -863,7 +863,7 @@ static void toX_f(const char *display) { } /****************************************************************************** - * main + * main */ static void term_handler(int foo) { diff --git a/README b/README index 493494c429abed92ffd994624fd9f824081df71e..5fcd8c221ef23027251ef16943a50f2a69e87c1a 100644 --- a/README +++ b/README @@ -2,51 +2,21 @@ 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 5.5, Apr 2017 +Version 5.6, Feb 2018 -Copyright (C) 1995-2017 by The BRLTTY Developers. +Copyright (C) 1995-2018 by The BRLTTY Developers. Web Page: http://brltty.com/ BRLTTY is free software. It comes with ABSOLUTELY NO WARRANTY. -BRLTTY is placed under the terms of the GNU General Public License [GPL] as -published by the Free Software Foundation; see the file LICENSE-GPL for -details. Version 2 (or any later version) of the GPL may be used when +BRLTTY is placed under the terms of the GNU Lesser General Public License +[LGPL] as published by the Free Software Foundation; see the file LICENSE-LGPL +for details. Version 2.1 (or any later version) of the LGPL may be used when redistributing and/or modifying this software. This statement applies to all the files contained within this directory structure except for those which are explicitly listed as exceptions within the following paragraphs. -A special exception has been made for all of the text, attributes, and -contraction tables and subtables (which reside within the Tables/ -subdirectory). They are placed under the terms of the GNU Lesser General Public -License [LGPL] as published by the Free Software Foundation; see the file -LICENSE-LGPL for details. Version 2.1 (or any later version) of the LGPL may be -used when redistributing and/or modifying these files. The files covered by -this special exception are: - - *.ttb - *.tti - *.atb - *.ati - *.ctb - *.cti - -A special exception has been made for those files which are part of the client -side of BrlAPI (BRLTTY's Application Programming Interface). They are placed -under the terms of the GNU Lesser General Public License [LGPL] as published by -the Free Software Foundation; see the file LICENSE-LGPL for details. Version -2.1 (or any later version) of the LGPL may be used when redistributing and/or -modifying these files. The files covered by this special exception are: - - brlapi.h.in - brlapi_keycodes.h - brlapi_protocol.h - brlapi_client.c - brlapi_common.h - brldefs-ht.h - brldefs-vs.h - This software is maintained by: Dave Mielke The members of The BRLTTY Team are: @@ -208,7 +178,8 @@ The following braille displays are supported: Connect Braille 40, Bookworm] - Hedo [ProfiLine, MobilLine] - HIMS [Braille Sense, SyncBraille, Braille Edge, Smart Beetle] -- HumanWare [Brailliant 32/40/80 bi] +- HumanWare [Brailliant BI 14/32/40, Brailliant B 80, BrailleNote Touch] +- Inceptor [BrailleMe] - Iris - Libbraille - LogText [32] diff --git a/Tables/Attributes/invleft_right.atb b/Tables/Attributes/invleft_right.atb index ae102f8d01174eff201c592b732896803652bb8c..2421ee445c40809b64f89510c3c903f7f9337e7f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 bb2adaab5e859a3037679df65ae4abb641854a85..90d956c6595f5f86c645dd2da81e370e7577943d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 bd60ef0ef7db215b9c40e64420013b8b05d73ca8..1bb874e29ef0950df8e2594244e368e48ecdc6aa 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/af.ctb b/Tables/Contraction/af.ctb index f11fe254a17a1dbd305b6e8a6787144d4f7af4d6..daec57380fce22a7dba2ed4e75619eca382649f4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/am.ctb b/Tables/Contraction/am.ctb index 66a8ca17fe513539042c21cb1ef8cc29ddddafff..722a52195107c4bd91716bd86b4d00cc6772c060 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/countries.cti b/Tables/Contraction/countries.cti index 51df4a407b4636234f75c21b3875645df40958d9..4f1c585569ae583b9f5e4052d4b834861a516cfc 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/de-basis.ctb b/Tables/Contraction/de-basis.ctb index 90e22e632cb0ec5bc6e0ab4675b243bf85dda3ac..f2be6f3450f10699e6dc1ddcaf7833b6a6d82bc1 100644 --- a/Tables/Contraction/de-basis.ctb +++ b/Tables/Contraction/de-basis.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/de-kurzschrift.ctb b/Tables/Contraction/de-kurzschrift.ctb index e9bf2e4afa976157573c92aa4c229367dbaf9a78..df9f49f0e62b6d7496550ab71dc10395b06fbd8d 100644 --- a/Tables/Contraction/de-kurzschrift.ctb +++ b/Tables/Contraction/de-kurzschrift.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/de-vollschrift.ctb b/Tables/Contraction/de-vollschrift.ctb index 7826da79ee951cbdd550217e526010019f8c211a..f849217f59c2981ab29b845fb83c21b054acd5b3 100644 --- a/Tables/Contraction/de-vollschrift.ctb +++ b/Tables/Contraction/de-vollschrift.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 911147f71408f73926d4f9d5d386b9daa448cffc..68800222123b6ac2f0c068c0365ad1791e69358d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d232c2f1b9042ddafa9d6eb9a9e7a1e1f58be4b7..59acab87a1b81190f87e74d7a5b5aef9465340b3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/es.ctb b/Tables/Contraction/es.ctb index d10a10d9e9faf1e9ea7fb28833f8cecec5d56fd1..dca35682bc58409deb86b47f551d2a425ffde670 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/fr-abrege.ctb b/Tables/Contraction/fr-abrege.ctb index b07e7b123d911101e02d4142b9cd86a0e7b1c540..a65d65173da5f3e5f71f35c6dec13b5c3b5924aa 100644 --- a/Tables/Contraction/fr-abrege.ctb +++ b/Tables/Contraction/fr-abrege.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -283,8 +283,8 @@ word apparente 1-1234-15 word apparentes 1-1234-156 word après 1-235 word assez 1-1356 -word atentif 1-2345-124 -word atentifs 1-2345-124-234 +word attentif 1-2345-124 +word attentifs 1-2345-124-234 word attention 1-2345 word attentions 1-2345-234 word attentive 1-2345-1236 diff --git a/Tables/Contraction/fr-integral.ctb b/Tables/Contraction/fr-integral.ctb index cde42a37785fd5b7a8cff5eeec4aa4273ed3109b..ae70ddd6b0066dbd32864ee8a85d147b216402be 100644 --- a/Tables/Contraction/fr-integral.ctb +++ b/Tables/Contraction/fr-integral.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ha.ctb b/Tables/Contraction/ha.ctb index a1e298dc7bbb24692e648520bc2facb445dacf38..190c5319a1f2325621a2edf258e835968975a797 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/id.ctb b/Tables/Contraction/id.ctb index 54de7b9d9c8cc7bf5d8ee6fd0afcb09c5a0ed970..c7470bbb54a5a51bb8b9cb6924cda0b6f180a6f3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ipa.ctb b/Tables/Contraction/ipa.ctb index 64905d42c6c05c1330e4a97c48613c3e32146422..28561f0613d043b33bf792614f40a9ee1ba77454 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ja.ctb b/Tables/Contraction/ja.ctb index 7106eb21369e0f8581990f3b478b83a0f5aaf417..49fcc21b1ef07dfade2b2642f18fd7a89c448f4c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 12340ee0d8708e5672031ccfbf0be2a7583e1360..98d99a78845a5716265aa8698e11486820d284a1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 44b7452aa754f6019e8302f5b590ee73f1829c0b..d0b40d45eab1af9927a6d21cf27d4d01be1185b9 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ko.ctb b/Tables/Contraction/ko.ctb index 64ddb3c6ea63836a46e08d265567c948ce76548d..a5dd62f2340730d5b5a3d3b4cf9a2a7599e27f1e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7e59fa3bf2f61ca3a6b5b7d739274c66489c0d47..d417f10091c2d83dfedc44459bc54a5c8b20deca 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b5a6bb2b2cf2f5a39e63ceb3de21c02bb1b463e7..318dc21cea08178f50877a535ddd0fe4d1c128f8 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/lt.ctb b/Tables/Contraction/lt.ctb new file mode 100644 index 0000000000000000000000000000000000000000..05342d466efa17127036e8d51d27cbde68fb59ea --- /dev/null +++ b/Tables/Contraction/lt.ctb @@ -0,0 +1,227 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# BRLTTY Contraction Table - Lithuanian (uncontracted) +# +# Copyright (C) 2017 Rimas Kudelis +# Copyright (C) 2017 Tadas Matusevičius +# +# The Lithuanian 6-dot Braille alphabet is described in a decree +# no. 878 of the Minister of Education, called "Dėl perėjimo prie +# naujos lietuviškos Brailio rašto abėcėlės tvarkos ir programos", +# which is in effect since 2000-07-08. Document number is 55-1620. At +# the time of writing this file, the document was accessible at +# https://www.e-tar.lt/portal/lt/legalAct/TAR.A110E8E6A83F . +# The document is referred to as "the standard" below. +# +# The standard specifies only the mapping of Lithuanian letters to 6-dot +# Braille writing system, no other characters are defined in it. +# Definitions of some punctuation and other characters are informally +# available on the Internet. +# +# This table builds on from these bits of information, but also adds +# a number of other definitions to make it more useful in computing. +# +# This table is based on the respective liblouis table. + +### +### WHITESPACE +### + +include spaces.cti + +always \x09 0-0 U+0009 CHARACTER TABULATION + + +### +### LETTERS +### + +# Base Latin letters +include letters-latin.cti + +# Letters with diacritics which are part of the Lithuanian alphabet +always ą 16 +always Ą 16 +always č 146 +always Č 146 +always ę 156 +always Ę 156 +always ė 345 +always Ė 345 +always į 246 +always Į 246 +always š 2346 +always Š 2346 +always ų 346 +always Ų 346 +always ū 1256 +always Ū 1256 +always ž 126 +always Ž 126 + + +### +### DIGITS +### + +always 1 1 +always 2 12 +always 3 14 +always 4 145 +always 5 15 +always 6 124 +always 7 1245 +always 8 125 +always 9 24 +always 0 245 + + +### +### PUNCTUATION +### + +always , 2 +always . 256 +always ? 26 +always ! 235 +always : 25 +always ; 23 +always " 4 +always ' 3 +# According to Unicode, this is the preferred character to use for apostrophe. +always ’ 3 U+2019 RIGHT SINGLE QUOTATION MARK + +always ( 2356 +always ) 2356 +always [ 12356 +always ] 23456 +always { 6-246 +always } 6-135 + +always \x2D 36 U+002D - HYPHEN-MINUS +always \u2013 6-36 U+2013 – EN DASH +always \xAD 36 U+00AD [SOFT HYPHEN] +always \u2010 36 U+2010 ‐ HYPHEN +always \u2011 36 U+2011 ‑ NON-BREAKING HYPHEN +always \u2012 36 U+2012 ‒ FIGURE DASH +always \u2014 36 U+2014 — EM DASH +always \u2015 36 U+2015 ― HORIZONTAL BAR + +# These are the typographically correct quotes in Lithuanian texts. +always „ 236 U+201E DOUBLE LOW-9 QUOTATION MARK +always “ 356 U+201C LEFT DOUBLE QUOTATION MARK + +# The following quotation characters should not be used in Lithuanian texts. +always ” 6-4 U+201D RIGHT DOUBLE QUOTATION MARK +always ” 6-4 U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK +always « 6-4 U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK +always » 6-4 U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK +always ‹ 6-4 U+2039 SINGLE LEFT-POINTING ANGLE QUOTATION MARK +always › 6-4 U+203A SINGLE RIGHT-POINTING ANGLE QUOTATION MARK + +always … 256-256-256 U+2026 HORIZONTAL ELLIPSIS +repeatable … 256-256-256 U+2026 HORIZONTAL ELLIPSIS +repeatable ... 256-256-256 Three times U+002E FULL STOP + + +### +### MATHEMATICAL SYMBOLS +### + +always + 5-235 +always − 5-36 U+2212 MINUS SIGN +always < 5-246 +always = 5-2356 +always > 5-135 +always ± 5-235-36 +always ∓ 5-36-235 U+2213 MINUS-OR-PLUS SIGN +always × 5-3 +always ⋅ 5-3 U+22C5 DOT OPERATOR +always ÷ 5-256 +always ∶ 5-256 U+2236 RATIO +always ⁄ 34 U+2044 FRACTION SLASH +always ∕ 34 U+2215 DIVISION SLASH + + +### +### OTHER CHARACTERS +### + +always # 6-3456 +always $ 6-46 +always % 123456 +always & 12346 +always * 35 +always / 34 +always @ 6-345 +always \\ 6-34 +always ^ 6-256 +always _ 1456 +always | 6-456 +#always ¦ 6-1456 +always § 6-346 +#always ¬ 6-235 +always µ 6-134 +#always ¶ 6-1234 + +always ` 6-3 +always ~ 6-26 + +#always ¢ 6-14 +always £ 6-123 +always € 6-15 U+20AC EURO SIGN + +always • 6-35 U+2022 BULLET + +always © 2356-46-14-2356 +always ® 2356-46-1235-2356 +always ℗ 2356-46-1234-2356 U+2117 SOUND RECORDING COPYRIGHT + +always ← 246-25 U+2190 LEFTWARDS ARROW +always → 25-135 U+2192 RIGHTWARDS ARROW + +# Middle dot is unlikely to appear in text, except perhaps as a multiplication sign (dot operator). +always · 5-3 U+00B7 MIDDLE DOT + +always ° 5-356 +always ′ 5-35 U+2032 PRIME +always ″ 5-35-35 U+2033 DOUBLE PRIME + +always ℃ 5-356-46-14 U+2103 DEGREE CELSIUS +always ℉ 5-356-46-124 U+2109 DEGREE FAHRENHEIT + + +### +### INDICATOR AND SPECIAL SYMBOL DIRECTIVES +### + +#always \uFFFD 7 U+FFFD � REPLACEMENT CHARACTER + +numsign 3456 number sign, just one operand +letsign 56 +capsign 46 +begcaps 456 +endcaps 56 + +midnum , 2 +midnum : 25 +midnum . 256 + +# when a decimal begins with a period, it should be translated with a +# number sign followed by a decimal point, followed by the number. diff --git a/Tables/Contraction/mg.ctb b/Tables/Contraction/mg.ctb index e060b6f5eff6915e6d2e9c7d5fff1a9ec74e8431..7876a31e7b92e7d6dfe6c156aa70a5ec117d18e2 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/mun.ctb b/Tables/Contraction/mun.ctb index 91c2e4fe72efb8983e452711b9b55e53c51489c8..019137884ae8f145727e74c1eb2fab8133c9b508 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/nabcc.cti b/Tables/Contraction/nabcc.cti index 7c578944c71c867ed935558c11e5ab1486206957..83240cc1473bebceeed0ff2c6a30c8f94fa6ce7c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/nl.ctb b/Tables/Contraction/nl.ctb index 6608f617c15e6d985cb1e86b1aa65cf89ea9dffb..6c49125688dc38fb9bcd9aa5a79e21d5a89c017c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/ny.ctb b/Tables/Contraction/ny.ctb index 8d3d250e7494bac7f945530565930191df2c90f2..4c1e52b90038f56854bd0063e6b4ce625615df76 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/pt.ctb b/Tables/Contraction/pt.ctb index 238cc8e87602a7ec489313aa37f4ec260276f156..3118e93f555623c52555b698ede1d11c47a3a79c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/si.ctb b/Tables/Contraction/si.ctb index 6965ea687857774933b71a344305ec0e30b6fb12..4ae7a32f90f91f5d106f22756f6e574987043ce7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/spaces.cti b/Tables/Contraction/spaces.cti new file mode 100644 index 0000000000000000000000000000000000000000..04deba4dc5d36053b1bd831a9a109ab9ae35d090 --- /dev/null +++ b/Tables/Contraction/spaces.cti @@ -0,0 +1,34 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# This BRLTTY contraction subtable defines all the space characters to be empty +# braille cells. + +always \x20 0 SPACE +always \xA0 0 NO-BREAK SPACE +always \u2002 0 EN SPACE +always \u2003 0 EM SPACE +always \u2004 0 THREE-PER-EM SPACE +always \u2005 0 FOUR-PER-EM SPACE +always \u2006 0 SIX-PER-EM SPACE +always \u2007 0 FIGURE SPACE +always \u2008 0 PuNCTUATION SPACE +always \u2009 0 THIN SPACE +always \u200A 0 HAIR SPACE +always \u202F 0 NARROW NO-BREAK SPACE +always \u205F 0 MEDIUM MATHEMATICAL SPACE diff --git a/Tables/Contraction/sw.ctb b/Tables/Contraction/sw.ctb index 09832c7d45870321a474896ea43a91d71abba5c8..d7f7fbd812cabd38f0d2fc429ebf861fc0c59334 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/th.ctb b/Tables/Contraction/th.ctb index c59ebe76c1cce3d09ee49e83c03de9c3b38626ae..a4f6214c5cf09fcec0e75b80b57a033827956180 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/zh-tw-ucb.ctb b/Tables/Contraction/zh-tw-ucb.ctb index cd231dd6c259376ce815a2080e4b5c8bf2f9b04c..a77aa45cfaf9dae51155cd908fc6df57c25baa4e 100644 --- a/Tables/Contraction/zh-tw-ucb.ctb +++ b/Tables/Contraction/zh-tw-ucb.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 23234cd463e7d676baa037a405d47301e5abab36..906e0bb0569fcd684d125be42784d6af9f2d7d50 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Contraction/zu.ctb b/Tables/Contraction/zu.ctb index 714e72ce68d4d29a08586971927bb33f86bcabd1..63a3818dd795ca881c043b8a05ce2e2305c2bad7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6f80d7be36ff28e787cf06b6c7a11c897ce0f549..b1745d7efc2f5ffdb6a9ca92f05f7130cd01d8ab 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/abt_extra.kti b/Tables/Input/al/abt_extra.kti index 12cb33d60f1e9453f2dcb5733e28bb62dbbdcd80..0e8f7a17224a0cd4f22817fa8b8206047944f1ab 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 850391e4de6032ffe3102a34140aa4b3d5b69906..9979e9d0c3e662b118c311f22e3d1a2cfc98f8a4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1e6262a22e3a7b278f264c9ad67f0e650a31e68e..57de1e4f23ceccef2bca8061ce025a1b2ff3ed7c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8728924cc34604ba67e52ab2d07c3f675e6ab018..03539fb7a2af5546f170ec69cd811bd46f69b110 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e89ce8bc134ce632958f211b7896728a79c04330..562ea94da9f59dcd48dd130acc53a6ec0aaec865 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc-thumb.kti b/Tables/Input/al/bc-thumb.kti index a7e7aa31aba71b31b1e5a0b683557e9344ddbc21..7ca67d89e648efc341fce8f637210932acc43f82 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 54bb95d628b59060a6572ad10411e8f67187c6ae..98e02fad333c1b2e5b83d8c0eddc462d7e405682 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/bc640.ktb b/Tables/Input/al/bc640.ktb index fa7bd793b9b5543ae76768c5c7db9b911e638104..5ff54c78b2f1e6641d9e668d81c5b226f9554a7c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a4462382fbbcac7d816b970349f13d319138b128..0d19cf0133a847f327763c470fdb0fec104e6fdc 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f7ae4e3eb53fb38b25d6ac8216687e23ab546f48..f593315c9cbc8de305c6bf5ca4569bd2ac2871f7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_basic.kti b/Tables/Input/al/sat_basic.kti index 75e1d05bedda1be4f93aee11e38b372bfe79e87d..f1388b9eb8a32d6646ecaed5d250177247806fc3 100644 --- a/Tables/Input/al/sat_basic.kti +++ b/Tables/Input/al/sat_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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_extra.kti b/Tables/Input/al/sat_extra.kti index c640782af75214f9d3160de65013b1a41875c0f9..a0d58ddd5fdcee36217d1e8995dd177199733c05 100644 --- a/Tables/Input/al/sat_extra.kti +++ b/Tables/Input/al/sat_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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e7183e1e60025e38b997ce6a55ee79b9f556dd36..7ff161fa0a692d5ade9201be7547dd5919b7e692 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/al/sat_small.ktb b/Tables/Input/al/sat_small.ktb index 8e9d25846e319cb8b10b7a06e13c75cc6575c36c..65ed790e2d65035a2143a309f96c9990a7e791b1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b7687fe2535d42706a08969be4fd062d0cfad205..6377346ee6806cfb5c4199602422928fd812f664 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d66eb1f432c604699491310384b938fba62a3f45..a9d5f641b5e56b58e7d0de4d2207bad68ea1b0c9 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 3a1a3b0db914c2f32b671cabfd826a22d3c7d139..bf88bed2e86a92c02ceb7e79b0fcf901758bc559 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/b9b10.kti b/Tables/Input/bm/b9b10.kti index 668979abd0a14516fabe3fa1c89053ca52b8e59a..78718c7b8c0921b88d3b78458904015717cedaae 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ note B9 and B10 are the keys immediately to the left and right of the joystick. -bind B9 KEY_BACKSPACE +map B9 SPACE assign space B10 include keyboard.kti bind B9+RoutingKey SETLEFT diff --git a/Tables/Input/bm/b9b11b10.kti b/Tables/Input/bm/b9b11b10.kti index 7363ff19e3b073631cf47edda7947b48796be06e..d796d70f0b063744a6ae91051ef5b5ca0d6b30ce 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/command.kti b/Tables/Input/bm/command.kti index 33c57fdc20365cf3fb11e6357a79793ce5623806..2c157d5ac4a2b7a23a44b1dca648f4a145bc13b1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 9750f99cce0f088320f313f42dd37f9287f0cbaa..7ce4b3d282bfdc4c90a28f682c1b246f4f49a9a4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2687883e1b433e7ae0e6318d8b3467e1f6f98710..efd05b227303be8cb2386a48f48211683f06dc96 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a7c0f00d25754a360064c388dc86bdd5a2afff12..80077d9f104d443f0e2646130bc9116df0854fd5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/default.ktb b/Tables/Input/bm/default.ktb index 22074c52ea7e17ce77d709e7f5268f0cfe7db436..83f802eac2119f492fb43a2b2f79c57d45fa56f1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f44bd0a7c6029275f60887864f83d336cf18a271..e4af0f2f73b5a039f20782e02a17eeabf2dfd44d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 4bc15ed866a9d2975b16e849c2d924adcf7cb709..c01b6417d4221d6d4e15cf1e657aebe87544834c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/bm/dm80p.ktb b/Tables/Input/bm/dm80p.ktb index e3d209c715cbacd67bee36c623be0328d0f82d31..35a72c6e46cf9ee0934f6539102bbfc056aa5388 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 20c854ec848cd261a433d156c09300d21a744a7f..891a16da0b76fc05dee3362e51c1e540d5929ccf 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5aa28f3541d89961d34bd687d6bf71faf5821906..11266fa43b6cef8d16b20bc9ff934a158cffcb85 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d044ae5244a1250f484f617891340aead281ab5b..51522206cd1b34aa9b57813a08e348f338b16a8c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 bb8ba63b2bfa38ecf67abaab23f56899630c2d1b..3873a782a2259ae6edd7346f8aedfc2c8518efe3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 46faed0d1b38dfd976d19aeaab8bf4149c7cee5e..ad51bf13ceb00e1df24f994d9d2362d512537cc4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f72f1272a20f14e72f069b024886cc4f706b9ae7..3ee02a42527eff80bca853f698838eb38e4db66b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 046c33472792ff118e98b56a79e305317ebada88..71c1add5a6d64fde2904dc2692d9e7968eb54fcc 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a5a1c0df366bf564aefe7e8cbfe6c1c8f73c610d..31fa133e13c8e4d5953ba6ce9b15bea8f8b04f67 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7d1e9c52df1bc9d6e72ff32f8a48295c50370c1d..4683767773eb201922d8f8508c45bd2cddc41e72 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 370b269f28bb4654f8b6b32f3565cd584d27be99..f1548bc1a09457486c61e93e187dc32a3ded64ce 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hw/mb1.ktb b/Tables/Input/bm/routing.kti similarity index 86% rename from Tables/Input/hw/mb1.ktb rename to Tables/Input/bm/routing.kti index 5a1ef0a60400f12a8dfce292ad46f819c8d1d592..5c0074fb190b3466682693c7c76fbfcc98072dc9 100644 --- a/Tables/Input/hw/mb1.ktb +++ 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,6 +16,4 @@ # This software is maintained by Dave Mielke . ############################################################################### -title HumanWare Brailliant B (has no keyboard) - -include nav.kti +bind RoutingKey ROUTE diff --git a/Tables/Input/bm/routing6.kti b/Tables/Input/bm/routing6.kti index 15b901a63f0f60bbfa1b5b72b97c0bec7be927c3..4f3c78d928644babce2c97390d153fe94e3ad554 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ # This key subtable is for Baum displays which have routing keys and 6 display keys. -bind RoutingKey ROUTE +include routing.kti bind Display1+RoutingKey CLIP_NEW bind Display2+RoutingKey CLIP_ADD diff --git a/Tables/Input/bm/routing7.kti b/Tables/Input/bm/routing7.kti index e596e99051b13106c188d598329d25090491fa70..9f018d481cc7cc114fef260c213aa1a053107ca1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ # This key subtable is for Baum displays which have routing keys and 7 display keys. -bind !RoutingKey ROUTE +include routing.kti bind Display5+!RoutingKey DESCCHAR diff --git a/Tables/Input/bm/status.kti b/Tables/Input/bm/status.kti index 0b2db6ed426961e2a9cacd86ab3aa48be2e5066b..6038a7aea1ab4155b61c95b5cde89e834988cf5f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 ec504ffd9151cf9ae9222a62b53eec0f335e910e..3daa0031c35c00cff64616eebf933f7bea247b1a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0e7543d6b4191aea8db7c8f20487933c6f9a6cc6..81db687c80f6be2d242c2bfaee049d8462fb2aeb 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2f0324a2f6a72d8848fa8d6365285efebdbf9127..87fb4aa85cc3c11dc927b0b8dbf240d279127906 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a97f61c70d56cb33fe27ec84e855e5eb95d6149c..c42eec83e47a4364bc571de9748c12e924149e06 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 57fe20d77c017f4b7a7b04eaad4b5484776c5882..7241fe31c7c1620f156ea39e27b243c7bbaaa73f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 389a0afc40e124a73ff08d744ba71ba9ca61eaa3..74ac7731579b2e6025c666feafe7b2635118e945 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 4dd70182fa1cf25fffb8c89bb8e1ae08b169f16d..53a66761742f75612381b9b1aa24288d5ada96f2 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 261ba6d575b5e7dacb7fe2767815db0a3704827d..42e5f304795bdd535c132714f118e22b5ef86c9e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5c4650c93afb637d66a157cf8524b345de0d586d..2f7ea9a33bd2d4f3ba33bdfd8c20b331dca23346 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8ff1f8e68cc96b3d9f685699561d8970643f3b8f..597bff5a06e4b6a1c5254740b58e30c05852d951 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 874074aad1fbfba0e3d80894b2edf871af83aaaa..da509f97cdfc3e3322c7b00f2d10d67e43140aa1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 4572a63426a91038531a275a75c24839e7f29f06..aa00c885cbe5bfcb970f2db12521410d1f6eaf5f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 70df1320ec2e8cf6847ea336f459808b33f8d8c9..e03653dd329dff22bc8eb001c678d13fc998127e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/chords.kti b/Tables/Input/chords.kti index 843c5a8c9b3e1ee3ea1de98c5ea65e7749056221..68cd29c37e90bea506e641fe584db7d148a98cbd 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8120d09a5bae2bec9804c6935481a5022a5cbc1f..4efc73899886e520f32e9d60e09c71331874b58e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a12cf7f7f76c013b8475534502dd2b729b64bf8d..5e656ab93f08bd12b2b96f99b24973260c2034c7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 712a484b30a4f02f1316b7e9271ab45e955bdc60..b493e82d2ae520319950a011fdee9f1c85659e9b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 9e057d27e9267f1b7911383eb0e035e218fc7892..239057594cb33fd1f845c2354742648ed9d1bec4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8cb52bbc2f2260aa3c49f95d2d2e82696dbd6c1f..9512e5dc40d85b0cde1e7a484e7abb614c1938a4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 275d51fc88ffaff120b609406d539b22919378ba..f791dbb8e488c07861b34d3fec2e3595d49e60a0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8924426231264841dd1e3a977a86b76a7a40ca7f..8280d8db7bca8f01336e4fe2ddefe1ef3d2964cf 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,12 +18,12 @@ title EuroBraille Esytime -include routing.kti +include common.kti note The four keys below the left joystick, from top to bottom, are: note * L1, Escape, Tab, Shift. note The four keys below the right joystick, from top to bottom, are: -note * L5, Insert, Alt, Control. +note * L8, Insert, Alt, Control. note Some key combinations have been reserved for internal use: note + LeftJoystickDown: the Alt key note + LeftJoystickPress: the Alt key pressed twice in a row @@ -31,15 +31,15 @@ note + LeftJoystickDown + RightJoystick(Right/Left): enable/disable braille func note + LeftJoystickDown + RightJoystick(Up/Down): switch to internal/external (Esytime/PC) USB interface note + LeftJoystickDown + L1 + Escape: switch to single-hand braille keyboard 1 note + LeftJoystickDown + Shift + Tab: switch to single-hand braille keyboard 2 -note + LeftJoystickDown + Insert + L5: switch to standard (two-hand) braille keyboard +note + LeftJoystickDown + Insert + L8: switch to standard (two-hand) braille keyboard note + RightJoystickPress: the Enter key note + RightJoystick(left/right/up/down): the Arrow Left/Right/Up/Down key -bind L1+L5 HOME +bind L1+L8 HOME bind LeftJoystickPress+RightJoystickPress BACK bind L1 FWINLT -bind L5 FWINRT +bind L8 FWINRT bind LeftJoystickLeft LNUP bind LeftJoystickRight LNDN @@ -100,11 +100,11 @@ bind L1+LeftJoystickRight CHRRT bind L1+LeftJoystickUp PRSEARCH bind L1+LeftJoystickDown NXSEARCH -bind L5+LeftJoystickPress CSRJMP_VERT -bind L5+LeftJoystickLeft FWINLTSKIP -bind L5+LeftJoystickRight FWINRTSKIP -bind L5+LeftJoystickUp LNBEG -bind L5+LeftJoystickDown LNEND +bind L8+LeftJoystickPress CSRJMP_VERT +bind L8+LeftJoystickLeft FWINLTSKIP +bind L8+LeftJoystickRight FWINRTSKIP +bind L8+LeftJoystickUp LNBEG +bind L8+LeftJoystickDown LNEND bind L1+RightJoystickPress PREFMENU bind L1+RightJoystickLeft PREFLOAD @@ -112,16 +112,15 @@ bind L1+RightJoystickRight PREFSAVE bind L1+RightJoystickUp HELP bind L1+RightJoystickDown LEARN -bind L5+RightJoystickPress PASTE -bind L5+RightJoystickLeft CLIP_RESTORE -bind L5+RightJoystickRight CLIP_SAVE -bind L5+RightJoystickUp FREEZE -bind L5+RightJoystickDown AUTOREPEAT +bind L8+RightJoystickPress PASTE +bind L8+RightJoystickLeft CLIP_RESTORE +bind L8+RightJoystickRight CLIP_SAVE +bind L8+RightJoystickUp FREEZE +bind L8+RightJoystickDown AUTOREPEAT context menu -bind L5+RightJoystickUp MENU_PREV_ITEM -bind L5+RightJoystickDown MENU_NEXT_ITEM -bind L5+RightJoystickLeft MENU_PREV_SETTING -bind L5+RightJoystickRight MENU_NEXT_SETTING -bind L5+RightJoystickPress MENU_PREV_LEVEL - +bind L8+RightJoystickUp MENU_PREV_ITEM +bind L8+RightJoystickDown MENU_NEXT_ITEM +bind L8+RightJoystickLeft MENU_PREV_SETTING +bind L8+RightJoystickRight MENU_NEXT_SETTING +bind L8+RightJoystickPress MENU_PREV_LEVEL diff --git a/Tables/Input/eu/iris.ktb b/Tables/Input/eu/iris.ktb index 9b973b7835430454447feccb8cce04047518da28..b7f0066cf5c341eb8829639cf256e15b98169fa6 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 aae03ae0ce20e556dc72697d4193b66681578a24..bc52deaa4663d175d22859d670507f07b90ccb67 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 aba361541ed85e0dfd7a172ca12ef77442cded6b..0c8d2ed550c0c4a21841fa5dc8b09429cca544a6 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6b7643cc3b1b2837e6fc49745bee7eb03d6d9ca4..b44b0f0bb71a53ba7231fc0f066b69bc6a25382d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 15b06db0bfdd7eb8d754461391c2bbd2b9428dd5..d6d4f2c13dc7ce2801ac3d4016dd549a7fb18e7c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 c9c707e3d81300803faced0cc28ee8a8a99b6e23..31b0f7c0ead396af84d72df7e635d1b7b95d1749 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/bumpers.kti b/Tables/Input/fs/bumpers.kti index 56503101c034299625d6c39c61055d3d8237d041..86759c647238d5246428c78b93f5e3cf4e236d66 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5929cb510696c69d811c7916606d346a2fa6c0fb..8733c2c72ad6f26841c25f93f4a16f03df02d161 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_basic.ktb b/Tables/Input/fs/focus_basic.ktb index 1f201bacc64be94e2cd2bd56894450e8654249ed..45f3869d071b45e237a3eb78b9e47095a8257420 100644 --- a/Tables/Input/fs/focus_basic.ktb +++ b/Tables/Input/fs/focus_basic.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_basic.kti b/Tables/Input/fs/focus_basic.kti index 9095bfc88e9caec784d3fd1ddd219a6993d37dba..96f3e7f872bcfaac59a8ec5a276dea77418e29ab 100644 --- a/Tables/Input/fs/focus_basic.kti +++ b/Tables/Input/fs/focus_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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_large.ktb b/Tables/Input/fs/focus_large.ktb index 1dec473f7dc1e98d0de9376d105cdacda73f8cd3..72e7f23786bfb643f77197144ff5f55f09e21a5e 100644 --- a/Tables/Input/fs/focus_large.ktb +++ b/Tables/Input/fs/focus_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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/fs/focus_small.ktb b/Tables/Input/fs/focus_small.ktb index f06771ce96136b14c3b095f119627f0c1c70ba54..74bdbb651c652e62df591d5eb3d6bd125bf2bd84 100644 --- a/Tables/Input/fs/focus_small.ktb +++ b/Tables/Input/fs/focus_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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 295d4db2e00248fbeb215c73f5ddac2fba55c539..d35af2e17787fa7b3ecb856ebf4e3f945777282b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5112254317f87c68114f84d7db0ebccc8799ccba..3b89aa87fa0f2813fcff7cbd9f786105a709f101 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2ebaf8ad01ae31dbbdbc2060a8e785ca2de0c1a3..db8bff87db9fe3a03331032cc6b0da7478376a85 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hd/pfl.ktb b/Tables/Input/hd/pfl.ktb index ddde33b740461d91c87676743e915f56f25512ae..96c3b066bd5b02e3e3aad37e0d2204d1203ea21a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hm/beetle.ktb b/Tables/Input/hm/beetle.ktb index 75ce0fd74063b65bf0cdc7679bdb44834572cfb9..0acc31779761ecc25c1f6c83fa60cba58530a2b7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e3eaf19c67cfe642b912282345fef99c066548db..4133cd096de76b94f506aa9df164168bf1409955 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 01ac61db0a757de8cac75f7aaa93bea1519d0e1e..5c0074fb190b3466682693c7c76fbfcc98072dc9 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b1f75b1a5ba7a3f54b3eb884e929dad47f30af8b..c309e4092f4548ec318098bae5fef70212e2a5ea 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 43c3a0cacfc278d6f0a86cf11187b7103bd7c903..825d90c47eff888a917f9c2947ad272df06e4c26 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 4790ec9615dd1f52aba6589123d08192b132359b..b60a907c9162347229b8e86a79381e97330bfd41 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7e8449956cb870123bec31e5b1a64aa274ede11b..d8affe755f0d05c00885e6318ced7b0122b517f4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f4ba3ae4f2e146782f96670bce4d2f2d037ac6c1..e76e6cdd16ed56ee70fb124a9b4cbe23aa86e46c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6d102c8fb39494d5523ef767566011a19c740a2f..c48b0413d7b35ced3e50f49db9bd74b5558cf352 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6c65a4c4720f896db501bd9dabb46288bb9fa6b9..252211fdc7fbfa210692f603d8d74f00d0e5bd0a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 757b2a31b3367354f3517a79431f1fde2ada891e..88beafa5e8c6a32044303010219e40b2a6f78964 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 648e542b7fd16079b6ee82ce96fa0c4806e0ea81..fa4b19c2530d43d33f7b39d639cada3ac6f4eae3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5bb9a936d777b3514630a2adb99107a9c451d0c0..5b3c90fb51666c36649a5a74e66a32dc87031958 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 9987e29f4236388ca71f758224dd50be484ea0a0..99be7704f821860654c97c630f8f3dae2feb7ddc 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5def70c63105752458f655c7c57226a25491b527..4e2c27c45ea39b893ea70a5b9d0ef93c83a812d0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8c33d8833f6677cffb562a4670ef3d6124f4d039..9847c461b999633dd0f047c5522645b2ae51de47 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b05ae3cf63d3dd13e892d3f65a8cc3407fa47364..a848cf780bcab2532a573a5d6a4439c652140016 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a2b27db420c9a386f4e9040c6d7bd9008ba4d6b0..e93507bb2824a7041e5c1bc47a30928eb788f377 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/ab40.ktb b/Tables/Input/ht/ab40.ktb index 49ce97f20597d07436bd25faae8596334ca3dcfa..515ecc7e7efd5a09d1605bdccfed5384123848d7 100644 --- a/Tables/Input/ht/ab40.ktb +++ b/Tables/Input/ht/ab40.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/alo.ktb b/Tables/Input/ht/alo.ktb index e987c1b99e47d9d5fa52c0db48c38c3ff2c6a9f1..cd20b2328a71c96fb398921d0f3a6f8b244d69f3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 ec6f2e43f3a61d4415e756e1d0ad38d9d14f2d3b..eb98419669f7f2704998dd87c556f2bcd184b6af 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8f84f6f71d590317fce75dfc2e220064e65b7af9..68f25a09bc160e3c754a8c0e8413925659c1c10a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 fbb6ec7b6eae1a8e80162f8729bd0510f5d20457..f42f1090848158fc84356103906c77e68d6696f6 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e15f1d625b8e60d6d43c0b2b276d4015e380e8d3..9c6b5ed11a00892766de0e873dc517d018cba285 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 53dc498de2ef52e2c2f2bb58494a323490485ea6..0562cab6e3876b2fdcc2dc103383fd8a599834c1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/bs40.ktb b/Tables/Input/ht/bs40.ktb index 78c4fa3dae3a94c9002cd9866b31bc1bd6fea342..34ceab7534e980f402f2dafc00692ddd2b497808 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 43981f841b86c52b5e3da0cb3621f16c75e8bb38..a2dfd2aeabd0d9dd57c59a5d7c6495299a9261ba 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 543e3777a4a299be3bd410b40c550d88cd2b1697..33eabc46978bf87a2778eefbd0322cf9231fe5bf 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1883d6c0f19df6fb458bba98c63616f1b32346b2..cc3e21045705979b352f3d2db00b6a3642927628 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5d531dcae59f61ccda8003f5a72400c4ca0b7f63..c52bd3bb65b25574ea2b8a3945413ead55a57640 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/input.kti b/Tables/Input/ht/input.kti index 046c64da809e82583585ea3f5d860de89d2f7b04..f744f3c04bc36373f0e24c399faa25a2320df30c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b8a2dcc041139952a51a8533cbc0d19f394dee61..f9e1d3f9bd9277fc92038142cfea55314ecb0e94 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 36239aea76caabc195e955ec250f0f2ec42b3ff2..7c98339b30ebb134a425574bf33a73d6ef11e716 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5c08160bd3a4c690c1c15fba43ca65fa49862ac9..e93a721dc3ab6a38579b4c8b73f993d72dc3c843 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0a2dc2761fd0ad5702ca12da022406069c1cd918..1e81135a51de68a5674c4be94e430fb36689619e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/me.kti b/Tables/Input/ht/me.kti index 508d62e4f89fbf55c88a20a582676a78fa26135e..caec0db2083eb611339b89d5e5f4bc754a8399d0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/ht/me64.ktb b/Tables/Input/ht/me64.ktb index 5ca701f6900e0bf3f0dc2ada41674ab308f5d364..74ba149ad16c9de17aa2c90ddc704a66d76208b8 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 869feaeaa5864a39d70930bd677af57e968e54ed..cefb30ebd16ebcf735a87881ebb6d849b69d01af 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d802676beecf9fbc6260f6499b88c2f5a883201f..d101bc46ec7c1681deacb2e37807b5acac72f3df 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1b93795bd191cb94284cccf57647afd86179cecf..2c64048d30b0b480b2d6b79aa8edb1bf389f6559 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/hw/mb2.ktb b/Tables/Input/hw/B80.ktb similarity index 84% rename from Tables/Input/hw/mb2.ktb rename to Tables/Input/hw/B80.ktb index f90e4b7d2e1179087ac9aae34d236d9e701a38d5..a490d84a91ae4ccd88cb82b1ff6ab519485b03da 100644 --- a/Tables/Input/hw/mb2.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,7 +16,7 @@ # This software is maintained by Dave Mielke . ############################################################################### -title HumanWare Brailliant BI (has braille keyboard) +title HumanWare Brailliant B 80 -include nav.kti -include kbd.kti +include thumb.kti +include command.kti diff --git a/Tables/Input/hw/BI14.ktb b/Tables/Input/hw/BI14.ktb new file mode 100644 index 0000000000000000000000000000000000000000..c271d814fefa04707ed7fa27f17b00f34c696e5e --- /dev/null +++ b/Tables/Input/hw/BI14.ktb @@ -0,0 +1,23 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant BI 14 + +include thumb.kti +include braille.kti +include joystick.kti diff --git a/Tables/Input/hw/BI32.ktb b/Tables/Input/hw/BI32.ktb new file mode 100644 index 0000000000000000000000000000000000000000..094f2f32b0e6b178e919b9760c52c3f0dd3ea387 --- /dev/null +++ b/Tables/Input/hw/BI32.ktb @@ -0,0 +1,23 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant BI 32 + +include thumb.kti +include braille.kti +include command.kti diff --git a/Tables/Input/hw/BI40.ktb b/Tables/Input/hw/BI40.ktb new file mode 100644 index 0000000000000000000000000000000000000000..4599dfa8061922dca0d5b4af7ebd9c0e0dee448e --- /dev/null +++ b/Tables/Input/hw/BI40.ktb @@ -0,0 +1,23 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant BI 40 + +include thumb.kti +include braille.kti +include command.kti diff --git a/Tables/Input/hw/kbd.kti b/Tables/Input/hw/braille.kti similarity index 69% rename from Tables/Input/hw/kbd.kti rename to Tables/Input/hw/braille.kti index 14b16e9e046b1f8481f84c096244dd98e3b477cf..51b5081f4b14ad81a4b8a865774061e81f4e97be 100644 --- a/Tables/Input/hw/kbd.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,6 +16,9 @@ # This software is maintained by Dave Mielke . ############################################################################### +note There's an eight-key braille keyboard near the back of the top. +note * From left to right, its keys are: Dot7, Dot3, Dot2, Dot1, Dot4, Dot5, Dot6, Dot8. + assign chord Space+ include ../chords.kti @@ -28,11 +31,11 @@ map Dot6 DOT6 map Dot7 DOT7 map Dot8 DOT8 map Space SPACE -map Thumb2 META -map Thumb3 CONTROL +map Back META +map Advance CONTROL bind Space+RoutingKey KEY_FUNCTION -bind Thumb2+Space+RoutingKey KEY_FUNCTION+meta -bind Thumb3+Space+RoutingKey KEY_FUNCTION+control -bind Thumb2+Thumb3+Space+RoutingKey KEY_FUNCTION+meta+control +bind Back+Space+RoutingKey KEY_FUNCTION+meta +bind Advance+Space+RoutingKey KEY_FUNCTION+control +bind Back+Advance+Space+RoutingKey KEY_FUNCTION+meta+control diff --git a/Tables/Input/hw/command.kti b/Tables/Input/hw/command.kti new file mode 100644 index 0000000000000000000000000000000000000000..58b2da4e456079c49e53066673aa11bdde90596b --- /dev/null +++ b/Tables/Input/hw/command.kti @@ -0,0 +1,20 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +include ../bm/display6.kti +include ../bm/routing6.kti diff --git a/Tables/Input/hw/joystick.kti b/Tables/Input/hw/joystick.kti new file mode 100644 index 0000000000000000000000000000000000000000..e54bfac929cbe8e3cd7a708483ada089635bdc67 --- /dev/null +++ b/Tables/Input/hw/joystick.kti @@ -0,0 +1,23 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +note There's a five-way joystick between the Dot1 and Dot4 keys. +note * The four directions are intuitively named: Up, Down, Left, Right. +note * Pressing the joystick is named: Action. + +include ../bm/routing.kti diff --git a/Tables/Input/hw/nav.kti b/Tables/Input/hw/thumb.kti similarity index 50% rename from Tables/Input/hw/nav.kti rename to Tables/Input/hw/thumb.kti index dea6a511b58ef43bd92c2ee566a470e670155b3c..71187e5367b5fdb7d54e03c398a2a365c7bbf062 100644 --- a/Tables/Input/hw/nav.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,29 +16,29 @@ # This software is maintained by Dave Mielke . ############################################################################### +note There are four thumb keys on the front. From left to right, they are: +note * Previous, Back, Advance, Next. + #################### # Default Bindings # #################### -bind Thumb2+Thumb3 HOME -bind Thumb2 LNUP -bind Thumb3 LNDN -bind Thumb1 FWINLT -bind Thumb4 FWINRT - -bind Thumb1+Thumb2 TOP_LEFT -bind Thumb1+Thumb3 BOT_LEFT -bind Thumb4+Thumb2 PRDIFLN -bind Thumb4+Thumb3 NXDIFLN +bind Back+Advance HOME +bind Back LNUP +bind Advance LNDN +bind Previous FWINLT +bind Next FWINRT -bind Thumb1+RoutingKey CLIP_NEW -bind Thumb2+RoutingKey CLIP_ADD -bind Thumb3+RoutingKey COPY_RECT -bind Thumb4+RoutingKey COPY_LINE -bind Thumb1+Thumb4 PASTE +bind Previous+Back TOP_LEFT +bind Previous+Advance BOT_LEFT +bind Next+Back PRDIFLN +bind Next+Advance NXDIFLN -include ../bm/display6.kti -include ../bm/routing6.kti +bind Previous+RoutingKey CLIP_NEW +bind Back+RoutingKey CLIP_ADD +bind Advance+RoutingKey COPY_RECT +bind Next+RoutingKey COPY_LINE +bind Previous+Next PASTE ################# @@ -47,15 +47,15 @@ include ../bm/routing6.kti context menu -bind Thumb1 FWINLT -bind Thumb4 FWINRT -bind Thumb2 MENU_PREV_ITEM -bind Thumb3 MENU_NEXT_ITEM -bind Thumb1+Thumb2 MENU_FIRST_ITEM -bind Thumb1+Thumb3 MENU_LAST_ITEM -bind Thumb4+Thumb2 MENU_PREV_SETTING -bind Thumb4+Thumb3 MENU_NEXT_SETTING -bind Thumb2+Thumb3 PREFMENU -bind Thumb2+Thumb3+Thumb1 PREFLOAD -bind Thumb2+Thumb3+Thumb4 PREFSAVE +bind Previous FWINLT +bind Next FWINRT +bind Back MENU_PREV_ITEM +bind Advance MENU_NEXT_ITEM +bind Previous+Back MENU_FIRST_ITEM +bind Previous+Advance MENU_LAST_ITEM +bind Next+Back MENU_PREV_SETTING +bind Next+Advance MENU_NEXT_SETTING +bind Back+Advance PREFMENU +bind Back+Advance+Previous PREFLOAD +bind Back+Advance+Next PREFSAVE diff --git a/Tables/Input/hw/touch.ktb b/Tables/Input/hw/touch.ktb new file mode 100644 index 0000000000000000000000000000000000000000..9bde806d474993dcf18b1fede003ab2419ead541 --- /dev/null +++ b/Tables/Input/hw/touch.ktb @@ -0,0 +1,22 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare BrailleNote Touch + +include thumb.kti +include braille.kti diff --git a/Tables/Input/ic/all.ktb b/Tables/Input/ic/all.ktb new file mode 100644 index 0000000000000000000000000000000000000000..2f2ec7dcbde4560152114502831b42050cf59c7c --- /dev/null +++ b/Tables/Input/ic/all.ktb @@ -0,0 +1,67 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2016 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title Innovision + +map Dot1 DOT1 +map Dot2 DOT2 +map Dot3 DOT3 +map Dot4 DOT4 +map Dot5 DOT5 +map Dot6 DOT6 +map Dot7 DOT7 +map Dot8 DOT8 +map Space SPACE + +bind Enter KEY_ENTER +bind Space+Back KEY_BACKSPACE +bind Space+Enter KEY_DELETE + +bind LeftUp LNUP +bind LeftDown LNDN + +bind RightUp FWINLT +bind RightDown FWINRT + +bind Space+Dot2+Dot3+Enter TOP +bind Space+Dot2+Dot6+Enter BOT + +bind Space+Dot1+Dot3 PRPROMPT +bind Space+Dot1+Dot6 NXPROMPT + +bind Space+Dot1+LeftUp PRPGRPH +bind Space+Dot1+LeftDown NXPGRPH + +bind Space+Dot1+Dot3+Enter PRDIFLN +bind Space+Dot1+Dot6+Enter NXDIFLN + +bind Space+RightUp ATTRUP +bind Space+RightDown ATTRDN + +bind Space+Dot1+RightUp FWINLTSKIP +bind Space+Dot1+RightDown FWINRTSKIP + +bind Space+Dot3 KEY_PAGE_UP +bind Space+Dot6 KEY_PAGE_DOWN + +bind Space+Dot1+Dot2+Dot3+Dot4+Dot5+Dot6 KEY_FUNCTION+1 # Android Back +bind Space+Dot3+Enter KEY_FUNCTION+0 # Android Home +bind Space+Dot5+LeftUp KEY_FUNCTION+2 # Android Notifications +bind Space+Dot2+Dot5 KEY_FUNCTION+3 # Android RecentApps + +bind RoutingKey ROUTE diff --git a/Tables/Input/ir/all.kti b/Tables/Input/ir/all.kti index 9f4192b083c7da12116b7d0beaef3f5212602882..c181a9afd3d9962a9a11e6bd6aefd1a3ac04f51b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 81249a70357e4b2da38430a7407e48df1e881868..6a419c37b2875493fe1d8e235f1e5871ae2c7184 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8573a766aef11724eb7373f6caf0c2bd259424e6..14cc8faafcb02ff774b1b0457e7dc1b8a311fe70 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/md/common.kti b/Tables/Input/md/common.kti index 969066cb69508be89c0df48b2c656b28b200b525..ef6760e21b91e33754607982c5dfa81c7d54663a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 cdc9d1fb6442fd011a82329bdd8172e87552ee19..3256d7f2197a249db459633e635239bebaf1cf73 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 fa1e469aedd8d45b3a2d7ba4c8a9512c89706e3d..54886ab48df924f9fba160177725e180177cc7a9 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f102913b44ca946dcc56b411460f73b6ce4d77b1..61ebcc4abf46090f9116f8422f73822ec64be918 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8ce9e05154312da4269fa4b552be78d0bfbaccc2..df796cdbe206aac669f17175b361ceee77f825c7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d65cefe1883b972720c99900e12386978177c354..bd8b309a96b795a3ee8bdbd0ccb4a1e80d326aa5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b924b88f18d7e6ff865803bb40337b224d6d3098..764657036108f82130531f28aebef4c4eddc9408 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 81179d8765bdfca5cb682d03153dd6db7ec08e48..f63c71a5f3f19b0bdd1c5e6270139b87e22bf67a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/menu.kti b/Tables/Input/menu.kti index ab9816f43d80448e76d49f4651daf593f8d5a94e..968aa5a51c118e90b922d1b9179d8608c75bb482 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6af4ca3858a99a9fce605e1d19f320f23fad524a..2c0fff635faf1bf0cd1ca9f1964543416acfbe65 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 edf60f1f37cb4c8fd0171384e975a971025b921e..1ee4e76f5e11bccef849f623caeec7cc67bc1e81 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 dadda86f1ef94d1663b71c3804e22210b84d8974..6799d8ce4a0212aa25256875629bba29cf6a96ac 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b4b68ad246580ce5f97fa3b650463bb991d3ac79..1ac7d9e4105a3720f25ddcad3dbf7bb9221ab218 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b1029cdf5de745e8c640085b62e111a9810639fa..38b97b995f43b6e4d74c3989a4bf4f556076ad82 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 bb55c64c1f4a7a72d7441ab543ed8b63b354c68f..966085e8533114126f6fa629e5c2e506ee141611 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e6888ceb6a261e4007044623d1bedddbdb57c06c..423b18a7d4ff151dc38712a7707e21bbf66ccc34 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1eda691c43a0318d556f4c48fbfea91b448055ee..1f386f60249dcb5973e47f5576cc0e669c1caeea 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 16b0ccbbda2174922e6887cf1c374031df8b200d..dd374ced19b0ffc0130102516c203a070e92e72b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 753076e0196fa2635922690f7f01c9e8d245da2f..cbdae87991cf7c2d2c69bc8832a27455b046a20f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 3633810a53fe6857d69c1d8d0ef73b663bc68ab8..361dcd84ffb59db01f873e20c35dd34488745771 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 32aef94b8fc6f7c2022c3980cdadc80e0671d4ee..5dbb99c41b3e553998fc0bf4a87d8f18e0c1de3b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1680464ea2f81b3725535bfe948819f0e792b5b5..876f687d7e4bd29843b7973b56d0a2f6e1c115b4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 27413af27e0fd3d2b70a2fb68fe7ae1595e2dccf..7ff6b10a5efe67c429ad800369fcef86615b7016 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1b0e34b3952775d40c26888680168cc59c617fc7..056685bbe6fbadc11a4c66b17552c8b07b1a4261 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d355be3e9c92e3fae45a8fc79cbfa1a528ec4e9a..cf2bcdb55869a5daf9327b6eac87f19a8ac2eb9e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e07492a2f9f638dbf6f3d2dbe98634040b27c961..4669d6c3163949c015bf402b2bffe8db323387aa 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 dcb01ed336f3e8cd16fb9e1c05f14e8449dbc376..1fc94e5f35c3552653a8e41b65b41e06ee2dacf7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2e8fbbfc2ddeda826ee85326358dc97d5167247b..db7da4ed1c1a8aaa83dfcad433e08e9e899f3490 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e31c8b057638e3bfa269cbe00ff6eca4268de631..28eef862c057624e48e36c792d9301ee2e263de1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d0033c1aa56bde6896f05b3b8e6263e73f62de63..3bd9db0255dbb07c21ec1acae2dc1f5c6f2edb12 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1ba594c496219f60a3c4acb304feee7ce952222d..62316a1da49ffb3a7e187d521f713e7ae4a842d3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 579258d9ff8d8c0bbc00472643c556b5de5bbfb8..1045c9848a22877ce1ee64ee4f9984fa2e533b01 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0627d42b76b92065274e711b967c076df57a8ab8..0453d15b0489e56f50e3ee4a68a6ce2b6aa29f0d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f5d4debb12324a0b6524ae3ce8f6ff2e43cfa697..b3cfbc305fe9360c20034113d4ad478b90f4c2ac 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1add567047cb9df8982fb1fcc47166271ab6d4b0..ac46b5fdd12a50c9690f52d9fec8fc890ff2cfcc 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 af52e2b5b1cd48f627899eeec4ba60c961d11613..5b3923a73e9b765657c9a6c0e1441f5135d5f78e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 dea9142dca2a06080d0dcc5f7cc21668c7707161..44ce7b2dd7c7833b20bee08c29fbe5b098935fe3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 cb0ab4e4920754c4a9cf0339438d359690866d54..b728f29d4e4d69adb0b7ed90c4623d8eb7e271ef 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 fa087af4c26642e6be54bc49c30dd32eb3dceba0..01f963abae2c7dfb7f45173907d5746f62e28592 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f4c8eda68d92c410fcfd3098cb5094c4ed9ce6fa..3cf215302dc0bea994e785312b7c253629e7ec3c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 dc792d160d37e09a9880b61b703494903795aafc..2afd8a501787b05aaeb96006f95b97a8f08c6043 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 c6b2398b913c0107d3cec42e9162ca93fadfc54c..6d6f1ef22ec21e7ceb855347f0f8ce21c7304070 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 4158aa33075ee83e183ca0822f7d82de3e760dc1..2177065d43c395bad83ea79bc542822a3303ed7b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 79d7ca8087866e31a386bd571cfb494f2bac8461..7a63fabb44d0c82dbf7f13342c42cb7e8c397355 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b8729b0de5c85650d55fcded9d6ff2a8dbc18e5a..644f597b45b0410b7c27c83ff7bb88f2c56fc01b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 af5e8185bf045b40164e84ed15a4caf1cb0363e1..6bf2e88083d61ff33ca27f5054c9fd59f2b06b6b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6ad38b2fd7b413bfd91e396da3b5fe678155ba15..5ce5e691eb91aba0c1af0dcfe7e08fb069ccce07 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/ib_80.ktb b/Tables/Input/pm/ib_80.ktb index 5d58d582ab52e15762cc5c88519a48fe37745623..52f4482932549b44afda070eebcaee525454632f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 ab2b44031969460f8ecfa042b69f8689d68cc32f..ebdc064d16e79daef6b63e50ca70a9a414d3c26e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2c240fcb83a46b0c7dc12ecd4f5cbaca7d68d70e..b7e2dfe8d70f72e9630346f3359c1c9b2380e34b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/live.ktb b/Tables/Input/pm/live.ktb index 4e4c2c11c91db06bde539c3f01a00b9571cfe284..230ea38c4ee8194551dadca565f394e07bae753a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 ebe2df272487cf73f310f448b899016acb427cb6..18c53c38ad1dffbb9b8cf1a562430588a6baff33 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 cf435523b11ed9dfc2c56fe2285267dab93d7305..2acc1aaf098a76534a81d4dbffd5118594a4c9d2 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 3e50240b7f83c8dbcb8d6ce6fc4eb1d436bc3b41..e515f19ef32b1636c00749592078f31b1d5265cb 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status2.kti b/Tables/Input/pm/status2.kti index ca9461c5ea9c264b4e0782d9bfdb8d1d1f2fa38d..f3d10be74ee1a2c3515570e10ddef3b3673ab782 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 1e5d954cad22ef3595fd779d4316440072cbbfcd..e74727e0e103494629a9fe443916c7ba0ee6ab28 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status22.kti b/Tables/Input/pm/status22.kti index 282f6895f01fab6cf5747677c24e559c064e17eb..be336822014436b2c60ef8272511441ce9cda536 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/pm/status4.kti b/Tables/Input/pm/status4.kti index 4b110334dc9a3b79e80e0f1d6a558ed8537b8653..c36d3f6e2b4f90f0d31b9e0e9d284eacef6dcb0f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6443351a84c0f9ad19ab15cebb3786a4cc184776..1cdd8360dc1dcc2edf16bb01288ef5bda06227aa 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7960be76b2fe5f1fb14d65f6f1f1150e2ed39ef3..16ef22e9abbc4b35d90fa002ff31c5f019267c89 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 809c0a2695d4911a849009edeed72f86527e6689..feb38441ca4aacf651a60782d8be2fd90b92b804 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/sk/ntk.ktb b/Tables/Input/sk/ntk.ktb index 8c9bb17e66a9e38c5035c2c5b1e4323ce6a578e6..257901cdc8fecb9e334b438565ea26c9e393c8f2 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/toggle.kti b/Tables/Input/toggle.kti index 45ad4a8866cf9b08fa0ac7683b7350c3d305a165..ea3b76a12265d4a29c394f05594757f97d279e51 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 da739733aba9c3456dd6868ba97404793db07081..76ea258c8a465d070649c1e81421ddffb9d3cd04 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 6981c97caab807c27772e24813025157ddcc3f09..68482a754f24dc863bb7cafe1ca926ca216cff15 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7e0255701f48ab7df2768b86a4ad25bc4fdf3401..309957879a9f297274281cc863ce3b4733d073b7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a11baf9ac95e6c0789ddccb9e8a52a41a8737b7d..0a28417016390fefb42696a170f95b8aa60b7798 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8c7f95fd6c3fe39a54944de6a3cc2614ae613599..88fc4c44f2b459c15c1570322467045f3ac5f526 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0dc2e2bc7e305c37012b152738cb0e8246002a6d..0ab02653cb42bc8bae7c2f2dfd2d92dc4bca2c3b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 4465b99180e8a5a3fd402f1af3fa359bc0688abc..35ea614592f9f91cac8331e80511a2b543968b25 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 5b930a553f5415c9451886741c589cd68336199c..4cb8ebcd053651df4ff5b2809eb50423502759d0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0feb9b346f189e0af5fef1fe41f0ebf5f435f1f4..723bd3f895f7846eb2226b645c31cbfb5f776961 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 eb700c663b2f80afaab7bdd65573feefb8c4aa7a..1471bf9ee73aefb26ef9f46bbea68a4fde2873a0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 512f0387fb6652dbefbeaf4bfcf2aa098c252545..a57bfbff9f6682c0dee76a24e3543975a87796c3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a3c394ddec2543512dbecf97f67a9d613ff37150..37c62fe9dfd7bc21095b2ad4ac942d86340511d7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0e721b2c291c9449cd20aacf576889676cc40b91..d76f4a0ff4c35957b6d37a9da0a9bdfa6657f225 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 c2603891ef9b31d4f34f36aebda09aba0c8ee903..f748983919689399fd2a10dd8b9675bc01d159b2 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 33ed7c51f79e121e0c4e258e60e960a9ce8b6f05..c14a9a04de037b0a9366de82501e2fe7de23a2dd 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Input/vo/bp.ktb b/Tables/Input/vo/bp.ktb index b3d26c81ded11f2919345a4794c7e31b5acfa603..18fa4ea447d64b27774173afc01f528cf8ae62ef 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/braille.ktb b/Tables/Keyboard/braille.ktb index 77a435cbe519e0dc5b402d0c4231771927c2b0e5..8cea463e2bb5f16374d0a4f409f97aaf8c0493f4 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/braille.kti b/Tables/Keyboard/braille.kti index 1ab0dccf0ccabfc990f28ca7c937fc263741fc92..06bf5e3bf8ead3a051a9a5897cc9ab8e2cf14ed2 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/desktop.ktb b/Tables/Keyboard/desktop.ktb index 416cda1ade528cabd468c51f9c6f1b8917d94d56..91b127f4e782e737622335024f335e1079b933c8 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/desktop.kti b/Tables/Keyboard/desktop.kti index bba658f61ea92c54efec62814f64e581e81acd76..72275ede73420daac12718e61c3bd507ddfd919b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/keypad.ktb b/Tables/Keyboard/keypad.ktb index 31961d44d3aa77f9fb836a147d957aeb95f42ba9..6d1ff1c101dc7792f8ddb1f81e70d10882d90ae5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/kp_say.kti b/Tables/Keyboard/kp_say.kti index 52625dc3634c1f80483f2240c8f23775cd128632..4a030002f014c8abcc5acf5678e84f63d74de0ec 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 f4f3fe6eec690408d20e9e28a9dd2eabef6447af..7088d413bd146575a5d1cdaa3d180f7dfc306315 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/laptop.ktb b/Tables/Keyboard/laptop.ktb index 25b7f9540b8cf22de9e77344956a1e629529e835..74dc06dc88f77c6716274892d1e6ad7ad65aacd3 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Keyboard/sun_type6.ktb b/Tables/Keyboard/sun_type6.ktb index 68a4e650a58b18afa49762c0118716bb60860122..428e97180d297be0606a9e444e0d3bf466a4f72d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ar.ttb b/Tables/Text/ar.ttb index c52b4e6d6f76a0e9a8a9b432c833e74679bc4760..aaec0b1691aa85d6b35320b379a613254f2405d7 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/as.ttb b/Tables/Text/as.ttb index 9663bf0745ce154cbe8b581f2ce597369dcd4391..21d0dd168a32b22b29f136420018585b1fba4729 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 b5d4aee42822c45fc6a3b8e45cdef425c4d6db1c..a187249b6e48f32bab08e0bc83d75a587a8dabb3 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/awa.ttb b/Tables/Text/awa.ttb index 63ba06cc946fb40e7c9c4d6af51e995e08992047..e8fb9263434eb3fd0ba04c2f069691115396ffa4 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bengali.tti b/Tables/Text/bengali.tti index 7f6bfd9f4d4bf913d61a34e252017341cc92cba2..9f272a97a5aa2bc309f592d493069dabd6aa52eb 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bg.ttb b/Tables/Text/bg.ttb index 7ece10962f7935d3b5f6e7ab49f41dd1aa4302eb..9c0335503357773b8c51e709d6caa72e1d410753 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bh.ttb b/Tables/Text/bh.ttb index e49d3999c4bff877f366fc41fe7ae02e60445fa7..5a9d0f1b9d6390ba8610b52a3f031d90c02fd159 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/blocks.tti b/Tables/Text/blocks.tti index be178e81426ce6ddd94d9657349cc481c53a4c55..62cb8dc3ecd226d3a64f5d5c716e837928acac03 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bn.ttb b/Tables/Text/bn.ttb index c2a27317cdcd37cca229e5c4e41ac2d592ae1790..2f0a8083cd46cb680d5e01292972c446eed8becb 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bo.ttb b/Tables/Text/bo.ttb index 7bea6e10d6ca9eaed1163d6f2e32b322d607acb4..f7f63d3c5c91b490fa0cf36206b3b480480141da 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/boxes.tti b/Tables/Text/boxes.tti index 7f9889d39f812c4dac19faff55b48f491dcd806e..89dcf5cae17d761d9fdaeef152ff5afd273979e0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/bra.ttb b/Tables/Text/bra.ttb index 8d34a0a69fc513eb67995803335c78d3d9ac9682..f6c181d0afadec5634d7a3697341ef237a1def19 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/brf.ttb b/Tables/Text/brf.ttb index 893c7f52a720f919c2c2b05cca8c5db5b78a96bf..10fd1bb6491fe5c05687f8b39c9595044fbc2f21 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/common.tti b/Tables/Text/common.tti index 0f0326b3e64057a4d7573ead48ef10f44c433538..b63908b1b48aedd2d3f2d7f9f7f40484f1a6fcc7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/cs.ttb b/Tables/Text/cs.ttb index 4cd75525980618c34199c205eaa221ea2d50d707..9f6de4345a331afe76d8a9f8563e4aa09d5ea55d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a294917787ccc3afba5aba0140d17b74a515c9f9..570dfead021c322532095bb550cc3617b84914b5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/cy.ttb b/Tables/Text/cy.ttb index 2aadac6cc89b1b38bd68079e9b905b1fcaeb4c43..28927110db06e7050be1b1bfb2bb7ba1521686b1 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 f7b8832270aceb8a7947356395a79b30fcbbd092..06a176452a5598a891b9ecb5b952530bbb00c72c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2e6cb8fc96169634bd8be41258241ccd4ffa8e33..d7b75c1c6e97160e9e8b85653230c26052f43176 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/da.ttb b/Tables/Text/da.ttb index 746451b185e696900f936feeb791b78fe610d6f9..eaba09fcaf13fb399be63f01a559e7b49797932e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 041db42cbe2865d701c7c2decc15073ed04988d5..3c62545f70d90325a9e7675340bcfe9033541113 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/de.ttb b/Tables/Text/de.ttb index c60e715435e5561595805c52b93e8c66df49d06e..98e7de3046d34b2760aa6a53bf3e4e3372efcfba 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/devanagari.tti b/Tables/Text/devanagari.tti index ebfce3168392341827add852ec679ff47f8e84bb..e48c27272aa5476cfb5932ce0e3b1d7d3334b40c 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/dra.ttb b/Tables/Text/dra.ttb index 2d3bde053b65a6feba8b4e9b966bcf33a43de76a..c4d43782a10dfe0870774859e4b9f9fd8954cf78 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/el.ttb b/Tables/Text/el.ttb index 75ba5f9adb4fcb9a4279a2de8c2e8e74d26b85cb..b07c46d2d8fc7322c0262cb5f8e896764f94a8a0 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 855a14e84385253a9e7c01248897e8bbf59911f3..b804198a93fbc94b1687aee7d6c6d0cfab6b763e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 00f5378f0b5b399799bac00627c9fde215b40b78..96477153cfafd2c275ae5e8e426864d0c61eb7c9 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7f4c9c99d729dd8d378a982986c77ea21e18aef9..0ad751211ac5865d87bf09d064e7664a8fdf00f5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/en.ttb b/Tables/Text/en.ttb index b57cfe31500e419930e446c9fa45ddcb9391f35b..9ba9a394472485c9129d233f2f2adf447d458bc3 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 db7ac126b25ba45812db177a1b6b68ad7c08148c..1dea18e0b0ab127267190927ab17ad95b5933605 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d39df1d5b8d65cd0f818e5ded63fa639fa253661..82d9d0724ae679541230b62aa9cce62f0712280b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 11b1bce8bec1e6d1374ea5fa9828085b4683e5e5..464654da08aaa9d966956e115ee6c9125589c99b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/eo.ttb b/Tables/Text/eo.ttb index 5338b4218e428c3fbe3a03078fd2397aad6065b6..cf87a3d5eeeae490715d0473fe880a7b528378d5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/es.ttb b/Tables/Text/es.ttb index 7b2a99eb2d1221fa2d0d4155e86d35268aaf68ed..f9eb028f5af83aacd3a701cea6ce722173bf44f5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/et.ttb b/Tables/Text/et.ttb index 5cb26fb710ee6b86d7858c87acdf49ebb4859b3b..f2f73c5b1733ebd58473767306a729ed88d5b023 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fi.ttb b/Tables/Text/fi.ttb index 835db2fd5504a63889c588f36da6359bf71bf7c0..1d1a10542fefeae3692bdc7ee26e4e936600a26b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -73,39 +73,6 @@ char \x7B (12 4 6 ) # 7B ⠫ { [LEFT CURLY BRACKET] char \x7C ( 456 ) # 7C ⠸ | [VERTICAL LINE] char \x7D (12 456 ) # 7D ⠻ } [RIGHT CURLY BRACKET] char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] -char \x7F (1234 8) # 7F ⢏ [DELETE] -char \x80 ( 23 67 ) # 80 ⡦ [] -char \x81 (12 56 ) # 81 ⠳ [] -char \x82 (123456 ) # 82 ⠿ [BREAK PERMITTED HERE] -char \x83 ( 23 678) # 83 ⣦ [NO BREAK HERE] -char \x84 ( 345 ) # 84 ⠜ [] -char \x85 ( 2345 8) # 85 ⢞ [NEXT LINE (NEL)] -char \x86 (1 6 ) # 86 ⠡ [START OF SELECTED AREA] -char \x87 (1234567 ) # 87 ⡿ [END OF SELECTED AREA] -char \x88 (12345678) # 88 ⣿ [CHARACTER TABULATION SET] -char \x89 ( 678) # 89 ⣠ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A (12345 8) # 8A ⢟ [LINE TABULATION SET] -char \x8B ( 3 56 8) # 8B ⢴ [PARTIAL LINE FORWARD] -char \x8C ( 45 8) # 8C ⢘ [PARTIAL LINE BACKWARD] -char \x8D ( 4567 ) # 8D ⡸ [REVERSE LINE FEED] -char \x8E ( 345 7 ) # 8E ⡜ [SINGLE SHIFT TWO] -char \x8F (1 67 ) # 8F ⡡ [SINGLE SHIFT THREE] -char \x90 (1234567 ) # 90 ⡿ [DEVICE CONTROL STRING] -char \x91 (1 34 8) # 91 ⢍ [PRIVATE USE ONE] -char \x92 (12 56 8) # 92 ⢳ [PRIVATE USE TWO] -char \x93 ( 3 567 ) # 93 ⡴ [SET TRANSMIT STATE] -char \x94 ( 2 4 6 ) # 94 ⠪ [CANCEL CHARACTER] -char \x95 ( 67 ) # 95 ⡠ [MESSAGE WAITING] -char \x96 (123456 8) # 96 ⢿ [START OF GUARDED AREA] -char \x97 ( 3 6 8) # 97 ⢤ [END OF GUARDED AREA] -char \x98 ( 2 456 8) # 98 ⢺ [START OF STRING] -char \x99 ( 2 4 67 ) # 99 ⡪ [] -char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 4 7 ) # 9B ⡈ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 7 ) # 9C ⡀ [STRING TERMINATOR] -char \x9D ( 45 7 ) # 9D ⡘ [OPERATING SYSTEM COMMAND] -char \x9E (1 34 6 8) # 9E ⢭ [PRIVACY MESSAGE] -char \x9F (1 345 8) # 9F ⢝ [APPLICATION PROGRAM COMMAND] char \xA1 ( 23 5 8) # A1 ⢖ ¡ [INVERTED EXCLAMATION MARK] char \xA2 (1 3 56 8) # A2 ⢵ ¢ [CENT SIGN] char \xA3 (123 8) # A3 ⢇ £ [POUND SIGN] diff --git a/Tables/Text/fr-2007.ttb b/Tables/Text/fr-2007.ttb index 52b6be37a591064d797ad70a3036331154239f70..c3e77224e967cafde1871b0945772079b78f3c2f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a1e054da5f80072b91b69b301c8e4e62f0a29897..5a12fe10b55c4179ef4d9ec0303c23138dc3bb7f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 d60144ffb655f13114fea9eb91284a595cfbc08f..9a749412b7f4791cc620b8836319e856045795b9 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/fr.ttb b/Tables/Text/fr.ttb index 3dcd9676e2ec887051a13586e99fa3e82f180b32..577d5f11bd5a62e1c9cf0211118c224d59f80d01 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 bbd93fe35d0fa2d7d1b5f1f1bfd2c58edd8e0e24..5a2953c9a1958ef3ff3139ee196b266924294e7d 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 7f07a3a7d522b75f760fe6bdd27ec950996f464b..28482e227d00b3deedf64c40637e311690de25d7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ga.ttb b/Tables/Text/ga.ttb index 12c013c714e1f9ed8a493e935049c579cde35103..b576c7f2cda60bea56edfa52488f4c4096f33788 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gd.ttb b/Tables/Text/gd.ttb index c626dbe7197cd915241ae4624630d260b95ec2f6..9af8050f1eb92f9e32f09d30886500aeaf34b36b 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gon.ttb b/Tables/Text/gon.ttb index a319500a8a14b97dbef33b117d107a917138dfdd..31e498f25fc083f7b22c0250bf8c8db805eccb27 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/greek.tti b/Tables/Text/greek.tti index bc189b3e8bef194492b81a8ed567b74de4c38716..20d29ca39896d969e0d7cda280f0eb1c2b72d4c7 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gu.ttb b/Tables/Text/gu.ttb index 48056e8e9ea030626d76813cd8bfca86b38fc144..bad4b7ef5890efa74e93eddc030f1e829d5407b0 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gujarati.tti b/Tables/Text/gujarati.tti index dedc4f0cc3be44d5100566a83059120ca0986644..87ad9eeaf2b2db7723ed8c6a4b72b6ce9a1868f0 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/gurmukhi.tti b/Tables/Text/gurmukhi.tti index 37e2cbd035a26cebd383ba9f0ea90d1f9b3dc0ac..d8ec5b343c724d3239ffa1309aeead35e1893b1a 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/he.ttb b/Tables/Text/he.ttb index 50d3b1984265ad0d36124cb670ce116f625fe025..d1def36180ed7a0e4db846d7864b6dfc85d7bac1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hi.ttb b/Tables/Text/hi.ttb index 5446b07122f45ef0277167da4e2c561de80539ae..5822cc85d5167f40eb9788e0fd3f2fb9379d7e50 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hr.ttb b/Tables/Text/hr.ttb index 9f2e2b96f85ee223ac1feae6e201861a550cea21..8c339d152c7952b247b4c8e88e992e5faf45f30e 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hu.ttb b/Tables/Text/hu.ttb index 72d7a93cbad14da7dc0d77c13d5dc4d4830e489f..639760ae07192d7e32279b280517997975f140ae 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/hy.ttb b/Tables/Text/hy.ttb index a23066c10b1fdca4e3da95c86d13d3aed1a41667..a65874584bb6ae89c9d41e650c0e13289a8ff471 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/is.ttb b/Tables/Text/is.ttb index 27d156798dc327fa0e1756d0fdaa43ad3a3e91da..fdbd4b1a6909bebc8acf5306a9cad772f713286e 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/it.ttb b/Tables/Text/it.ttb index fc628b0ce8068b5ef9f210cb23dca7ac9b1f6a49..1bd348c0d2c3e1036df8f7d7a3c8aa83ce68088c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kannada.tti b/Tables/Text/kannada.tti index eb49a61dc60afbbbe03c493b03f016e03b296efb..07ddedb13b35e59fa04c4c85789c6a268d4b30fb 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kha.ttb b/Tables/Text/kha.ttb index 82cf5ae1ecd490633ca6882bc66a6493008dbc24..f5774640f26ccc1f2738067f3732fc6e92f7926c 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kn.ttb b/Tables/Text/kn.ttb index 70bf5eaa9e5b24f4a737fbdd33c76f1792f609db..f91faceb4db3c1a37d347e80950bb5f7347a0e2f 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kok.ttb b/Tables/Text/kok.ttb index f96fac9a91cea1dd3fda09e8d47ec7336e36990d..a44be45d9c81d3dfc223016dbaa4b93682b02ebc 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/kru.ttb b/Tables/Text/kru.ttb index d56ee1df24939694694d8eaebdaef2153c4ed0b3..0a25a5480c1009e8e85fea1c95b681d0f6e625e1 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/lt.ttb b/Tables/Text/lt.ttb index ed2d772d7233e9316a2e196bcd96152c47fd4458..16556c252633768c1fc7641d365191df06f2d052 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,27 +18,172 @@ # BRLTTY Text Table - Lituanian # -# Samuel Thibault -# -# This table is based on the Unesco report on the progress of unification of -# braille writing « L'ÉCRITURE BRAILLE DANS LE MONDE », by Sir Clutha -# MACKENZIE: http://unesdoc.unesco.org/images/0013/001352/135251fo.pdf -# The document is dated 1954, so this table may be quite outdated. +# Copyright (C) 2017 Rimas Kudelis +# +# The Lithuanian 8-dot Braille writing system is described in a decree of the Minister of +# Social Security and Labor, called "Dėl vieningos aštuonių taškų Brailio rašto sistemos +# naudojimo tvarkos aprašo patvirtinimo", which is in effect since 2011-04-13. Document +# number is A1-183. At the time of writing this file, the document was accessible at +# https://www.e-tar.lt/portal/lt/legalAct/TAR.443D667CA047 . +# The document is referred to as "the standard" below. +# +# The standard maps ISO-8859-13 character set to 8-dot Braille writing system. However, +# even though it defines different mappings for literary and computer braille modes, it +# doesn't seem like the authors had a good understanding of why these two modes exist +# and how they differ. Furthermore, the standard contains a few errors (incorrectly named +# characters as well as mapping conflicts). I would say it needs further improvements. +# +# This file is based on the standard, but does not exactly follow it. Some standard +# definitions are commented out, some changed, and some extra ones are added. +# +# This table is based on the respective liblouis table. -# the standard representations for the letters of the Latin alphabet + +### +### LETTERS +### + +# Standard representations for the letters of the Latin alphabet include ltr-latin.tti -# lowercase accented letters +# Lowercase accented letters +char \u0105 (1 6 ) # ⠡ ą [LATIN SMALL LETTER A WITH OGONEK] char \u010D (1 4 6 ) # ⠩ č [LATIN SMALL LETTER C WITH CARON] +char \u0119 (1 56 ) # ⠱ ę [LATIN SMALL LETTER E WITH OGONEK] +char \u0117 ( 345 ) # ⠜ ė [LATIN SMALL LETTER E WITH DOT ABOVE] +char \u012F ( 2 4 6 ) # ⠪ į [LATIN SMALL LETTER I WITH OGONEK] char \u0161 ( 234 6 ) # ⠮ š [LATIN SMALL LETTER S WITH CARON] +char \u0173 ( 34 6 ) # ⠬ ų [LATIN SMALL LETTER U WITH OGONEK] +char \u016B (12 56 ) # ⠳ ū [LATIN SMALL LETTER U WITH MACRON] +char \u017E (12 6 ) # ⠣ ž [LATIN SMALL LETTER Z WITH MACRON] -# lowercase accented letters +# Uppercase accented letters +char \u0104 (1 67 ) # ⡡ Ą [LATIN CAPITAL LETTER A WITH OGONEK] char \u010C (1 4 67 ) # ⡩ Č [LATIN CAPITAL LETTER C WITH CARON] +char \u0118 (1 567 ) # ⡱ Ę [LATIN CAPITAL LETTER E WITH OGONEK] +char \u0116 ( 345 7 ) # ⡜ Ė [LATIN CAPITAL LETTER E WITH DOT ABOVE] +char \u012E ( 2 4 67 ) # ⡪ Į [LATIN CAPITAL LETTER I WITH OGONEK] char \u0160 ( 234 67 ) # ⡮ Š [LATIN CAPITAL LETTER S WITH CARON] +char \u0172 ( 34 67 ) # ⡬ Ų [LATIN CAPITAL LETTER U WITH OGONEK] +char \u016A (12 567 ) # ⡳ Ū [LATIN CAPITAL LETTER U WITH MACRON] +char \u017D (12 67 ) # ⡣ Ž [LATIN CAPITAL LETTER Z WITH CARON] + -# the numbers 0-9 are represented by the letters j,a-i with dot 8 added +### +### DIGITS +### + +# Digits 0-9 are represented by the letters j,a-i with dot 8 added include num-dot8.tti -include punc-basic.tti + +### +### PUNCTUATION +### + +char \x2C ( 2 ) # ⠂ , [COMMA] +char \x2E ( 2 56 ) # ⠲ . [FULL STOP] +char \x3F ( 2 6 ) # ⠢ ? [QUESTION MARK] +char \x21 ( 23 5 ) # ⠖ ! [EXCLAMATION MARK] +char \x3A ( 2 5 ) # ⠒ : [COLON] +char \x3B ( 23 ) # ⠆ ; [SEMICOLON] +char \x22 ( 4 ) # ⠈ " [QUOTATION MARK] +char \x27 ( 3 ) # ⠄ ' [APOSTROPHE] +# The following character is defined as 134568 in the standard, but that is hardly useful. +# According to Unicode, it is the preferred character to use for apostrophe, hence +# defining it as one here. +alias \u2019 \x27 # ’ [RIGHT SINGLE QUOTATION MARK] + +char \x28 ( 23 567 ) # ⡶ ( [LEFT PARENTHESIS] +char \x29 ( 23 56 8) # ⢶ ) [RIGHT PARENTHESIS] +char \x5B (123 56 ) # ⠷ [ LEFT SQUARE BRACKET +char \x5D ( 23456 ) # ⠾ ] RIGHT SQUARE BRACKET +char \x7B ( 2 4 678) # ⣪ { LEFT CURLY BRACKET +char \x7D (1 3 5 78) # ⣕ } RIGHT CURLY BRACKET + +char \x2D ( 3 6 ) # ⠤ - [HYPHEN-MINUS] +# Soft hyphen is defined as 368 in the standard. +alias \xAD \x2D # ­ [SOFT HYPHEN] +# The following characters are not defined in the standard. +alias \u2010 \x2D # ‐ [HYPHEN] +alias \u2011 \x2D # ‑ [NON-BREAKING HYPHEN] +alias \u2012 \x2D # ‒ [FIGURE DASH] +alias \u2013 \x2D # – [EN DASH] +alias \u2014 \x2D # — [EM DASH] +alias \u2015 \x2D # ― [HORIZONTAL BAR] + +# These are the typographically correct quotes in Lithuanian texts. +char \u201E ( 23 67 ) # ⡦ „ [DOUBLE LOW-9 QUOTATION MARK] +char \u201C ( 3 567 ) # ⡴ “ [LEFT DOUBLE QUOTATION MARK] +# The following characters are defined in the standard, because they exist in ISO-8859-13 +# character set, even though they should not be used in Lithuanian texts. +char \u201D ( 3 67 ) # ⡤ ” [RIGHT DOUBLE QUOTATION MARK] +char \xAB ( 5678) # ⣰ « [LEFT-POINTING DOUBLE ANGLE QUOTATION MARK] +char \xBB ( 45 78) # ⣘ » [RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK] + + +### +### MATHEMATICAL SYMBOLS +### + +char \x2B ( 23 5 8) # ⢖ + [PLUS SIGN] +# Real minus is not defined in the standard. +alias \u2212 \x2D # − [MINUS SIGN] +char \x3C ( 2 4 6 8) # ⢪ < [LESS-THAN SIGN] +char \x3D ( 23 56 ) # ⠶ = [EQUALS SIGN] +char \x3E (1 3 5 8) # ⢕ > [GREATER-THAN SIGN] +char \xB1 ( 23 5 78) # ⣖ ± [PLUS-MINUS SIGN] +char \xD7 ( 234 8) # ⢎ × MULTIPLICATION SIGN] +char \xF7 (12 5678) # ⣳ ÷ [DIVISION SIGN] + + +### +### OTHER CHARACTERS +### + +char \x23 ( 3456 ) # ⠼ # [NUMBER SIGN] +char \x24 ( 4 6 ) # ⠨ $ [DOLLAR SIGN] +char \x25 (123456 ) # ⠿ % [PERCENT SIGN] +char \x26 (1234 6 ) # ⠯ & [AMPERSAND] +char \x2A ( 3 5 ) # ⠔ * [ASTERISK] +char \x2F ( 34 ) # ⠌ / [SOLIDUS] +char \x40 ( 345 78) # ⣜ @ [COMMERCIAL AT] +char \x5C ( 34 7 ) # ⡌ \ [REVERSE SOLIDUS] +char \x5E ( 2 56 8) # ⢲ ^ [CIRCUMFLEX ACCENT] +char \x5F ( 4567 ) # ⡸ _ [LOW LINE] +char \x7C ( 456 ) # ⠸ | [VERTICAL LINE] +char \xA6 (1 456 ) # ⠹ ¦ [BROKEN BAR] +char \xA7 ( 34 6 8) # ⢬ § [SECTION SIGN] +char \xAC ( 5 ) # ⠐ ¬ [NOT SIGN] +char \xB5 (1 34 8) # ⢍ µ [MICRO SIGN] +char \xB6 (1234 8) # ⢏ ¶ [PILCROW SIGN] + +char \x60 ( 6 ) # ⠠ ` [GRAVE ACCENT] +char \x7E ( 2 6 8) # ⢢ ~ [TILDE] + +char \xA2 ( 5 8) # ⢐ ¢ [CENT SIGN] +char \xA3 ( 4 67 ) # ⡨ £ [POUND SIGN] +# Euro sign is not defined in the standard, but codepoint 0x80 of ISO-8859-13 is. +# In Windows-1257, 0x80 is the Euro sign. +# The unofficially distributed Lithuanian JAWS table specified all characters as +# ANSI codes, thus rendering Euro as 457. +# Not sure if I want to replicate that here though: who knows how this table will +# end up being used and for how long. Aliasing to E instead. +# char \u20AC ( 45 7 ) # ⡘ € [EURO SIGN] +alias \u20AC \x45 # € [EURO SIGN] + +char \xA4 ( 4 678) # ⣨ ¤ [CURRENCY SIGN] + +char \xA9 (1234 6 8) # ⢯ © COPYRIGHT SIGN +char \xAE (123 5 8) # ⢗ ® [REGISTERED SIGN] + +# Middle dot is unlikely to appear in text, except perhaps as a multiplication sign (dot operator). +char \xB7 ( 3 7 ) # ⡄ · [MIDDLE DOT] + +char \xB0 ( 456 8) # ⢸ ° [DEGREE SIGN] + +char \xB9 (1 78) # ⣁ ¹ [SUPERSCRIPT ONE] +char \xB2 (12 78) # ⣃ ² [SUPERSCRIPT TWO] +char \xB3 (1 4 78) # ⣉ ³ [SUPERSCRIPT THREE] include common.tti diff --git a/Tables/Text/ltr-alias.tti b/Tables/Text/ltr-alias.tti index 3c69ae7d05743eba79ee7db5abc0f9499c023944..e736b00c4581228f9baf54acfa39e39f322ce115 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 e1f2ffd126164647076664aefe3233741d49a53b..aacd2edc4593506cef4d6131e4ee64171d539408 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -53,6 +53,10 @@ char \u044D ( 2 4 6 ) # ⠪ э [CYRILLIC SMALL LETTER E] char \u044E (12 56 ) # ⠳ ю [CYRILLIC SMALL LETTER YU] char \u044F (12 4 6 ) # ⠫ я [CYRILLIC SMALL LETTER YA] char \u0451 (1 6 ) # ⠡ ё [CYRILLIC SMALL LETTER IO] +char \u0454 ( 345 ) # ⠜ є [CYRILLIC SMALL LETTER UKRAINIAN IE] +char \u0456 (1 3456 ) # ⠽ і [CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I] +char \u0457 (1 456 ) # ⠹ ї [CYRILLIC SMALL LETTER YI] +char \u0491 (12 456 ) # ⠻ ґ [CYRILLIC SMALL LETTER GHE WITH UPTURN] # uppercase letters char \u0410 (1 7 ) # ⡁ А [CYRILLIC CAPITAL LETTER A] @@ -88,6 +92,10 @@ char \u042D ( 2 4 67 ) # ⡪ Э [CYRILLIC CAPITAL LETTER E] char \u042E (12 567 ) # ⡳ Ю [CYRILLIC CAPITAL LETTER YU] char \u042F (12 4 67 ) # ⡫ Я [CYRILLIC CAPITAL LETTER YA] char \u0401 (1 67 ) # ⡡ Ё [CYRILLIC CAPITAL LETTER IO] +char \u0404 ( 345 7 ) # ⡜ Є [CYRILLIC CAPITAL LETTER UKRAINIAN IE] +char \u0406 (1 34567 ) # ⡽ І [CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I] +char \u0407 (1 4567 ). # ⡹ Ї [CYRILLIC CAPITAL LETTER YI] +char \u0490 (12 4567 ) # ⡻ Ґ [CYRILLIC CAPITAL LETTER GHE WITH UPTURN] # obsolete lowercase letters char \u0463 ( 345 ) # ⠜ ѣ [CYRILLIC SMALL LETTER YAT] diff --git a/Tables/Text/ltr-dot8.tti b/Tables/Text/ltr-dot8.tti index bfb97564a0a1d4a664c55f8a7dbaf04ab559efb8..249554052c00bca6fc9f0bb7508a3e1aaa0dc47a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 9a7afde25897d25b0701d11ac73f088d5d602157..c35ee28dede22a8ef205d3fc221acb958f935466 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8f92f85cece1bc824a190aaeca495a334a5d948d..cf76cd40098c7efe2d74d496538abf15f212b267 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/lv.ttb b/Tables/Text/lv.ttb index 7640aed42338e36b30bf8ef80f64867d9d81cb89..581855a296b1ad9661e8bcd41da8226c52cc3d46 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/malayalam.tti b/Tables/Text/malayalam.tti index 96af981b07cea3091e64e5fa2eb5c15ffb6c6b51..7c93f7e39b1e338a07e8ee9c109287770ebc36e3 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mg.ttb b/Tables/Text/mg.ttb index 620383b416df4af04102ce1551b21a1a130e8e85..ee97894183d44b07c257ce9faa5734d831afb802 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mi.ttb b/Tables/Text/mi.ttb index 3c06fac1b3b80e5ac5018f12228501dbfac61f27..9d24639815480d52b4246639670ce40ecf34b4fd 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ml.ttb b/Tables/Text/ml.ttb index b14f909e04be46f8bf4e97728a1b292a91ba5b69..ca49d03f573776d8bad81755425d1e78965b4fb2 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mni.ttb b/Tables/Text/mni.ttb index 068ba4d597f2949dc84dd50b758926055b1df975..ff70bf2650ffce29cc4fece30fa6e16bb6b47dda 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mr.ttb b/Tables/Text/mr.ttb index fca5bfbf4b99f71727518bc0c0707219314ebdb0..1b0f50d50b4970b0b0bdf3142c9ff5768d597634 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mt.ttb b/Tables/Text/mt.ttb index 380ccae92850273df411e62b3ae603fa2619b503..8fb3813b9d1a6e4979b2cd16703a71c62765ca38 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mun.ttb b/Tables/Text/mun.ttb index 385ce54f39fce6952d8f3856d65f6623550d5674..a3f7702c9e9b2c05dfc14a20778ed098fb629780 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/mwr.ttb b/Tables/Text/mwr.ttb index b56186027d1aeb8d778b086361af7b4ee3ab7fb2..553587efb46299d64e31221cd07a56bb8cd01a5f 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ne.ttb b/Tables/Text/ne.ttb index 62898f4000cb69fb7e88f6ce43579c7cff0d10b8..fb3dbf74d123e2a17a01aaa56af650fe5f660726 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/new.ttb b/Tables/Text/new.ttb index f713c96463fa26062d838576d74ccdff3049ab7d..5a0cd93974e30999ed34c6d24d5af2874fb86102 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/nl.ttb b/Tables/Text/nl.ttb index e57a1d747f61bb52cf4064e94c4a83df2551edc1..9c2ba194df14a3e15f6a35d5ed1f5da31a65698f 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 83c9b12431da996d1782a2c6fb41b167ccad0a1b..7f99a6707950bfd732a50d37efafc24e6197d9df 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 cf8853f4b2b5f4eaa2739e351a98dac475d8bbce..a465cc43cef8ec0e4b1e4e29bd4c6364f692d451 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 726448ec08ab1de9af63e464831b670f6b8b29c3..a5dce880efa9aff5731664a4b13387e7ed053481 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 0f440b4664c357177376fbdb46cab3c52c668308..a412b1f7476817fecce2ea01a43b145b7bfdc8f6 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/no.ttb b/Tables/Text/no.ttb index bc0245845dc5f81d4743cdddbe135a86b2993b8a..763c87fb503599f3c76c8dbb65975e37233f80b8 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 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 3e8b2e06b76133bd9909a563bf1432b758a33064..cca45423e3d03778098d5de0486e7b9e5da96421 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 a543b5eec455204a007a04798a431520868b052d..083869e4fc3e30f275dabc0ee033997dc6a43883 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 74ebf6defd6c94c65f768b7cc487b2c6c35c8af3..53c7c84b5370866113a7c93cef2ccd6f4ddf239a 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 ac4f0f8182e37cd8f02bf618a71963ace6cdf81f..0272d433bebf3def6cf8a84bc1835f86ff716f79 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 cc43799d6e9ef7adefd5550627b4116e3327aa09..f5048adeaed3f623183e020ec989dd129c4237f7 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 b17ba85ebdcb0259caef392b458a43621dd0d3bd..a3741dbabe0c7ac7d5c8608c504bd278b479b795 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/nwc.ttb b/Tables/Text/nwc.ttb index 554d4e2c54d6e165046b36b64e231214f8ac47bc..1b9b35b65c07199a211dea0744c4c4a95d83df92 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/or.ttb b/Tables/Text/or.ttb index fe5bd8f913d08df034bfd94f76a4776d6c28619f..dd0e8920f46ffb421e4218b28b7c41e67c34a550 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/oriya.tti b/Tables/Text/oriya.tti index eed3073ab745b635298a3a4863477f0b9df95101..c738f5e08821f9433baa54387be7cc92d74aa977 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pa.ttb b/Tables/Text/pa.ttb index ea79a3da19471c846237573d68a9f0539f45b315..faf7e1aa4a6e9019b0ace62f8c82439117198040 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pi.ttb b/Tables/Text/pi.ttb index fd65894f21302ac45f897c73023f5153b582097e..360737682f09731d0a8c1e76968be902c8570c5c 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pl.ttb b/Tables/Text/pl.ttb index 816105bb593147d3031cd3c73a2dffdde561a042..d91d9bac1d92f7227c23f84d8b0c4d9124d47dc1 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/pt.ttb b/Tables/Text/pt.ttb index faf82d4f4c954e3c404e35ae37e23aff29004494..9234771eb3a2f109cbe3bf10abf3a1688e3052e5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/punc-alternate.tti b/Tables/Text/punc-alternate.tti index 6cb103a592d8c723aea82a01e096ba1b9f6bf52b..6eb85035d6c858600361630ae7403dfcb4461c0c 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 8c6f6895d6114ff2118d59a93b47c626f805d952..9a498f987b34e539141e0154bfeb551f5f8e3ca5 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 47c4a9788d16900f4b0195209d64eb083e67a645..2ff8c5106d74757ad532fd0f8b80cd8f3b15af86 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ro.ttb b/Tables/Text/ro.ttb index 327a58d18e304beb753e2fe2ad5412cb2d84ce43..c7bed5245d20f4e9e977cfa0906d1cd33a70e465 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ru.ttb b/Tables/Text/ru.ttb index c2c4cb9f0622b87ddb879673a0b556e9faad1c6a..b2be2fc3a2b5e9de51b32daaeb2e185bca2075ee 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sa.ttb b/Tables/Text/sa.ttb index 331ec3044c231f0797cb77aece98e7c3515d8dd0..c6b9cbb07b62bd4d923c3dc9f2f7d2a3173e1c57 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sat.ttb b/Tables/Text/sat.ttb index 932b0fae140b93923302477b4abc4357756cacda..9f28186a5feef992311858a7a9459325d78e0fbb 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sd.ttb b/Tables/Text/sd.ttb index f04bb94e9e3634d850203254e6aad8db97027826..9ec1f4fc173747351ae7cdf50178c26ef6b9684e 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sk.ttb b/Tables/Text/sk.ttb index a00c7e7993c7c9573d8d6510f5c6a278fcb7cb95..937464060a029f79b166a16af2d514bc3637ecd8 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sl.ttb b/Tables/Text/sl.ttb index 4f6c316ef23b4d7c5869e752dee4d1002696e608..961a5c0580b1deb6fdea1fd3925bc555a33c017e 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/spaces.tti b/Tables/Text/spaces.tti index d3d8b85bb39ee0ed0557ff61005b664a2de443dd..42b86704ace6ff9325416847b46aba7a9847e26b 100644 --- a/Tables/Text/spaces.tti +++ b/Tables/Text/spaces.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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 3c7718762775dd6aad7282a7670cba4b6c2d32c2..01f26f1132bf47cf797d549a5c1e7773f96ca2f8 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 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 2a3ffb4572236d82f1064bd94f6157eb26b9182d..c3fa2008bf3da749008d25a866326ce228f0479f 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sv.ttb b/Tables/Text/sv.ttb index 8edd9219cb0d329fb50c38e59a0c8349517809c0..9517a2b19bbe74f3865bfe0640c124b68ef23f99 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/sw.ttb b/Tables/Text/sw.ttb index 4b35e76f28af25cbd6f0492efdb568fccc9cfb24..d724cd94494c4d689833accf97b054a65e77e9e0 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/ta.ttb b/Tables/Text/ta.ttb index cb00a0237e9feca7a5eb32a608055d6570c25fbc..634b6b12644eecaf98a61e456a45dcda091986c4 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/tamil.tti b/Tables/Text/tamil.tti index 31a9368492afcfc9b0a7c4b0e1a725cfc8f5d936..a2bcc8952dff636a28ce1d5bfa3fa89d42eba2fc 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/te.ttb b/Tables/Text/te.ttb index 7329f63a04f2d8af21c2bdb3ab04bc2982edc656..2c642be805129f3bd0245db6d8641c7e4a75e8b7 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/telugu.tti b/Tables/Text/telugu.tti index 7211baf102554ba1173b652e2131592260cca16a..34fb5fa8eb965c8b2b2c39ecb6cacaf0b0e1fbf8 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-2017 by The BRLTTY Developers. +# Copyright (C) 2008-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/tr.ttb b/Tables/Text/tr.ttb index dbefe027773f098283724c4002cab6da6d87628c..c8174e56898f0de9cef347098d4c34c8c5a24eed 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Tables/Text/uk.ttb b/Tables/Text/uk.ttb new file mode 100644 index 0000000000000000000000000000000000000000..80bece08103fa401b67c3786a194308c43cd7e43 --- /dev/null +++ b/Tables/Text/uk.ttb @@ -0,0 +1,67 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2018 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# BRLTTY Text Table - Ukrainian +# modeled from Russian Braille table by Victor Tsaran + +# This is the Ukrainian braille table. It is based on the KOI8-U character set +# which is the most used in Ukraine. + +# As the Ukrainian cyrillic definition conflicts with the latin definition, some +# decisions had to be taken. Users of this table need to type both latin for the command +# prompt and cyrillic while reading and writing documents and mail. + +# In the following, latin letters are quoted with apostrophes like in 'a', and +# cyrillic letters are enclosed within brackets like in [a]. + +# Dot 1 in the cyrillic definition is the cyrillic letter which looks and +# sounds like 'a'. The problem is that in the KOI8-U character set, there is +# both a latin 'a' and a cyrillic [a]. In decimal, their character numbers are +# 97 and 193 respectively. To handle conflicts like these, we have prioritized +# which characters are most important to match the standard. + +# RULES: +# 1. All cyrillic characters must follow the Ukrainian standard. KOI8-U character +# 193 [a] must be dot-1, and so on. +# 2. Capital cyrillic letters have dot 7 on. +# 3. The latin alphabet is implemented to follow the international standard +# except it has dot 8 on. +# 4. Capital latin letters have dots 7 and 8 on. +# 5. Numbers are defined as in the American standard. This means dot-2 for +# number '1', and so on. This will conflict with the cyrillic comma which is +# also dot-2. +# 4. Special characters like !"#¤%&/()=? follow the American standard if +# possible. +# 2. Control characters are often used on Linux. These are not very well +# implemented. More work should be done. + +# Comments from Ukrainians are very welcome. + +include ltr-cyrillic.tti +include ltr-dot8.tti +include num-nemeth.tti +include punc-alternate.tti + +# generated by ttbtest: charset=koi8-u +char \u2219 ( 23 8) # 95 ⢆ ∙ [BULLET OPERATOR] +char \xB0 ( 23 567 ) # 9C ⡶ ° [DEGREE SIGN] +char \xB2 ( 2 6 8) # 9D ⢢ ² [SUPERSCRIPT TWO] +char \xB7 ( 345 78) # 9E ⣜ · [MIDDLE DOT] +char \xA9 ( 34 678) # BF ⣬ © [COPYRIGHT SIGN] + +include common.tti diff --git a/Tables/Text/vi.ttb b/Tables/Text/vi.ttb index 8c57c0beeb5bccb72a6091ebf2ce7033e4ba2891..ce5474321f64c6786016ef25c53976dc978309dc 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-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff --git a/Windows/libusb-1.0.nsi b/Windows/libusb-1.0.nsi index 409e9e4219f039473584d4086ead8ec0b2290a11..e85cfda2a3bd5e4bc55577f3e641a6cfc0e55414 100644 --- a/Windows/libusb-1.0.nsi +++ b/Windows/libusb-1.0.nsi @@ -61,7 +61,7 @@ ;Pages !insertmacro MUI_PAGE_WELCOME - !insertmacro MUI_PAGE_LICENSE "${DISTDIR}\LICENSE-GPL.txt" + !insertmacro MUI_PAGE_LICENSE "${DISTDIR}\LICENSE-LGPL.txt" !insertmacro MUI_PAGE_DIRECTORY ;-------------------------------- diff --git a/Windows/libusb.nsi b/Windows/libusb.nsi index 6a4172149ef4b82eaf1c19e2d25f4e3e9a24cf92..96105668802e8f92fc636e127664c461a7ad1bc5 100644 --- a/Windows/libusb.nsi +++ b/Windows/libusb.nsi @@ -61,7 +61,7 @@ ;Pages !insertmacro MUI_PAGE_WELCOME - !insertmacro MUI_PAGE_LICENSE "${DISTDIR}\LICENSE-GPL.txt" + !insertmacro MUI_PAGE_LICENSE "${DISTDIR}\LICENSE-LGPL.txt" !insertmacro MUI_PAGE_DIRECTORY ;-------------------------------- diff --git a/Windows/mingw.sh b/Windows/mingw.sh index eedb4a07d39f1f3475bcf0891f034118a70f0016..f08cc467dc8e8a38fc217000fe26035cec213af5 100644 --- a/Windows/mingw.sh +++ b/Windows/mingw.sh @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/Windows/mkwin b/Windows/mkwin index e7ea3b9667c01c2cd562419a8e6671cb7809bad8..e77504f43c37bcfb5872281f0b7208322b505d26 100755 --- a/Windows/mkwin +++ b/Windows/mkwin @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/absdeps.mk b/absdeps.mk index 78a15385033b31c10dad8cc192efed01fd04a44f..9ccb9cdb1f64d34cf503ffe21111bb8788fc67d7 100644 --- a/absdeps.mk +++ b/absdeps.mk @@ -500,6 +500,7 @@ $(BLD_TOP)Drivers/Braille/EuroBraille/eu_esysiris.$O: $(SRC_TOP)Headers/ktb_type $(BLD_TOP)Drivers/Braille/EuroBraille/eu_esysiris.$O: $(SRC_TOP)Headers/queue.h $(BLD_TOP)Drivers/Braille/EuroBraille/eu_esysiris.$O: $(SRC_TOP)Headers/serial_types.h $(BLD_TOP)Drivers/Braille/EuroBraille/eu_esysiris.$O: $(SRC_TOP)Headers/usb_types.h +$(BLD_TOP)Drivers/Braille/EuroBraille/eu_esysiris.$O: $(SRC_TOP)Drivers/Braille/EuroBraille/eu_protocoldef.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Drivers/Braille/EuroBraille/eutp_brl.$O: @@ -711,6 +712,33 @@ $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/usb_types.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Drivers/Braille/HumanWare/brldefs-hw.h cd $(@D) && $(MAKE) $(@F) +# Dependencies for Drivers/Braille/Inceptor/braille.$O: +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Drivers/Braille/Inceptor/braille.c +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/prologue.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(BLD_TOP)config.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/api_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/async.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/async_io.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/brl_base.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/brl_cmds.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/brl_dots.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/brl_driver.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/brl_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/brl_utils.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/cmd_enqueue.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/driver.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/gio_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/io_generic.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/ktb_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/queue.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/serial_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/status_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Headers/usb_types.h +$(BLD_TOP)Drivers/Braille/Inceptor/braille.$O: $(SRC_TOP)Drivers/Braille/Inceptor/brldefs-ic.h + cd $(@D) && $(MAKE) $(@F) + # Dependencies for Drivers/Braille/Iris/braille.$O: $(BLD_TOP)Drivers/Braille/Iris/braille.$O: $(SRC_TOP)Drivers/Braille/Iris/braille.c $(BLD_TOP)Drivers/Braille/Iris/braille.$O: $(SRC_TOP)Headers/prologue.h @@ -1215,7 +1243,6 @@ $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/system_windows.h $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/io_misc.h -$(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/device.h $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/async.h $(BLD_TOP)Drivers/Braille/Virtual/braille.$O: $(SRC_TOP)Headers/async_wait.h @@ -3599,6 +3626,7 @@ $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/ctb_compile.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/ctb_compile.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/get_sockets.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/ctb.h @@ -3611,25 +3639,66 @@ $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/brl_dots.h $(BLD_TOP)Programs/ctb_compile.$O: $(SRC_TOP)Headers/hostcmd.h cd $(@D) && $(MAKE) $(@F) +# Dependencies for Programs/ctb_external.$O: +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Programs/ctb_external.c +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/prologue.h +$(BLD_TOP)Programs/ctb_external.$O: $(BLD_TOP)config.h +$(BLD_TOP)Programs/ctb_external.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/ctb.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/ctb_types.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/prefs.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Programs/ctb_internal.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Programs/ctb_translate.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/brl_dots.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/file.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/get_sockets.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/parse.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/charset.h +$(BLD_TOP)Programs/ctb_external.$O: $(SRC_TOP)Headers/lock.h + cd $(@D) && $(MAKE) $(@F) + +# Dependencies for Programs/ctb_louis.$O: +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Programs/ctb_louis.c +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Headers/prologue.h +$(BLD_TOP)Programs/ctb_louis.$O: $(BLD_TOP)config.h +$(BLD_TOP)Programs/ctb_louis.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Headers/ctb.h +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Headers/ctb_types.h +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Headers/prefs.h +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Programs/ctb_internal.h +$(BLD_TOP)Programs/ctb_louis.$O: $(SRC_TOP)Programs/ctb_translate.h + cd $(@D) && $(MAKE) $(@F) + +# Dependencies for Programs/ctb_native.$O: +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Programs/ctb_native.c +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/prologue.h +$(BLD_TOP)Programs/ctb_native.$O: $(BLD_TOP)config.h +$(BLD_TOP)Programs/ctb_native.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/ctb.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/ctb_types.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/prefs.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Programs/ctb_internal.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Programs/ctb_translate.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/brl_dots.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/unicode.h +$(BLD_TOP)Programs/ctb_native.$O: $(SRC_TOP)Headers/ascii.h + cd $(@D) && $(MAKE) $(@F) + # Dependencies for Programs/ctb_translate.$O: $(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Programs/ctb_translate.c $(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/ctb_translate.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/ctb_translate.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/ctb.h $(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/ctb_types.h +$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/prefs.h $(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Programs/ctb_internal.h +$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Programs/ctb_translate.h $(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/ttb.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/prefs.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/unicode.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/charset.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/lock.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/ascii.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/brl_dots.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/log.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/file.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/get_sockets.h -$(BLD_TOP)Programs/ctb_translate.$O: $(SRC_TOP)Headers/parse.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/dataarea.$O: @@ -3848,7 +3917,7 @@ $(BLD_TOP)Programs/gio_null.$O: $(SRC_TOP)Headers/io_generic.h $(BLD_TOP)Programs/gio_null.$O: $(SRC_TOP)Headers/serial_types.h $(BLD_TOP)Programs/gio_null.$O: $(SRC_TOP)Headers/usb_types.h $(BLD_TOP)Programs/gio_null.$O: $(SRC_TOP)Programs/gio_internal.h -$(BLD_TOP)Programs/gio_null.$O: $(SRC_TOP)Headers/device.h +$(BLD_TOP)Programs/gio_null.$O: $(SRC_TOP)Headers/parse.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/gio_serial.$O: @@ -4388,7 +4457,6 @@ $(BLD_TOP)Programs/midi_alsa.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/midi_alsa.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/midi_alsa.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/midi_alsa.$O: $(SRC_TOP)Headers/timing.h -$(BLD_TOP)Programs/midi_alsa.$O: $(SRC_TOP)Headers/dynld.h $(BLD_TOP)Programs/midi_alsa.$O: $(SRC_TOP)Headers/midi.h cd $(@D) && $(MAKE) $(@F) @@ -4618,7 +4686,6 @@ $(BLD_TOP)Programs/pcm_alsa.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/pcm_alsa.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/pcm_alsa.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/pcm_alsa.$O: $(SRC_TOP)Headers/timing.h -$(BLD_TOP)Programs/pcm_alsa.$O: $(SRC_TOP)Headers/dynld.h $(BLD_TOP)Programs/pcm_alsa.$O: $(SRC_TOP)Headers/pcm.h cd $(@D) && $(MAKE) $(@F) @@ -5878,6 +5945,7 @@ $(BLD_TOP)Programs/update.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/update.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/update.$O: $(SRC_TOP)Programs/parameters.h $(BLD_TOP)Programs/update.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/update.$O: $(SRC_TOP)Headers/alert.h $(BLD_TOP)Programs/update.$O: $(SRC_TOP)Headers/report.h $(BLD_TOP)Programs/update.$O: $(SRC_TOP)Headers/strfmt.h $(BLD_TOP)Programs/update.$O: $(SRC_TOP)Headers/strfmth.h diff --git a/acdir/install-sh b/acdir/install-sh index 584e31a7a373e875a286d922114035d40e4b9cbe..0128876c1a33017faab8b122db016439d20555b6 100755 --- a/acdir/install-sh +++ b/acdir/install-sh @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/aclocal.m4 b/aclocal.m4 index a736f539ed246ef721ead8b2c5da9009cdd493d6..604bd6f4b8e44f45aabf2eb8ef48415a1c6ed7ff 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,3 +1,20 @@ +############################################################################### +# libbrlapi - A library providing access to braille terminals for applications. +# +# Copyright (C) 1995-2018 by Dave Mielke +# +# libbrlapi 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + AC_DEFUN([BRLTTY_UPPERCASE_TRANSLATE], [translit([$1], [a-z], [A-Z])]) AC_DEFUN([BRLTTY_TRANSLATE_ASSIGN], [$1=`echo "$2" | sed -e 'y%$3%$4%'`]) @@ -96,8 +113,8 @@ AC_SUBST([$1_table])]) AC_DEFUN([BRLTTY_ARG_PARAMETERS], [dnl BRLTTY_ARG_WITH( - [$1-parameters], [DRIVER:PARAMETER=SETTING... (comma-separated)], - [default parameters for the $1 driver(s)], + [$1-parameters], [$3PARAMETER=SETTING... (comma-separated)], + [default parameters for the $2], [$1_parameters], [""] ) if test "${$1_parameters}" = "no" @@ -108,7 +125,7 @@ then $1_parameters="" fi AC_DEFINE_UNQUOTED(BRLTTY_UPPERCASE_TRANSLATE([$1_parameters]), ["${$1_parameters}"], - [Define this to be a string containing the default $2 parameters.]) + [Define this to be a string containing the default parameters for the $2.]) BRLTTY_SUMMARY_ITEM([$1-parameters], [$1_parameters])]) AC_DEFUN([BRLTTY_ARG_PACKAGE], [dnl @@ -456,7 +473,7 @@ then fi BRLTTY_SUMMARY_ITEM([internal-$1-drivers], [brltty_internal_codes_$1]) - BRLTTY_ARG_PARAMETERS([$1], [$1 driver]) + BRLTTY_ARG_PARAMETERS([$1], [$1 driver(s)], [DRIVER:]) fi for brltty_driver in ${brltty_item_names_$1} diff --git a/apitest.sh b/apitest.sh new file mode 100644 index 0000000000000000000000000000000000000000..32a64f0bbb73b1a4826ef01182d7d3366f587bb0 --- /dev/null +++ b/apitest.sh @@ -0,0 +1,25 @@ +############################################################################### +# libbrlapi - A library providing access to braille terminals for applications. +# +# Copyright (C) 2006-2018 by Dave Mielke +# +# libbrlapi 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.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +programName="$(basename "${0}")" +cd "$(dirname "${0}")" +programDirectory="$(pwd)" + +[ -z "${LD_LIBRARY_PATH}" ] || LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}" +export LD_LIBRARY_PATH="${programDirectory}${LD_LIBRARY_PATH}" +export LD_PRELOAD="${programDirectory}/../../Programs/libbrlapi.so" + diff --git a/autogen b/autogen index 5e1fece6eb4edeafa1113f5ea4380267b7edaae6..bb0bfceb85f8304538ebdd25fcd7684493b75bdb 100755 --- a/autogen +++ b/autogen @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/bindings.mk b/bindings.mk index 33e36bbb59e9b3594598c2abd051821b4340449b..abe35982739735a7ba4a68d9eb89ee976ac806cc 100644 --- a/bindings.mk +++ b/bindings.mk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/braille.mk b/braille.mk index 12d5ef1228ddb10b2808511d62d41cd5f4ca0bf3..6c5b836dc4619f1cd1cf95a4d998bf8c1e1208d2 100644 --- a/braille.mk +++ b/braille.mk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -27,12 +27,12 @@ BRL_MOD_NAME = $(BLD_TOP)$(DRV_DIR)/$(MOD_NAME)b$(DRIVER_CODE) BRL_MOD_FILE = $(BRL_MOD_NAME).$(MOD_EXT) $(BRL_MOD_FILE): braille.$O $(INSTALL_DIRECTORY) $(@D) - $(MKMOD) $(@) braille.$O $(BRL_OBJS) + $(MKSHR) $(@) braille.$O $(BRL_OBJS) braille-driver: $(BRL_MOD_FILE) install-api:: $(INSTALL_DIRECTORY) $(INSTALL_ROOT)$(INCLUDE_DIRECTORY) - for file in *-$(DRIVER_CODE).h; do test -f $$file && $(INSTALL_DATA) $$file $(INSTALL_ROOT)$(INCLUDE_DIRECTORY); done || : + for file in $(SRC_DIR)/*-$(DRIVER_CODE).h; do test -f $$file && $(INSTALL_DATA) $$file $(INSTALL_ROOT)$(INCLUDE_DIRECTORY); done || : install:: $(INSTALL_API) diff --git a/brltty.spec b/brltty.spec index 575f1ef79b76179469f161691378b7cd243fb786..2c27d4b18c429c53ba51c369e2c9e233725dd598 100644 --- a/brltty.spec +++ b/brltty.spec @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -18,7 +18,7 @@ ############################################################################### Name: brltty -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -51,6 +51,7 @@ BuildRequires: /usr/bin/awk BuildRequires: tcl BuildRequires: glibc-devel BuildRequires: libicu-devel +BuildRequires: liblouis-devel BuildRequires: ncurses-devel BuildRequires: alsa-lib-devel BuildRequires: bluez-libs-devel @@ -77,7 +78,7 @@ Install this package if you use a refreshable braille display. %package -n brltty-braille-brlapi -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -95,11 +96,13 @@ of the braille device. %package -n brltty-braille-xwindow -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL +Requires: libX11 + BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXt-devel @@ -121,7 +124,7 @@ application would be by a blind person using a braille device. %package -n brltty-speech-espeak -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -132,7 +135,6 @@ BuildRequires: espeak-devel AutoProv: no AutoReq: yes -Requires: espeak Summary: eSpeak speech driver for BRLTTY. %description -n brltty-speech-espeak @@ -143,7 +145,7 @@ eSpeak text-to-speech engine. %package -n brltty-speech-festival -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -152,7 +154,6 @@ Requires: festival AutoProv: no AutoReq: yes -Requires: festival Summary: Festival speech driver for BRLTTY. %description -n brltty-speech-festival @@ -163,7 +164,7 @@ Festival text-to-speech engine. %package -n brltty-speech-flite -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -174,7 +175,6 @@ BuildRequires: flite-devel AutoProv: no AutoReq: yes -Requires: flite Summary: Festival Lite speech driver for BRLTTY. %description -n brltty-speech-flite @@ -185,7 +185,7 @@ Festival Lite text-to-speech engine. %package -n brltty-speech-speechd -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -196,7 +196,6 @@ BuildRequires: speech-dispatcher-devel AutoProv: no AutoReq: yes -Requires: speech-dispatcher Summary: Speech Dispatcher speech driver for BRLTTY. %description -n brltty-speech-speechd @@ -207,18 +206,20 @@ Speech Dispatcher text-to-speech server. %package -n brltty-screen-atspi -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL Requires: at-spi +Requires: libX11 BuildRequires: at-spi-devel +BuildRequires: libX11-devel +BuildRequires: xorg-x11-proto-devel AutoProv: no AutoReq: yes -Requires: at-spi Summary: AT-SPI screen driver for BRLTTY. %description -n brltty-screen-atspi @@ -230,7 +231,7 @@ Technology Service Provider Interface. %package -n brltty-screen-atspi2 -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -238,10 +239,11 @@ License: GPL Requires: dbus BuildRequires: at-spi2-core-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: dbus-devel AutoProv: no AutoReq: yes -Requires: dbus Summary: AT-SPI2 screen driver for BRLTTY. %description -n brltty-screen-atspi2 @@ -253,7 +255,7 @@ the Assistive Technology Service Provider Interface. %package -n brltty-screen-screen -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -272,7 +274,7 @@ screen program. %package -n brltty-utils -Version: 5.5 +Version: 5.6 Release: 1 Group: Development/Tools License: GPL @@ -288,7 +290,7 @@ This package provides a set of commands for maintaining BRLTTY's datafiles. %package -n brltty-devel -Version: 5.5 +Version: 5.6 Release: 1 Group: Development/Tools License: GPL @@ -308,7 +310,7 @@ interpret key codes as delivered by BrlAPI's raw mode. %package -n brltty-systemd -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -325,7 +327,7 @@ Install this package if you'd like to manage BRLTTY processes via Systemd. %package -n brltty-udev -Version: 5.5 +Version: 5.6 Release: 1 Group: System Environment/Daemons License: GPL @@ -342,7 +344,7 @@ Install this package if you'd like to manage BRLTTY processes via Udev. %package -n brlapi -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: System Environment/Libraries License: LGPL @@ -360,7 +362,7 @@ which directly accesses a refreshable braille display. %package -n brlapi-devel -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: Development/Libraries License: LGPL @@ -383,7 +385,7 @@ which directly accesses a refreshable braille display. %package -n java-brlapi -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: System Environment/Libraries License: LGPL @@ -403,7 +405,7 @@ which directly accesses a refreshable braille display. %package -n ocaml-brlapi -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: System Environment/Libraries License: LGPL @@ -424,7 +426,7 @@ which directly accesses a refreshable braille display. %package -n python-brlapi -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: System Environment/Libraries License: LGPL @@ -446,7 +448,7 @@ which directly accesses a refreshable braille display. %package -n tcl-brlapi -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: System Environment/Libraries License: LGPL @@ -467,11 +469,13 @@ which directly accesses a refreshable braille display. %package -n brlapi-utils -Version: 0.6.6 +Version: 0.6.7 Release: 1 Group: Applications/System License: LGPL +Requires: libX11 + BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXtst-devel @@ -486,7 +490,7 @@ This package provides a set of commands for maintaining BRLTTY's datafiles. %prep # %setup -n %{name}-%{version} -%setup -n brltty-5.5 +%setup -n brltty-5.6 %build %configure --disable-relocatable-install --with-install-root="${RPM_BUILD_ROOT}" --disable-gpm --without-mikropuhe --without-swift --without-theta --without-viavoice --without-libbraille --with-braille-driver=-tt,-vr @@ -494,7 +498,7 @@ make %install make install install-documents install-messages -make install-systemd install-udev +make install-systemd install-udev install-appstream install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" %find_lang %{name} @@ -586,8 +590,8 @@ rm -fr "${RPM_BUILD_ROOT}" /usr/lib64/python2.7/site-packages/[bB]rlapi[-.]* %files -n tcl-brlapi -/usr/lib64/tcl8.5/brlapi-0.6.6/libbrlapi_tcl.so -/usr/lib64/tcl8.5/brlapi-0.6.6/pkgIndex.tcl +/usr/lib64/tcl8.5/brlapi-0.6.7/libbrlapi_tcl.so +/usr/lib64/tcl8.5/brlapi-0.6.7/pkgIndex.tcl %files -n brlapi-devel %defattr(-,root,root) @@ -610,72 +614,51 @@ rm -fr "${RPM_BUILD_ROOT}" %changelog -* Tue Apr 18 2017 Dave Mielke 5.5 -General changes: - The braille and speech banners no longer include the revision identifier. - The -o (--override-preference=) option has been added. - quiet-if-no-braille can be specified via the configuration file. - Cursor routing hangs have been resolved. - The Log Messages submenu (for warnings and errors) has been added. - Support for panning within a long alert message has been added. - Alert beeps work on a Linux serial console. - The Greek text table has been improved. -Braille device changes: - The default is to check both USB and Bluetooth (not just USB). - Specifying the Bluetooth address is no longer mandatory. - A prefix of a Bluetooth device's name can be specified. - A generic USB serial adapter is probed only if it's been customized. -Baum braille driver changes: - Support for the Vario Ultra has been improved. - Support for the Orbit 20 has been added. -EuroBraille braille driver changes: - More Esytime bindings have been added. - Support has been added for the EsysLight 80 and the Esytime Evolution. -HandyTech braille driver changes: - Support has been added for the Actilino. - The rocker keys can be used for efficient navigation of the menu. - B4+B5 has been bound to Command Learn Mode. - The (now redundant) keypad binding for Command Learn Mode has been removed. - The Bluetooth names of the Active Star and the Braillino are recognized. -HIMS braille driver changes: - Function key bindings have been added for models with four scroll keys. -TTY braille driver changes: - The braille cells are shown (in addition to the text). -HumanWare braille driver changes: - The Braille Note is autodetected when using USB. - Support has been added for the Braille Note Touch. -Polkit changes: - The policy file is installed. - The policy has been renamed to org.a11y.brlapi (from org.brltty). - Initialization doesn't delay BRLTTY startup. -Systemd changes: - The default instance is now brltty.target (not brltty.service). - Multiple instances can be managed (via brltty@.target instances). - A make file has been added to simplify unit and wrapper installation. - BRLTTY isn't started until Udev has finished initializing. - BRLTTY isn't automatically restarted if it terminates cleanly. -Udev changes: - A make file has been added to simplify rules and wrapper installation. +* Mon Feb 5 2018 Dave Mielke 5.6 +General updates: + BRLTTY has been relicensed to the LGPL (from the GPL). + Better cursor routing handling of status line updates and vertical scrolling. + The Track Screen Scroll setting has been added. + The Word Wrap setting has been added. + Panning left when using a contraction table now word wraps. + Typing dismisses an alert message. + The test for when INFO does text maximization instead has been fixed. + Overrides are now applied when the preferences haven't yet been saved. + The Inceptor braille driver (from Innovision) has been added. +The Baum braille driver: + On models with B9 and B10 by the joystick, both are interpreted as Space. + Input packet handling for Pronto! V3 models has been fixed. +The EuroBraille braille driver: + Improved autodetection when using Bluetooth. + The Esytime braille keyboard can be used over Bluetooth and USB. + For Esytime models, B5 has been renamed to B8. +The HIMS braille driver: + The Smart Beetle is now recognized when using Bluetooth. +The HumanWare braille driver: + The BrailleNote Touch is recognized when using USB. BrlAPI changes: - The version is now 0.6.6 (it was 0.6.5). - The server isn't started until the braille driver has started. - Several small fixes. -xbrlapi changes: - The X11 and gdm autostart files are installed. - Constantly trying to connect when BRLTTY isn't available has been fixed. - Reconnection on every window change has been fixed. -Key table changes: - Common chords for all of the sticky modifier keys have been added. - Listings combine dot keys, e.g. Dots12 instead of Dot1+Dot2. + The version is now 0.6.7 (it was 0.6.6). + The brlapi_getModelIdentifier() function has been added to the API. + The default character set is now based on the user's locale. + Sessions would occasionally hang when connecting. + PolKit authentication is no longer attempted when it isn't available. + Reading raw key codes no longer uses key ranges. +Text tables: + The lt (Lithuanian) table has been updated. + The uk (Ukrainian) table has been added. +Contraction tables: + The fr-abrege (French) table has been updated. + The lt (Lithuanian) table has been added. + Support has been added for LibLouis tables. + brltty-ctb's output is now UTF-8 (rather than ASCII). +Key tables: + The ifPlatform and ifNotPlatform directives have been added. +Systemd changes: + Path (rather than target) units are now used to manage BRLTTY instances. Android changes: - The cursor no longer jumps back to the start while spaces are being typed. - Customization files can be in internal storage and/or on the SD card. -Windows changes: - Interaction with NVDA has been revived. - LibUSB can be used on a 64-bit system. - Builds can be done on MinGW64. -Build changes: - AppStream metainfo is maintained and installed. - The new Speech Dispatcher installation layout is supported. - Fixes to support building on Solaris 10 and 11 with C99. + Danish translations have been added. +Build features: + Add the reload target to the make files for Systemd and Udev. + A make file for install/uninstall of the AppStream rules has been added. + Python 3.6 is supported. diff --git a/brltty.spec.in b/brltty.spec.in index 1950ad40636c303993d97e08710adec430f799ae..8a4986c5d6399e4d174ce12466af283b89a4a320 100644 --- a/brltty.spec.in +++ b/brltty.spec.in @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -51,6 +51,7 @@ BuildRequires: /usr/bin/awk BuildRequires: tcl BuildRequires: glibc-devel BuildRequires: libicu-devel +BuildRequires: liblouis-devel BuildRequires: ncurses-devel BuildRequires: alsa-lib-devel BuildRequires: bluez-libs-devel @@ -100,6 +101,8 @@ Release: 1 Group: System Environment/Daemons License: GPL +Requires: libX11 + BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXt-devel @@ -132,7 +135,6 @@ BuildRequires: espeak-devel AutoProv: no AutoReq: yes -Requires: espeak Summary: eSpeak speech driver for BRLTTY. %description -n brltty-speech-espeak @@ -152,7 +154,6 @@ Requires: festival AutoProv: no AutoReq: yes -Requires: festival Summary: Festival speech driver for BRLTTY. %description -n brltty-speech-festival @@ -174,7 +175,6 @@ BuildRequires: flite-devel AutoProv: no AutoReq: yes -Requires: flite Summary: Festival Lite speech driver for BRLTTY. %description -n brltty-speech-flite @@ -196,7 +196,6 @@ BuildRequires: speech-dispatcher-devel AutoProv: no AutoReq: yes -Requires: speech-dispatcher Summary: Speech Dispatcher speech driver for BRLTTY. %description -n brltty-speech-speechd @@ -213,12 +212,14 @@ Group: System Environment/Daemons License: GPL Requires: at-spi +Requires: libX11 BuildRequires: at-spi-devel +BuildRequires: libX11-devel +BuildRequires: xorg-x11-proto-devel AutoProv: no AutoReq: yes -Requires: at-spi Summary: AT-SPI screen driver for BRLTTY. %description -n brltty-screen-atspi @@ -238,10 +239,11 @@ License: GPL Requires: dbus BuildRequires: at-spi2-core-devel +BuildRequires: xorg-x11-proto-devel +BuildRequires: dbus-devel AutoProv: no AutoReq: yes -Requires: dbus Summary: AT-SPI2 screen driver for BRLTTY. %description -n brltty-screen-atspi2 @@ -472,6 +474,8 @@ Release: 1 Group: Applications/System License: LGPL +Requires: libX11 + BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: libXtst-devel @@ -494,7 +498,7 @@ make %install make install install-documents install-messages -make install-systemd install-udev +make install-systemd install-udev install-appstream install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" %find_lang %{name} @@ -610,72 +614,51 @@ rm -fr "${RPM_BUILD_ROOT}" %changelog -* Tue Apr 18 2017 Dave Mielke 5.5 -General changes: - The braille and speech banners no longer include the revision identifier. - The -o (--override-preference=) option has been added. - quiet-if-no-braille can be specified via the configuration file. - Cursor routing hangs have been resolved. - The Log Messages submenu (for warnings and errors) has been added. - Support for panning within a long alert message has been added. - Alert beeps work on a Linux serial console. - The Greek text table has been improved. -Braille device changes: - The default is to check both USB and Bluetooth (not just USB). - Specifying the Bluetooth address is no longer mandatory. - A prefix of a Bluetooth device's name can be specified. - A generic USB serial adapter is probed only if it's been customized. -Baum braille driver changes: - Support for the Vario Ultra has been improved. - Support for the Orbit 20 has been added. -EuroBraille braille driver changes: - More Esytime bindings have been added. - Support has been added for the EsysLight 80 and the Esytime Evolution. -HandyTech braille driver changes: - Support has been added for the Actilino. - The rocker keys can be used for efficient navigation of the menu. - B4+B5 has been bound to Command Learn Mode. - The (now redundant) keypad binding for Command Learn Mode has been removed. - The Bluetooth names of the Active Star and the Braillino are recognized. -HIMS braille driver changes: - Function key bindings have been added for models with four scroll keys. -TTY braille driver changes: - The braille cells are shown (in addition to the text). -HumanWare braille driver changes: - The Braille Note is autodetected when using USB. - Support has been added for the Braille Note Touch. -Polkit changes: - The policy file is installed. - The policy has been renamed to org.a11y.brlapi (from org.brltty). - Initialization doesn't delay BRLTTY startup. -Systemd changes: - The default instance is now brltty.target (not brltty.service). - Multiple instances can be managed (via brltty@.target instances). - A make file has been added to simplify unit and wrapper installation. - BRLTTY isn't started until Udev has finished initializing. - BRLTTY isn't automatically restarted if it terminates cleanly. -Udev changes: - A make file has been added to simplify rules and wrapper installation. +* Mon Feb 5 2018 Dave Mielke 5.6 +General updates: + BRLTTY has been relicensed to the LGPL (from the GPL). + Better cursor routing handling of status line updates and vertical scrolling. + The Track Screen Scroll setting has been added. + The Word Wrap setting has been added. + Panning left when using a contraction table now word wraps. + Typing dismisses an alert message. + The test for when INFO does text maximization instead has been fixed. + Overrides are now applied when the preferences haven't yet been saved. + The Inceptor braille driver (from Innovision) has been added. +The Baum braille driver: + On models with B9 and B10 by the joystick, both are interpreted as Space. + Input packet handling for Pronto! V3 models has been fixed. +The EuroBraille braille driver: + Improved autodetection when using Bluetooth. + The Esytime braille keyboard can be used over Bluetooth and USB. + For Esytime models, B5 has been renamed to B8. +The HIMS braille driver: + The Smart Beetle is now recognized when using Bluetooth. +The HumanWare braille driver: + The BrailleNote Touch is recognized when using USB. BrlAPI changes: - The version is now 0.6.6 (it was 0.6.5). - The server isn't started until the braille driver has started. - Several small fixes. -xbrlapi changes: - The X11 and gdm autostart files are installed. - Constantly trying to connect when BRLTTY isn't available has been fixed. - Reconnection on every window change has been fixed. -Key table changes: - Common chords for all of the sticky modifier keys have been added. - Listings combine dot keys, e.g. Dots12 instead of Dot1+Dot2. + The version is now 0.6.7 (it was 0.6.6). + The brlapi_getModelIdentifier() function has been added to the API. + The default character set is now based on the user's locale. + Sessions would occasionally hang when connecting. + PolKit authentication is no longer attempted when it isn't available. + Reading raw key codes no longer uses key ranges. +Text tables: + The lt (Lithuanian) table has been updated. + The uk (Ukrainian) table has been added. +Contraction tables: + The fr-abrege (French) table has been updated. + The lt (Lithuanian) table has been added. + Support has been added for LibLouis tables. + brltty-ctb's output is now UTF-8 (rather than ASCII). +Key tables: + The ifPlatform and ifNotPlatform directives have been added. +Systemd changes: + Path (rather than target) units are now used to manage BRLTTY instances. Android changes: - The cursor no longer jumps back to the start while spaces are being typed. - Customization files can be in internal storage and/or on the SD card. -Windows changes: - Interaction with NVDA has been revived. - LibUSB can be used on a 64-bit system. - Builds can be done on MinGW64. -Build changes: - AppStream metainfo is maintained and installed. - The new Speech Dispatcher installation layout is supported. - Fixes to support building on Solaris 10 and 11 with C99. + Danish translations have been added. +Build features: + Add the reload target to the make files for Systemd and Udev. + A make file for install/uninstall of the AppStream rules has been added. + Python 3.6 is supported. diff --git a/cfg-android b/cfg-android index f23c9e548badae5a63c35904f2e0bab1922e1747..1c9ad3e147ee7ad174941aa51d6d41f233db6490 100755 --- a/cfg-android +++ b/cfg-android @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -81,11 +81,12 @@ export LDFLAGS="-Wl,--fix-cortex-a8" "${sourceRoot}/configure" \ --disable-gpm \ --disable-icu \ + --disable-liblouis \ --disable-polkit \ --disable-x \ \ --without-libbraille \ - --with-braille-driver=-ba,-bg,-tt,-vr,al,at,bm,ce,eu,fs,hm,ht,hw,ir,mm,md,mt,np,pg,pm,sk,vo \ + --with-braille-driver=-ba,-bg,-tt,-vr,al,at,bm,bn,ce,eu,fs,hm,ht,hw,ic,ir,md,mm,mt,np,pg,pm,sk,vo \ \ --without-espeak \ --without-flite \ diff --git a/cfg-darwin b/cfg-darwin index a473531c75fa94a8c5f912d4a99140600c0bcf92..13741c371c332242cd4e6efadd8bf036f0b16861 100755 --- a/cfg-darwin +++ b/cfg-darwin @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/cfg-dos b/cfg-dos index 6c9a9ab7047586a43d4057e9831aa48f4182f022..82277980b4ff17036f5222e02390706ab6ad935f 100755 --- a/cfg-dos +++ b/cfg-dos @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -49,6 +49,7 @@ export LDFLAGS="" --disable-api \ --disable-gpm \ --disable-icu \ + --disable-liblouis \ --disable-polkit \ --disable-x \ \ diff --git a/cfg-grub b/cfg-grub index 729f8d895303f510c8f3e358a010570dd2635ef1..7263e2b7241b59cf8efb4d928ee9e85f9ce339d7 100755 --- a/cfg-grub +++ b/cfg-grub @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/cfg-iris b/cfg-iris index 3405e940a6e8d9c55d2cc3b3bf8d73e8bbdcfe76..b108c6c389affd43b732d5decffd7039431cf9fa 100755 --- a/cfg-iris +++ b/cfg-iris @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/chkhdrs b/chkhdrs index 3440d06e912c55b7a83733acfaf9466f4a0b7472..1a39ef1797bf2f9e5237f96ac26ed28ff6426856 100755 --- a/chkhdrs +++ b/chkhdrs @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/common.mk b/common.mk index c43a05b6ee786dd9262708c554de593efb64afa6..74c408609dcdecf4832b6df1081af6511d68e04d 100644 --- a/common.mk +++ b/common.mk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -111,10 +111,6 @@ INSTALL_INCLUDE_DIRECTORY = $(INSTALL_ROOT)$(INCLUDE_DIRECTORY) install-include-directory: $(INSTALL_DIRECTORY) $(INSTALL_INCLUDE_DIRECTORY) -INSTALL_METAINFO_DIRECTORY = $(INSTALL_ROOT)$(datadir)/metainfo -install-metainfo-directory: - $(INSTALL_DIRECTORY) $(INSTALL_METAINFO_DIRECTORY) - INSTALL_APILIB_DIRECTORY = $(INSTALL_ROOT)$(libdir) install-apilib-directory: $(INSTALL_DIRECTORY) $(INSTALL_APILIB_DIRECTORY) diff --git a/config.h.in b/config.h.in index b6b236731cb0f6ccd2b3c5239934fcc75d44d1eb..090c670dcb3eac0e8369635615303aee7fa2972d 100644 --- a/config.h.in +++ b/config.h.in @@ -2,14 +2,14 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2017 by The BRLTTY Developers. + * Copyright (C) 1995-2018 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * * This is free software, placed under the terms of the - * GNU General Public License, as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any - * later version. Please see the file LICENSE-GPL for details. + * 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.com/ * @@ -272,6 +272,9 @@ extern "C" { /* Define this to be a string containing the path to the tables directory. */ #undef TABLES_DIRECTORY +/* Define this to be a string containing the path to the LibLouis tables directory. */ +#undef LOUIS_TABLES_DIRECTORY + /* Define this to be a string containing the path to the configuration directory. */ #undef CONFIGURATION_DIRECTORY @@ -299,7 +302,7 @@ extern "C" { /* Define this to be a string containing a list of the braille driver codes. */ #undef BRAILLE_DRIVER_CODES -/* Define this to be a string containing the default braille driver parameters. */ +/* Define this to be a string containing the default parameters for the braille driver(s). */ #undef BRAILLE_PARAMETERS /* Define this to be a string containing the path to the directory containing the devices. */ @@ -466,7 +469,7 @@ extern "C" { /* Define this to be a string containing a list of the speech driver codes. */ #undef SPEECH_DRIVER_CODES -/* Define this to be a string containing the default speech driver parameters. */ +/* Define this to be a string containing the default parameters for the speech driver(s). */ #undef SPEECH_PARAMETERS /* Define this to be a string containing the default screen driver code. */ @@ -475,7 +478,7 @@ extern "C" { /* Define this to be a string containing a list of the screen driver codes. */ #undef SCREEN_DRIVER_CODES -/* Define this to be a string containing the default screen driver parameters. */ +/* Define this to be a string containing the default parameters for the screen driver(s). */ #undef SCREEN_PARAMETERS /* Define this to include contraction table support. */ @@ -505,7 +508,7 @@ extern "C" { /* Define this if the application programming interface is to be included. */ #undef ENABLE_API -/* Define this to be a string containing the default application programming interface parameters. */ +/* Define this to be a string containing the default parameters for the application programming interface. */ #undef API_PARAMETERS /* Define this if shared object support is to be included. */ diff --git a/config.mk.in b/config.mk.in index 686f547e6095c2788ff18213f7d4d3b28c41796c..ead6ca3484b0dddea63efd85483e8384b9babfb7 100644 --- a/config.mk.in +++ b/config.mk.in @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -106,6 +106,9 @@ POLKIT_PACKAGE = @polkit_package@ POLKIT_INCLUDES = @polkit_includes@ POLKIT_LIBS = @polkit_libs@ +LOUIS_INCLUDES = @louis_includes@ +LOUIS_LIBS = @louis_libs@ + ICU_INCLUDES = @icu_includes@ ICU_LIBS = @icu_libs@ @@ -248,10 +251,10 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@ +LDLIBS = $(ICU_LIBS) $(SYSTEM_LIBS) @LIBS@ -MKOBJ = @MKOBJ@ -MKMOD = @MKMOD@ +MKSHR = @MKSHR@ +MKREL = @MKREL@ MKLIB = @MKLIB@ CONFLIBDIR = @CONFLIBDIR@ STRIP = @STRIP@ @@ -412,3 +415,6 @@ INSTALL_API_BINDINGS = @install_api_bindings@ ALL_XBRLAPI = @all_xbrlapi@ INSTALL_XBRLAPI = @install_xbrlapi@ +ALL_BRLTTY_CTB = @all_brltty_ctb@ +INSTALL_BRLTTY_CTB = @install_brltty_ctb@ + diff --git a/config.sh.in b/config.sh.in index 0022be85fe116e657fa56153f7648bee1b74c9b6..12317455a5b45c5c15792a358cf8ad2ade8f4064 100644 --- a/config.sh.in +++ b/config.sh.in @@ -4,14 +4,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/configure b/configure index d65aea972660489cb0bcb9dc1bbe8f71ea745c83..60aa6ad677de282d57ac485774586fe6d063a183 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for BRLTTY 5.5. +# Generated by GNU Autoconf 2.69 for BRLTTY 5.6. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -266,7 +266,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and brltty@mielke.cc + $as_echo "$0: Please tell bug-autoconf@gnu.org and brltty@brltty.com $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -580,9 +580,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='BRLTTY' PACKAGE_TARNAME='brltty' -PACKAGE_VERSION='5.5' -PACKAGE_STRING='BRLTTY 5.5' -PACKAGE_BUGREPORT='brltty@mielke.cc' +PACKAGE_VERSION='5.6' +PACKAGE_STRING='BRLTTY 5.6' +PACKAGE_BUGREPORT='brltty@brltty.com' PACKAGE_URL='http://brltty.com/' ac_unique_file="Programs/brltty.c" @@ -740,6 +740,7 @@ braille_libraries_mb braille_libraries_lt braille_libraries_lb libbraille_root +braille_libraries_ic braille_libraries_ir braille_libraries_hw braille_libraries_ht @@ -822,6 +823,11 @@ pgmpath_includes pgmpath_package install_contraction_tables contracted_braille_objects +install_brltty_ctb +all_brltty_ctb +louis_libs +louis_includes +louis_package system_libs system_includes system_package @@ -923,8 +929,8 @@ GREP CPP CONFLIBDIR MKLIB -MKMOD -MKOBJ +MKREL +MKSHR can_make_BrlAPIref can_make_manual INSTALL_DATA @@ -1068,6 +1074,7 @@ enable_x with_gui_toolkit with_system_package enable_contracted_braille +enable_liblouis enable_gpm with_pgmpath_package with_service_package @@ -1664,7 +1671,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures BRLTTY 5.5 to adapt to many kinds of systems. +\`configure' configures BRLTTY 5.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1730,7 +1737,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of BRLTTY 5.5:";; + short | recursive ) echo "Configuration of BRLTTY 5.6:";; esac cat <<\_ACEOF @@ -1751,6 +1758,7 @@ Optional Features: --disable-tcl-bindings Tcl bindings for BrlAPI --disable-x support for X11 --disable-contracted-braille in-line contracted braille + --disable-liblouis support for LibLouis-based contracted braille --disable-gpm mouse tracking via GPM --disable-speech-support support for speech synthesizers and text-to-speech engines @@ -1781,8 +1789,9 @@ Optional Packages: path to directory containing header files --with-init-path=FILE path to real init program --with-stderr-path=FILE path to standard error log file - --with-api-parameters=DRIVER:PARAMETER=SETTING... (comma-separated) - default parameters for the api driver(s) + --with-api-parameters=PARAMETER=SETTING... (comma-separated) + default parameters for the application + programming interface --with-api-socket-path=PATH where local sockets for teh api are stored --with-tcl-config=PATH the path to the Tcl configuration script (tclConfig.sh) or to the directory containing @@ -1836,6 +1845,7 @@ Optional Packages: - ht HandyTech - hw HumanWare - ir Iris + - ic Inceptor - lb Libbraille - lt LogText - mb MultiBraille @@ -1954,6 +1964,7 @@ Optional Packages: - ta Tamil - te Telugu - tr Turkish + - uk Ukrainian - vi Vietnamese --with-attributes-table=FILE built-in (fallback) attributes table - left_right foreground colour in the left @@ -2024,7 +2035,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . BRLTTY home page: . _ACEOF ac_status=$? @@ -2088,7 +2099,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -BRLTTY configure 5.5 +BRLTTY configure 5.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2373,9 +2384,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------- ## -## Report this to brltty@mielke.cc ## -## ------------------------------- ##" +( $as_echo "## -------------------------------- ## +## Report this to brltty@brltty.com ## +## -------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2807,7 +2818,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by BRLTTY $as_me 5.5, which was +It was created by BRLTTY $as_me 5.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3161,7 +3172,7 @@ api_major=0 api_minor=6 -api_revision=6 +api_revision=7 api_version=${api_major}.${api_minor} @@ -5769,51 +5780,34 @@ test "${LINUXDOC}" = "false" && can_make_manual=no || can_make_manual=yes test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for make relocatable object command" >&5 -$as_echo_n "checking for make relocatable object command... " >&6; } -if ${brltty_cv_prog_mkobj+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "${host_os}" -in - *) - brltty_cv_prog_mkobj="\$(LD) -r -o" - ;; -esac -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $brltty_cv_prog_mkobj" >&5 -$as_echo "$brltty_cv_prog_mkobj" >&6; } -MKOBJ="${brltty_cv_prog_mkobj}" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for loadable module creation command" >&5 -$as_echo_n "checking for loadable module creation command... " >&6; } -if ${brltty_cv_prog_mkmod+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared object creation command" >&5 +$as_echo_n "checking for shared object creation command... " >&6; } +if ${brltty_cv_prog_make_object_shared+:} false; then : $as_echo_n "(cached) " >&6 else case "${host_os}" in linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*) - brltty_mkmod_ld_make="-shared" + brltty_mkshr_ld_make="-shared" ;; solaris*) - brltty_mkmod_ld_make="-G" + brltty_mkshr_ld_make="-G" ;; hpux*) - brltty_mkmod_ld_make="-b" + brltty_mkshr_ld_make="-b" ;; osf*) - brltty_mkmod_ld_make="-shared" + brltty_mkshr_ld_make="-shared" ;; darwin*) - brltty_mkmod_ld_make="-bundle" - brltty_mkmod_ld_options="-flat_namespace -undefined suppress" - brltty_mkmod_gcc_make="-bundle" + brltty_mkshr_ld_make="-bundle" + brltty_mkshr_ld_options="-flat_namespace -undefined suppress" + brltty_mkshr_gcc_make="-bundle" ;; msdos*) - brltty_mkmod_ld_make="not_supported_on_msdos" - brltty_mkmod_ld_options="not_supported_on_msdos" - brltty_mkmod_gcc_make="not_supported_on_msdos" + brltty_mkshr_ld_make="not_supported_on_msdos" + brltty_mkshr_ld_options="not_supported_on_msdos" + brltty_mkshr_gcc_make="not_supported_on_msdos" ;; *) as_fn_error $? "loadable module creation command not configured for ${host_os}" "$LINENO" 5 @@ -5821,19 +5815,36 @@ in esac if test "${GCC}" = "yes" then - brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} `echo "${brltty_mkmod_ld_options}" | sed -e ' + brltty_cv_prog_make_object_shared="\$(CC) ${brltty_mkshr_gcc_make=-shared} `echo "${brltty_mkshr_ld_options}" | sed -e ' /^$/d s/^ */-Wl / s/ *$// s/ */,/g '` -o" else - brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o" + brltty_cv_prog_make_object_shared="\$(LD) ${brltty_mkshr_ld_make} ${brltty_mkshr_ld_options} -o" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $brltty_cv_prog_mkmod" >&5 -$as_echo "$brltty_cv_prog_mkmod" >&6; } -MKMOD="${brltty_cv_prog_mkmod}" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $brltty_cv_prog_make_object_shared" >&5 +$as_echo "$brltty_cv_prog_make_object_shared" >&6; } +MKSHR="${brltty_cv_prog_make_object_shared}" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for make relocatable object command" >&5 +$as_echo_n "checking for make relocatable object command... " >&6; } +if ${brltty_cv_prog_make_object_relocatable+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "${host_os}" +in + *) + brltty_cv_prog_make_object_relocatable="\$(LD) -r -o" + ;; +esac +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $brltty_cv_prog_make_object_relocatable" >&5 +$as_echo "$brltty_cv_prog_make_object_relocatable" >&6; } +MKREL="${brltty_cv_prog_make_object_relocatable}" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dynamic library creation command" >&5 @@ -7442,7 +7453,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2017 by +# Copyright (C) 2006-2018 by # Samuel Thibault # Sébastien Hinderer # @@ -7982,7 +7993,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -8480,7 +8491,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2017 by +# Copyright (C) 2005-2018 by # Alexis Robert # Samuel Thibault # @@ -8500,6 +8511,16 @@ else PYTHON_OK=true +# Suppress a new warning introduced in Python 3.6: +# +# Python runtime initialized with LC_CTYPE=C +# (a locale with default ASCII encoding), +# which may cause Unicode compatibility problems. +# Using C.UTF-8, C.utf8, or UTF-8 (if available) +# as alternative Unicode-compatible locales is recommended. +# +export PYTHONCOERCECLOCALE=0 + # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -8747,7 +8768,7 @@ else ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2017 by Dave Mielke +# Copyright (C) 2006-2018 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -9145,6 +9166,54 @@ _ACEOF brltty_summary_lines="${brltty_summary_lines} curses-package: ${curses_package}" } +if test -n "${curses_package}" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intrflush in -ltinfo" >&5 +$as_echo_n "checking for intrflush in -ltinfo... " >&6; } +if ${ac_cv_lib_tinfo_intrflush+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinfo $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char intrflush (); +int +main () +{ +return intrflush (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tinfo_intrflush=yes +else + ac_cv_lib_tinfo_intrflush=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_intrflush" >&5 +$as_echo "$ac_cv_lib_tinfo_intrflush" >&6; } +if test "x$ac_cv_lib_tinfo_intrflush" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBTINFO 1 +_ACEOF + + LIBS="-ltinfo $LIBS" + +fi + +fi curses_libs="${LIBS%${brltty_curses_libs_save}}" LIBS="${brltty_curses_libs_save}" @@ -11144,9 +11213,94 @@ else $as_echo "#define ENABLE_CONTRACTED_BRAILLE 1" >>confdefs.h - contracted_braille_objects='ctb_compile.$O ctb_translate.$O' + + all_brltty_ctb="all-brltty-ctb" + install_brltty_ctb="install-brltty-ctb" + + contracted_braille_objects='ctb_compile.$O ctb_translate.$O ctb_native.$O ctb_external.$O' install_contraction_tables=install-contraction-tables + louis_includes="" + louis_libs="" + # Check whether --enable-liblouis was given. +if test "${enable_liblouis+set}" = set; then : + enableval=$enable_liblouis; +else + enableval="yes" +fi + + +brltty_enabled_liblouis="${enableval}" +brltty_summary_lines="${brltty_summary_lines} + liblouis: ${brltty_enabled_liblouis}" + +if test "${enableval}" = "no" +then + : +else + if test "${enableval}" = "yes" + then + brltty_ok=true + else + brltty_ok=false + fi + + if "${brltty_ok}" + then + louis_package="" +louis_includes="" +louis_libs="" + +for package_specification in liblouis +do + ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_LOUIS 1" >>confdefs.h + + + louis_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: louis package: ${louis_package}" >&5 +$as_echo "$as_me: louis package: ${louis_package}" >&6;} + + louis_includes=`${PKG_CONFIG} --cflags-only-I "${louis_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: louis includes: ${louis_includes}" >&5 +$as_echo "$as_me: louis includes: ${louis_includes}" >&6;} + + louis_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${louis_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: louis libs: ${louis_libs}" >&5 +$as_echo "$as_me: louis libs: ${louis_libs}" >&6;} + + louisTablesDirectory=`${PKG_CONFIG} --variable=tablesdir liblouis` + if test -n "${louisTablesDirectory}" + then + +cat >>confdefs.h <<_ACEOF +#define LOUIS_TABLES_DIRECTORY "${louisTablesDirectory}" +_ACEOF + + contracted_braille_objects="${contracted_braille_objects} ctb_louis.\$O" + fi + + break + } +done + +test -n "${louis_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: louis support not available" >&5 +$as_echo "$as_me: WARNING: louis support not available" >&2;} +} + + + + + + + else + as_fn_error $? "invalid selection: --enable-liblouis=${enableval}" "$LINENO" 5 + fi +fi + + + else as_fn_error $? "invalid selection: --enable-contracted-braille=${enableval}" "$LINENO" 5 fi @@ -11154,6 +11308,8 @@ fi + + # Check whether --enable-gpm was given. if test "${enable_gpm+set}" = set; then : enableval=$enable_gpm; @@ -13766,7 +13922,13 @@ then ports_package="kfreebsd" ;; linux*) - ports_package="glibc" + ac_fn_c_check_func "$LINENO" "ioperm" "ac_cv_func_ioperm" +if test "x$ac_cv_func_ioperm" = xyes; then : + + ports_package="glibc" + +fi + ;; mingw*) ports_package="windows" @@ -13944,6 +14106,11 @@ brltty_item_codes_braille="${brltty_item_codes_braille} ir" brltty_item_names_braille="${brltty_item_names_braille} Iris" braille_libraries_ir='' +brltty_item_entries_braille="${brltty_item_entries_braille} ic-Inceptor" +brltty_item_codes_braille="${brltty_item_codes_braille} ic" +brltty_item_names_braille="${brltty_item_names_braille} Inceptor" +braille_libraries_ic='' + # Check whether --with-libbraille was given. if test "${with_libbraille+set}" = set; then : @@ -14596,6 +14763,7 @@ brltty_summary_lines="${brltty_summary_lines} + brltty_default_table="en-nabcc" @@ -16822,7 +16990,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by BRLTTY $as_me 5.5, which was +This file was extended by BRLTTY $as_me 5.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16882,14 +17050,14 @@ $config_headers Configuration commands: $config_commands -Report bugs to . +Report bugs to . BRLTTY home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -BRLTTY config.status 5.5 +BRLTTY config.status 5.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e94d33bdf651f2c1842cba332cc7b7970328bae..eaa73bdb4a3df6065051b0d001fde57ae97c461b 100644 --- a/configure.ac +++ b/configure.ac @@ -3,14 +3,14 @@ dnl Process this file with autoconf 2.53 to produce a configure script. # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -18,12 +18,12 @@ dnl Process this file with autoconf 2.53 to produce a configure script. ############################################################################### AC_PREREQ([2.64]) -AC_INIT([BRLTTY], [5.5], [brltty@mielke.cc], [brltty], [http://brltty.com/]) +AC_INIT([BRLTTY], [5.6], [brltty@brltty.com], [brltty], [http://brltty.com/]) AC_CONFIG_SRCDIR([Programs/brltty.c]) AC_SUBST([api_major], [0]) AC_SUBST([api_minor], [6]) -AC_SUBST([api_revision], [6]) +AC_SUBST([api_revision], [7]) AC_SUBST([api_version], [${api_major}.${api_minor}]) AC_SUBST([api_release], [${api_version}.${api_revision}]) @@ -428,40 +428,30 @@ AC_SUBST([can_make_manual]) test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes AC_SUBST([can_make_BrlAPIref]) -AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_mkobj], [dnl -case "${host_os}" -in - *) - brltty_cv_prog_mkobj="\$(LD) -r -o" - ;; -esac]) -MKOBJ="${brltty_cv_prog_mkobj}" -AC_SUBST([MKOBJ]) - -AC_CACHE_CHECK([for loadable module creation command], [brltty_cv_prog_mkmod], [dnl +AC_CACHE_CHECK([for shared object creation command], [brltty_cv_prog_make_object_shared], [dnl case "${host_os}" in linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*) - brltty_mkmod_ld_make="-shared" + brltty_mkshr_ld_make="-shared" ;; solaris*) - brltty_mkmod_ld_make="-G" + brltty_mkshr_ld_make="-G" ;; hpux*) - brltty_mkmod_ld_make="-b" + brltty_mkshr_ld_make="-b" ;; osf*) - brltty_mkmod_ld_make="-shared" + brltty_mkshr_ld_make="-shared" ;; darwin*) - brltty_mkmod_ld_make="-bundle" - brltty_mkmod_ld_options="-flat_namespace -undefined suppress" - brltty_mkmod_gcc_make="-bundle" + brltty_mkshr_ld_make="-bundle" + brltty_mkshr_ld_options="-flat_namespace -undefined suppress" + brltty_mkshr_gcc_make="-bundle" ;; msdos*) - brltty_mkmod_ld_make="not_supported_on_msdos" - brltty_mkmod_ld_options="not_supported_on_msdos" - brltty_mkmod_gcc_make="not_supported_on_msdos" + brltty_mkshr_ld_make="not_supported_on_msdos" + brltty_mkshr_ld_options="not_supported_on_msdos" + brltty_mkshr_gcc_make="not_supported_on_msdos" ;; *) AC_MSG_ERROR([loadable module creation command not configured for ${host_os}]) @@ -469,11 +459,21 @@ in esac if test "${GCC}" = "yes" then - brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o" + brltty_cv_prog_make_object_shared="\$(CC) ${brltty_mkshr_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkshr_ld_options}]) -o" else - brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o" + brltty_cv_prog_make_object_shared="\$(LD) ${brltty_mkshr_ld_make} ${brltty_mkshr_ld_options} -o" fi]) -AC_SUBST([MKMOD], ["${brltty_cv_prog_mkmod}"]) +AC_SUBST([MKSHR], ["${brltty_cv_prog_make_object_shared}"]) + +AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_make_object_relocatable], [dnl +case "${host_os}" +in + *) + brltty_cv_prog_make_object_relocatable="\$(LD) -r -o" + ;; +esac]) +MKREL="${brltty_cv_prog_make_object_relocatable}" +AC_SUBST([MKREL]) AC_CACHE_CHECK([for dynamic library creation command], [brltty_cv_prog_mklib], [dnl case "${host_os}" @@ -721,6 +721,10 @@ BRLTTY_PACKAGE_CHOOSE([curses], [pdcursesu curses.h], [curses curses.h], [pdcurses curses.h]) +if test -n "${curses_package}" +then + AC_CHECK_LIB([tinfo], [intrflush]) +fi curses_libs="${LIBS%${brltty_curses_libs_save}}" LIBS="${brltty_curses_libs_save}" AC_SUBST([curses_libs]) @@ -1087,9 +1091,35 @@ BRLTTY_ARG_DISABLE( [dnl AC_DEFINE([ENABLE_CONTRACTED_BRAILLE], [1], [Define this to include contraction table support.]) - contracted_braille_objects='ctb_compile.$O ctb_translate.$O' + + all_brltty_ctb="all-brltty-ctb" + install_brltty_ctb="install-brltty-ctb" + + contracted_braille_objects='ctb_compile.$O ctb_translate.$O ctb_native.$O ctb_external.$O' install_contraction_tables=install-contraction-tables + + louis_includes="" + louis_libs="" + BRLTTY_ARG_DISABLE( + [liblouis], + [support for LibLouis-based contracted braille], + [], + [dnl + BRLTTY_HAVE_PACKAGE([louis], [liblouis], [dnl + louisTablesDirectory=`${PKG_CONFIG} --variable=tablesdir liblouis` + if test -n "${louisTablesDirectory}" + then + AC_DEFINE_UNQUOTED([LOUIS_TABLES_DIRECTORY], ["${louisTablesDirectory}"], + [Define this to be a string containing the path to the LibLouis tables directory.]) + contracted_braille_objects="${contracted_braille_objects} ctb_louis.\$O" + fi + ]) + ]) + AC_SUBST([louis_includes]) + AC_SUBST([louis_libs]) ]) +AC_SUBST([all_brltty_ctb]) +AC_SUBST([install_brltty_ctb]) AC_SUBST([contracted_braille_objects]) AC_SUBST([install_contraction_tables]) @@ -1446,7 +1476,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl ports_package="kfreebsd" ;; linux*) - ports_package="glibc" + AC_CHECK_FUNC([ioperm], [ + ports_package="glibc" + ]) ;; mingw*) ports_package="windows" @@ -1476,6 +1508,7 @@ BRLTTY_BRAILLE_DRIVER([hm], [HIMS]) BRLTTY_BRAILLE_DRIVER([ht], [HandyTech]) BRLTTY_BRAILLE_DRIVER([hw], [HumanWare]) BRLTTY_BRAILLE_DRIVER([ir], [Iris]) +BRLTTY_BRAILLE_DRIVER([ic], [Inceptor]) BRLTTY_IF_PACKAGE([Libbraille], [libbraille], [include/braille.h], [dnl BRLTTY_BRAILLE_DRIVER([lb], [Libbraille], [-L$(LIBBRAILLE_ROOT)/lib -lbraille]) ]) @@ -1687,6 +1720,7 @@ BRLTTY_TEXT_TABLE([sw], [Swahili]) BRLTTY_TEXT_TABLE([ta], [Tamil]) BRLTTY_TEXT_TABLE([te], [Telugu]) BRLTTY_TEXT_TABLE([tr], [Turkish]) +BRLTTY_TEXT_TABLE([uk], [Ukrainian]) BRLTTY_TEXT_TABLE([vi], [Vietnamese]) BRLTTY_ARG_TABLE([text], [en-nabcc], [ttb]) diff --git a/document.mk b/document.mk index a884feccd58006d01342f59dce122b8b583df797..50b32b809440c40a70541e9e1ab37a9986b79908 100644 --- a/document.mk +++ b/document.mk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/gendeps b/gendeps index bb1244eda252dfd6804731d834d5287cf2e8cbbf..6694e9a12dfa7e83d9cde291d437f7f24b1ec175 100755 --- a/gendeps +++ b/gendeps @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/getrevid b/getrevid index f7d55e2d8a43a94095b394d585e2927dd2b4c3a6..7fbf2cc38530c30b9c0c76a0ce275e693c4b42c5 100755 --- a/getrevid +++ b/getrevid @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mk4build b/mk4build index db90c86a9c5e11a6841894c420fc29c6fa09122b..8d02bef8757bd2093fada8511d2444e098d38975 100755 --- a/mk4build +++ b/mk4build @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mkdocktb b/mkdocktb index c5d85e7b828b2be63bb2374c007906fa8e28ea16..aa194822bcf3e7e2e449b403bf6a4b5ac81d9d15 100755 --- a/mkdocktb +++ b/mkdocktb @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mkdocs b/mkdocs index 03e01b9bf6451085b411f76f26cb646653011c6b..33813e458a865589d108ea95ed2a896846a746ef 100755 --- a/mkdocs +++ b/mkdocs @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mkpot b/mkpot index d6f4ff7b0e1e4cf97c5408dba2f1305d2b5d8379..301c13236279c076a3a738a24c26a3fe5df5d5ed 100755 --- a/mkpot +++ b/mkpot @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mkrpm b/mkrpm index 2b0b9fceb510ccca39ddbf566d8b631bb56e8bd9..b49343052739ecd3cafc0745aad9ce0d0871fd8c 100755 --- a/mkrpm +++ b/mkrpm @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mktar b/mktar index eeeecbbad1db8f08e7aeb0a578e2459c563d6ce9..8486337f8bbf580ef42e3d6e11d398a50df39c20 100755 --- a/mktar +++ b/mktar @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/mkzip b/mkzip index ffcfbd1b68c004736b41169924270b9d324dcd5c..311c35f0cc1b83ac20785182f1d0e0123c3ef0d0 100755 --- a/mkzip +++ b/mkzip @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/prologue.mk b/prologue.mk index 82af5017d9e11f386fefbaa6af3b4cc9e4c97d75..e5bdc0cdb2d945dc49f9e808536d518ce89ff46c 100644 --- a/prologue.mk +++ b/prologue.mk @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/prologue.sh b/prologue.sh index 97dadc17a8387c2d0e647673d78162a34aeaa02d..e8d55576702c55647cf5acca87c7e71777704d69 100644 --- a/prologue.sh +++ b/prologue.sh @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/prologue.tcl b/prologue.tcl index 6f7766aa8a3e4b864d3f845d7d9b1a3529dff685..5972346a8811950f88382a048aa6a7238ad118e7 100644 --- a/prologue.tcl +++ b/prologue.tcl @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/run-brltty b/run-brltty index e03ca60dcd4c017a8dcfa4e2ad6362ff30331eb3..b64ce0364ffceffb9b8f265cd66273d351edaa97 100755 --- a/run-brltty +++ b/run-brltty @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/run-command b/run-command index bd66d7d4f01f29233bff7419243e8e2d78f66bd7..b423afa8aaae1c4f9d9f5bb53dca4440d6f2f2b1 100755 --- a/run-command +++ b/run-command @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/run-xbrlapi b/run-xbrlapi index 8abfa0212db3fca3783cb6d02c1a0ad8d7e5b6a0..8e69e218d888018d4c20bd3695a637e5dd8841fc 100755 --- a/run-xbrlapi +++ b/run-xbrlapi @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # diff --git a/screen.mk b/screen.mk index 0f443c31b55090f0033d5c08309c8f37ceddd239..e246d92de29bfcda9441bc60ee1d3ab28b134ade 100644 --- a/screen.mk +++ b/screen.mk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -23,7 +23,7 @@ SCR_MOD_NAME = $(BLD_TOP)$(DRV_DIR)/$(MOD_NAME)x$(DRIVER_CODE) SCR_MOD_FILE = $(SCR_MOD_NAME).$(MOD_EXT) $(SCR_MOD_FILE): screen.$O $(INSTALL_DIRECTORY) $(@D) - $(MKMOD) $(@) screen.$O $(SCR_OBJS) + $(MKSHR) $(@) screen.$O $(SCR_OBJS) screen-driver: $(SCR_MOD_FILE) install:: diff --git a/speech.mk b/speech.mk index 5fb295946c8701084a81752b7dbbe08eafc8517c..01ed97d923cbc9c3069bb4086d099121c0c0f24f 100644 --- a/speech.mk +++ b/speech.mk @@ -2,14 +2,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ # @@ -23,7 +23,7 @@ SPK_MOD_NAME = $(BLD_TOP)$(DRV_DIR)/$(MOD_NAME)s$(DRIVER_CODE) SPK_MOD_FILE = $(SPK_MOD_NAME).$(MOD_EXT) $(SPK_MOD_FILE): speech.$O $(INSTALL_DIRECTORY) $(@D) - $(MKMOD) $(@) speech.$O $(SPK_OBJS) + $(MKSHR) $(@) speech.$O $(SPK_OBJS) speech-driver: $(SPK_MOD_FILE) install:: diff --git a/updusbdevs b/updusbdevs index c21f3b1e51b09317b957eae7ffdb77bfa66c0251..b44173f5607527f44e5533c5a0a75ddd69ac0237 100755 --- a/updusbdevs +++ b/updusbdevs @@ -3,14 +3,14 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2018 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# 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.com/ #