From: Frank Brehm Date: Tue, 21 Jul 2020 10:03:48 +0000 (+0200) Subject: committing changes in /etc made by "apt-get dist-upgrade -fyq -o Dpkg::Options::... X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=ad003016812744b1e41ae419a52f6f5df18cdf61;p=config%2Fbruni%2Fetc-mint-new1.git committing changes in /etc made by "apt-get dist-upgrade -fyq -o Dpkg::Options::=--force-confnew -o Dpkg::Options::=--force-overwrite" Package changes: -accountsservice 0.6.45-1ubuntu1 amd64 +accountsservice 0.6.55-0ubuntu12~20.04.1 amd64 -adobe-flashplugin 1:20200609.1-0ubuntu0.18.04.1 amd64 +adobe-flashplugin 1:20200609.1-0ubuntu0.20.04.1 amd64 -apache2-bin 2.4.29-1ubuntu4.13 amd64 +apache2-bin 2.4.41-4ubuntu3 amd64 -apparmor-utils 2.12-4ubuntu5.1 amd64 -apport 2.20.9-0ubuntu7.15 all +apparmor-utils 2.13.3-7ubuntu5.1 amd64 +apport 2.20.11-0ubuntu27.4 all -appstream 0.12.0-3ubuntu1 amd64 +appstream 0.12.10-2 amd64 -at 3.1.20-3.1ubuntu2 amd64 +at 3.1.23-1ubuntu1 amd64 -audacity 2.2.1-1 amd64 -audacity-data 2.2.1-1 all +audacity 2.3.3-1build1 amd64 +audacity-data 2.3.3-1build1 all -avahi-utils 0.7-3.1ubuntu1.2 amd64 +avahi-utils 0.7-4ubuntu7 amd64 -base-files 19.3.0 amd64 +base-files 20.0.0 amd64 -bash 4.4.18-2ubuntu1.2 amd64 +bash 5.0-6ubuntu1.1 amd64 -bc 1.07.1-2 amd64 -bind9 1:9.11.3+dfsg-1ubuntu1.12 amd64 +bc 1.07.1-2build1 amd64 +bind9 1:9.16.1-0ubuntu2.2 amd64 +bind9-dnsutils 1:9.16.1-0ubuntu2.2 amd64 -bind9-host 1:9.11.3+dfsg-1ubuntu1.12 amd64 -bind9utils 1:9.11.3+dfsg-1ubuntu1.12 amd64 -binutils 2.30-21ubuntu1~18.04.3 amd64 -binutils-common 2.30-21ubuntu1~18.04.3 amd64 -binutils-x86-64-linux-gnu 2.30-21ubuntu1~18.04.3 amd64 +bind9-host 1:9.16.1-0ubuntu2.2 amd64 +bind9-libs 1:9.16.1-0ubuntu2.2 amd64 +bind9-utils 1:9.16.1-0ubuntu2.2 amd64 +bind9utils 1:9.16.1-0ubuntu2.2 all +binutils 2.34-6ubuntu1 amd64 +binutils-common 2.34-6ubuntu1 amd64 +binutils-x86-64-linux-gnu 2.34-6ubuntu1 amd64 -bluez-obexd 5.48-0ubuntu3.4 amd64 -bluez-tools 0.2.0~20140808-5build1 amd64 -bolt 0.5-0ubuntu0.18.04.1 amd64 -bomber 4:17.12.3-0ubuntu1 amd64 -bovo 4:17.12.3-0ubuntu1 amd64 -brasero-common 3.12.1-4ubuntu2 all +bluez-obexd 5.53-0ubuntu3 amd64 +bluez-tools 2.0~20170911.0.7cb788c-2build1 amd64 +bolt 0.8-4 amd64 +bomber 4:19.12.3-0ubuntu1 amd64 +bovo 4:19.12.3-0ubuntu1 amd64 +brasero-common 3.12.2-6ubuntu1 all -brltty 5.5-4ubuntu2.0.1 amd64 +brltty 6.0+dfsg-4ubuntu6 amd64 -bsdmainutils 11.1.2ubuntu1 amd64 +bsdmainutils 11.1.2ubuntu3 amd64 -build-essential 12.4ubuntu1 amd64 +build-essential 12.8ubuntu1 amd64 -caja 1.22.2-2+tricia amd64 -caja-admin 0.0.1-1 all -caja-common 1.22.2-2+tricia all +caja 1.24.0-linuxmint1 amd64 +caja-admin 0.0.1-3build1 all +caja-common 1.24.0-linuxmint1 all -caja-extensions-common 1.22.1-1+tricia all -caja-open-terminal 1.22.1-1+tricia amd64 +caja-extensions-common 1.24.0-1 all +caja-open-terminal 1.24.0-1 amd64 -caja-sendto 1.22.1-1+tricia amd64 -caja-wallpaper 1.22.1-1+tricia amd64 +caja-sendto 1.24.0-1 amd64 +caja-wallpaper 1.24.0-1 amd64 -casper 1.394.3 amd64 -ccze 0.2.1-4 amd64 -celluloid 0.17-0mint2+tricia amd64 +casper 1.445.1 amd64 +ccze 0.2.1-4build1 amd64 +celluloid 0.19-linuxmint1+ulyana amd64 -cheese 3.28.0-1ubuntu1 amd64 +cheese 3.34.0-1build1 amd64 -chrony 3.2-4ubuntu4.4 amd64 +chrony 3.5-6ubuntu6.1 amd64 -colord 1.3.3-2build1 amd64 +colord 1.4.4-2 amd64 -compiz 1:0.9.13.1+18.04.20180302-0ubuntu1 all +compiz 1:0.9.14.1+20.04.20200211-0ubuntu1 all -compizconfig-settings-manager 1:0.9.13.1+18.04.20180302-0ubuntu1 all +compizconfig-settings-manager 1:0.9.14.1+20.04.20200211-0ubuntu1 all -cpp 4:7.4.0-1ubuntu2.3 amd64 -cpp-7 7.5.0-3ubuntu1~18.04 amd64 +cpp 4:9.3.0-1ubuntu2 amd64 +cpp-7 7.5.0-6ubuntu2 amd64 +cpp-9 9.3.0-10ubuntu2 amd64 -crudini 0.7-1 amd64 +crudini 0.9.3-4 amd64 -cryptsetup-bin 2:2.0.2-1ubuntu1.1 amd64 -cscope 15.8b-3 amd64 +cryptsetup-bin 2:2.2.2-3ubuntu2 amd64 +cscope 15.9-1 amd64 -cuneiform 1.1.0+dfsg-7 amd64 +cuneiform 1.1.0+dfsg-7build1 amd64 -curl 7.58.0-2ubuntu3.9 amd64 -dash 0.5.8-2.10 amd64 +curl 7.68.0-1ubuntu2.1 amd64 +dash 0.5.10.2-6 amd64 -dconf-cli 0.26.0-2ubuntu3 amd64 -dconf-gsettings-backend 0.26.0-2ubuntu3 amd64 -dconf-service 0.26.0-2ubuntu3 amd64 +dconf-cli 0.36.0-1 amd64 +dconf-gsettings-backend 0.36.0-1 amd64 +dconf-service 0.36.0-1 amd64 -debhelper 11.1.6ubuntu2 all +debhelper 12.10ubuntu1 all -desktop-base 8.0.2ubuntu1 all +desktop-base 10.0.3ubuntu1 all -dh-strip-nondeterminism 0.040-1.1~build1 all -dialog 1.3-20171209-1 amd64 +dh-strip-nondeterminism 1.7.0-1 all +dialog 1.3-20190808-1 amd64 -dmeventd 2:1.02.145-4.1ubuntu3.18.04.3 amd64 +dmeventd 2:1.02.167-1ubuntu1 amd64 -dnsmasq-base 2.79-1 amd64 -dnsutils 1:9.11.3+dfsg-1ubuntu1.12 amd64 +dnsmasq-base 2.80-1.1ubuntu1 amd64 +dnsutils 1:9.16.1-0ubuntu2.2 all -docker 1.5-1build1 amd64 +docker 1.5-2 all -enigmail 2:2.1.6+ds1-1~ubuntu0.18.04.1 all +enigmail 2:2.1.6+ds1-1 all -espeak-ng-data 1.49.2+dfsg-1 amd64 +espeak-ng-data 1.50+dfsg-6 amd64 -fdisk 2.31.1-0.4ubuntu3.6 amd64 -ffmpeg 7:3.4.6-0ubuntu0.18.04.1 amd64 -ffmpegthumbnailer 2.1.1-0.1build1 amd64 +fdisk 2.34-0.1ubuntu9 amd64 +ffmpeg 7:4.2.2-1ubuntu1 amd64 +ffmpegthumbnailer 2.1.1-0.2build2 amd64 -file 1:5.32-2ubuntu0.4 amd64 -file-roller 3.28.0-1ubuntu1.2 amd64 +file 1:5.38-4 amd64 +file-roller 3.36.2-0ubuntu1 amd64 -firefox 78.0.2+linuxmint1+tricia amd64 +firefox 78.0.2+linuxmint1+ulyana amd64 -flake8 3.5.0-1 all -flatpak 1.0.9-0ubuntu0.1 amd64 +flake8 3.7.9-2 all +flatpak 1.6.3-1 amd64 -font-manager 0.7.3-1.1 amd64 +font-manager 0.7.7-0.3 amd64 +font-manager-common 0.7.7-0.3 amd64 +font-viewer 0.7.7-0.3 amd64 -fonts-gujr 2:1.2 all +fonts-gujr 2:1.3 all -fonts-noto 20171026-2 all +fonts-noto 20200323-1 all -fonts-noto-hinted 20171026-2 all +fonts-noto-core 20200323-1 all +fonts-noto-hinted 20200323-1 all +fonts-noto-ui-core 20200323-1 all -fonts-roboto-hinted 2:0~20160106-2 all +fonts-quicksand 0.2016-2 all +fonts-roboto-hinted 2:0~20170802-3 all +fonts-roboto-unhinted 2:0~20170802-3 all -fonts-smc 1:7.0 all +fonts-smc 1:7.1 all +fonts-smc-gayathri 1.100-1 all +fonts-urw-base35 20170801.1-3 all +fonts-yrsa-rasa 1.002-2 all -frei0r-plugins 1.6.1-2 amd64 +frei0r-plugins 1.7.0-1build1 amd64 -ftp 0.17-34 amd64 +ftp 0.17-34.1 amd64 -fwupd 1.2.10-1ubuntu2~ubuntu18.04.5 amd64 -fwupd-signed 1.10~ubuntu18.04.4+1.2.10-1ubuntu2~ubuntu18.04.5 amd64 -fwupdate 12-7~ubuntu18.04.3 amd64 -fwupdate-signed 12-7~ubuntu18.04.3 amd64 -g++ 4:7.4.0-1ubuntu2.3 amd64 -g++-7 7.5.0-3ubuntu1~18.04 amd64 +fwupd 1.3.11-1~focal1 amd64 +fwupd-signed 1.27.1ubuntu2+1.3.11-1~focal1 amd64 +fwupdate 12-7 amd64 +g++ 4:9.3.0-1ubuntu2 amd64 +g++-7 7.5.0-6ubuntu2 amd64 +g++-9 9.3.0-10ubuntu2 amd64 -galera-3 25.3.20-1 amd64 -gawk 1:4.1.4+dfsg-1build1 amd64 -gcc 4:7.4.0-1ubuntu2.3 amd64 +galera-3 25.3.29-1 amd64 +gawk 1:5.0.1+dfsg-1 amd64 +gcc 4:9.3.0-1ubuntu2 amd64 -gcc-7 7.5.0-3ubuntu1~18.04 amd64 -gcc-7-base 7.5.0-3ubuntu1~18.04 amd64 -gcc-8-base 8.4.0-1ubuntu1~18.04 amd64 -gcc-8-base 8.4.0-1ubuntu1~18.04 i386 +gcc-7 7.5.0-6ubuntu2 amd64 +gcc-7-base 7.5.0-6ubuntu2 amd64 +gcc-8-base 8.4.0-3ubuntu2 amd64 +gcc-8-base 8.4.0-3ubuntu2 i386 +gcc-9 9.3.0-10ubuntu2 amd64 +gcc-9-base 9.3.0-10ubuntu2 amd64 -gcr 3.28.0-1 amd64 -gdal-data 2.2.3+dfsg-2 all -gdb 8.1-0ubuntu3.2 amd64 -gdbserver 8.1-0ubuntu3.2 amd64 +gcr 3.36.0-2build1 amd64 +gdal-data 3.0.4+dfsg-1build3 all +gdb 9.1-0ubuntu1 amd64 +gdbserver 9.1-0ubuntu1 amd64 -gdisk 1.0.3-1 amd64 +gdisk 1.0.5-1 amd64 -gedit 3.28.1-1ubuntu1.2 amd64 -gedit-common 3.28.1-1ubuntu1.2 all -gedit-plugin-bookmarks 3.28.1-1 amd64 -gedit-plugin-bracket-completion 3.28.1-1 amd64 -gedit-plugin-character-map 3.28.1-1 amd64 -gedit-plugin-code-comment 3.28.1-1 amd64 -gedit-plugin-color-picker 3.28.1-1 amd64 -gedit-plugin-color-schemer 3.28.1-1 amd64 -gedit-plugin-commander 3.28.1-1 amd64 +gedit 3.36.2-0ubuntu1 amd64 +gedit-common 3.36.2-0ubuntu1 all +gedit-plugin-bookmarks 3.36.2-1 amd64 +gedit-plugin-bracket-completion 3.36.2-1 amd64 +gedit-plugin-character-map 3.36.2-1 amd64 +gedit-plugin-code-comment 3.36.2-1 amd64 +gedit-plugin-color-picker 3.36.2-1 amd64 +gedit-plugin-color-schemer 3.36.2-1 amd64 +gedit-plugin-commander 3.36.2-1 amd64 -gedit-plugin-draw-spaces 3.28.1-1 amd64 -gedit-plugin-find-in-files 3.28.1-1 amd64 -gedit-plugin-git 3.28.1-1 amd64 -gedit-plugin-join-lines 3.28.1-1 amd64 -gedit-plugin-multi-edit 3.28.1-1 amd64 -gedit-plugin-smart-spaces 3.28.1-1 amd64 -gedit-plugin-synctex 3.28.1-1 amd64 -gedit-plugin-terminal 3.28.1-1 amd64 -gedit-plugin-translate 3.28.1-1 amd64 -gedit-plugin-word-completion 3.28.1-1 amd64 +gedit-plugin-draw-spaces 3.36.2-1 amd64 +gedit-plugin-find-in-files 3.36.2-1 amd64 +gedit-plugin-git 3.36.2-1 amd64 +gedit-plugin-join-lines 3.36.2-1 amd64 +gedit-plugin-multi-edit 3.36.2-1 amd64 +gedit-plugin-session-saver 3.36.2-1 amd64 +gedit-plugin-smart-spaces 3.36.2-1 amd64 +gedit-plugin-synctex 3.36.2-1 amd64 +gedit-plugin-terminal 3.36.2-1 amd64 +gedit-plugin-translate 3.36.2-1 amd64 +gedit-plugin-word-completion 3.36.2-1 amd64 -gedit-plugins 3.28.1-1 all +gedit-plugins 3.36.2-1 all -genisoimage 9:1.1.11-3ubuntu2 amd64 +genisoimage 9:1.1.11-3.1ubuntu1 amd64 -gettext 0.19.8.1-6ubuntu0.3 amd64 +gettext 0.19.8.1-10build1 amd64 -ghostscript 9.26~dfsg+0-0ubuntu0.18.04.12 amd64 -ghostscript-x 9.26~dfsg+0-0ubuntu0.18.04.12 amd64 +ghostscript 9.50~dfsg-5ubuntu4 amd64 +ghostscript-x 9.50~dfsg-5ubuntu4 amd64 -gir1.2-accountsservice-1.0 0.6.45-1ubuntu1 amd64 +gir1.2-accountsservice-1.0 0.6.55-0ubuntu12~20.04.1 amd64 -gir1.2-appstream-1.0 0.12.0-3ubuntu1 amd64 +gir1.2-appstream-1.0 0.12.10-2 amd64 +gir1.2-appstreamglib-1.0 0.7.16-1ubuntu1 amd64 -gir1.2-caja 1.22.2-2+tricia amd64 -gir1.2-caja-2.0 1.22.2-2+tricia amd64 +gir1.2-caja 1.24.0-linuxmint1 amd64 +gir1.2-caja-2.0 1.24.0-linuxmint1 amd64 +gir1.2-dazzle-1.0 3.36.0-1 amd64 -gir1.2-evince-3.0 3.28.4-0ubuntu1.2 amd64 -gir1.2-flatpak-1.0 1.0.9-0ubuntu0.1 amd64 +gir1.2-evince-3.0 3.36.5-0ubuntu1 amd64 +gir1.2-flatpak-1.0 1.6.3-1 amd64 -gir1.2-gck-1 3.28.0-1 amd64 -gir1.2-gcr-3 3.28.0-1 amd64 +gir1.2-gck-1 3.36.0-2build1 amd64 +gir1.2-gcr-3 3.36.0-2build1 amd64 -gir1.2-gexiv2-0.10 0.10.8-1 amd64 +gir1.2-gexiv2-0.10 0.12.0-2 amd64 -gir1.2-ggit-1.0 0.26.2-1 amd64 +gir1.2-ggit-1.0 0.28.0.1-2 amd64 -gir1.2-gst-plugins-base-1.0 1.14.5-0ubuntu1~18.04.1 amd64 -gir1.2-gstreamer-1.0 1.14.5-0ubuntu1~18.04.1 amd64 +gir1.2-gst-plugins-base-1.0 1.16.2-4 amd64 +gir1.2-gstreamer-1.0 1.16.2-2 amd64 +gir1.2-gtksource-4 4.6.0-1 amd64 -gir1.2-gweather-3.0 3.28.2-1~ubuntu18.04.1 amd64 +gir1.2-gweather-3.0 3.36.0-1 amd64 +gir1.2-handy-0.0 0.0.13-1 amd64 -gir1.2-matedesktop-2.0 1.22.2-1+tricia amd64 +gir1.2-matedesktop-2.0 1.24.0-2 amd64 -gir1.2-nm-1.0 1.10.6-2ubuntu1.4 amd64 -gir1.2-nma-1.0 1.8.10-2ubuntu3mint1 amd64 +gir1.2-nm-1.0 1.22.10-1ubuntu2.1 amd64 +gir1.2-nma-1.0 1.8.24-linuxmint4 amd64 -gir1.2-peas-1.0 1.22.0-2 amd64 +gir1.2-peas-1.0 1.26.0-2 amd64 -gir1.2-rsvg-2.0 2.40.20-2 amd64 +gir1.2-rsvg-2.0 2.48.7-1ubuntu0.20.04.1 amd64 -gir1.2-soup-2.4 2.62.1-1ubuntu0.4 amd64 -gir1.2-spiceclientglib-2.0 0.34-1.1build1 amd64 -gir1.2-spiceclientgtk-3.0 0.34-1.1build1 amd64 +gir1.2-soup-2.4 2.70.0-1 amd64 +gir1.2-spiceclientglib-2.0 0.37-2fakesync1 amd64 +gir1.2-spiceclientgtk-3.0 0.37-2fakesync1 amd64 -gir1.2-vte-2.91 0.52.2-1ubuntu1~18.04.2 amd64 +gir1.2-vte-2.91 0.60.3-0ubuntu1~20.04 amd64 -gnome 1:3.22+9 amd64 +gnome 1:3.30+2 amd64 -gnome-calculator 1:3.28.2-1~ubuntu18.04.3 amd64 -gnome-calendar 3.28.2-0ubuntu0.18.04.1mint1+tessa amd64 +gnome-calculator 1:3.36.0-1ubuntu1 amd64 +gnome-calendar 3.36.1-linuxmint1 amd64 -gnome-clocks 3.28.0-1 amd64 -gnome-color-manager 3.28.0-1 amd64 +gnome-clocks 3.36.0-1ubuntu0.2 amd64 +gnome-color-manager 3.36.0-1 amd64 -gnome-contacts 3.28.1-0ubuntu1 amd64 -gnome-control-center 1:3.28.2-0ubuntu0.18.04.6 amd64 -gnome-control-center-data 1:3.28.2-0ubuntu0.18.04.6 all -gnome-core 1:3.22+9 amd64 +gnome-contacts 3.36.1-1 amd64 +gnome-control-center 1:3.36.3-0ubuntu1 amd64 +gnome-control-center-data 1:3.36.3-0ubuntu1 all +gnome-core 1:3.30+2 amd64 -gnome-font-viewer 3.28.0-1 amd64 +gnome-font-viewer 3.34.0-2 amd64 -gnome-music 3.28.1-1 amd64 +gnome-music 3.36.1-1 amd64 -gnome-screenshot 3.25.0-1linuxmint3 amd64 +gnome-screenshot 3.36.0-linuxmint1 amd64 +gnome-shell-extension-prefs 3.36.3-1ubuntu1~20.04.2 amd64 -gnome-software 3.28.1-0ubuntu4.18.04.15 amd64 -gnome-software-common 3.28.1-0ubuntu4.18.04.15 all +gnome-software 3.36.1-0ubuntu0.20.04.0 amd64 +gnome-software-common 3.36.1-0ubuntu0.20.04.0 all -gnome-system-monitor 3.28.2-0ubuntu1 amd64 -gnome-system-tools 3.0.0-6ubuntu1 amd64 -gnome-terminal 3.28.1-1ubuntu1mint2 amd64 -gnome-terminal-data 3.28.1-1ubuntu1mint2 all +gnome-system-monitor 3.36.0-1 amd64 +gnome-system-tools 3.0.0-9ubuntu1 amd64 +gnome-terminal 3.36.1.1-linuxmint1 amd64 +gnome-terminal-data 3.36.1.1-linuxmint1 all -gnome-todo 3.28.1-1 amd64 +gnome-todo 3.28.1-5 amd64 -gnome-tweaks 3.28.1-1 all +gnome-tweaks 3.34.0-2ubuntu1 all -gnome-user-share 3.18.3-3 amd64 +gnome-user-share 3.34.0-2 amd64 -gnote 3.34.0-0mint2+tricia amd64 -gnugo 3.8-9build1 amd64 +gnote 3.36.0-1 amd64 +gnugo 3.8-9build3 amd64 -granatier 4:17.12.3-0ubuntu1 amd64 +granatier 4:19.12.3-0ubuntu1 amd64 -grilo-plugins-0.3-base 0.3.5-1ubuntu1 amd64 +grilo-plugins-0.3-base 0.3.11-1ubuntu1 amd64 -groff-base 1.22.3-10 amd64 +groff-base 1.22.4-4build1 amd64 -growisofs 7.1-12 amd64 -grub-common 2.02-2ubuntu8.15 amd64 +growisofs 7.1-14build1 amd64 +grub-common 2.04-1ubuntu26 amd64 -grub-pc 2.02-2ubuntu8.15 amd64 -grub-pc-bin 2.02-2ubuntu8.15 amd64 -grub2-common 2.02-2ubuntu8.15 amd64 +grub-pc 2.04-1ubuntu26 amd64 +grub-pc-bin 2.04-1ubuntu26 amd64 +grub2-common 2.04-1ubuntu26 amd64 -gsmartcontrol 1.1.3-1 amd64 -gstreamer1.0-alsa 1.14.5-0ubuntu1~18.04.1 amd64 +gsmartcontrol 1.1.3-2build1 amd64 +gstreamer1.0-alsa 1.16.2-4 amd64 -gstreamer1.0-gl 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-libav 1.14.5-0ubuntu1~18.04.1 amd64 +gstreamer1.0-gl 1.16.2-4 amd64 +gstreamer1.0-libav 1.16.2-2 amd64 -gstreamer1.0-plugins-bad 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-plugins-base 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-plugins-base-apps 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-plugins-good 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-plugins-ugly 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-pulseaudio 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-tools 1.14.5-0ubuntu1~18.04.1 amd64 -gstreamer1.0-vaapi 1.14.5-0ubuntu1~ubuntu18.04.1 amd64 -gstreamer1.0-x 1.14.5-0ubuntu1~18.04.1 amd64 -gtk-doc-tools 1.27-3 all -gtk-update-icon-cache 3.22.30-1ubuntu4 amd64 +gstreamer1.0-plugins-bad 1.16.2-2.1ubuntu1 amd64 +gstreamer1.0-plugins-base 1.16.2-4 amd64 +gstreamer1.0-plugins-base-apps 1.16.2-4 amd64 +gstreamer1.0-plugins-good 1.16.2-1ubuntu2 amd64 +gstreamer1.0-plugins-ugly 1.16.2-2build1 amd64 +gstreamer1.0-pulseaudio 1.16.2-1ubuntu2 amd64 +gstreamer1.0-tools 1.16.2-2 amd64 +gstreamer1.0-vaapi 1.16.2-2 amd64 +gstreamer1.0-x 1.16.2-4 amd64 +gtk-doc-tools 1.32-4 all +gtk-update-icon-cache 3.24.20-0ubuntu1 amd64 -gtk2-engines-murrine 0.98.2-2ubuntu1 amd64 +gtk2-engines-murrine 0.98.2-3 amd64 -guile-2.0-libs 2.0.13+1-5ubuntu0.1 amd64 -gvfs 1.36.1-0ubuntu1.3.3 amd64 -gvfs-backends 1.36.1-0ubuntu1.3.3 amd64 -gvfs-bin 1.36.1-0ubuntu1.3.3 amd64 -gvfs-common 1.36.1-0ubuntu1.3.3 all -gvfs-daemons 1.36.1-0ubuntu1.3.3 amd64 -gvfs-fuse 1.36.1-0ubuntu1.3.3 amd64 -gvfs-libs 1.36.1-0ubuntu1.3.3 amd64 +guile-2.0-libs 2.0.13+1-5.4 amd64 +guile-2.2-libs 2.2.7+1-4 amd64 +gvfs 1.44.1-1ubuntu1 amd64 +gvfs-backends 1.44.1-1ubuntu1 amd64 +gvfs-bin 1.44.1-1ubuntu1 amd64 +gvfs-common 1.44.1-1ubuntu1 all +gvfs-daemons 1.44.1-1ubuntu1 amd64 +gvfs-fuse 1.44.1-1ubuntu1 amd64 +gvfs-libs 1.44.1-1ubuntu1 amd64 -handbrake 1.1.0+ds1-1ubuntu1 amd64 -handbrake-cli 1.1.0+ds1-1ubuntu1 amd64 +handbrake 1.3.1+ds1-1build1 amd64 +handbrake-cli 1.3.1+ds1-1build1 amd64 -hexchat 2.14.1-2 amd64 -hexchat-common 2.14.1-2 all +hexchat 2.14.3-3 amd64 +hexchat-common 2.14.3-3 all -highlight 3.41-1 amd64 -highlight-common 3.41-1 all +highlight 3.41-2build3 amd64 +highlight-common 3.41-2build3 all -hpijs-ppds 3.17.10+repack0-5 all +hpijs-ppds 3.20.3+dfsg0-2 all -hplip-gui 3.17.10+repack0-5 all -htop 2.1.0-3 amd64 +hplip-gui 3.20.3+dfsg0-2 all +htop 2.2.0-2build1 amd64 -i965-va-driver 2.1.0-0ubuntu1 amd64 -icedtea-8-plugin 1.8-0ubuntu8~18.04 amd64 -icedtea-netx 1.8-0ubuntu8~18.04 amd64 -icedtea-plugin 1.8-0ubuntu8~18.04 all +i965-va-driver 2.4.0-0ubuntu1 amd64 +icedtea-netx 1.8-0ubuntu8 amd64 -ideviceinstaller 1.1.0-0ubuntu3 amd64 +ideviceinstaller 1.1.0-0ubuntu4 amd64 -imagemagick-6.q16 8:6.9.7.4+dfsg-16ubuntu6.8 amd64 +imagemagick-6.q16 8:6.9.10.23+dfsg-2.1ubuntu11 amd64 -info 6.5.0.dfsg.1-2 amd64 +info 6.7.0.dfsg.2-5 amd64 -inkscape 0.92.3-1 amd64 +inkscape 0.92.5-1ubuntu1.1 amd64 +intel-media-va-driver 20.1.1+dfsg1-1 amd64 -ipython3 5.5.0-1 all -irqbalance 1.3.0-0.1ubuntu0.18.04.1 amd64 -isc-dhcp-client 4.3.5-3ubuntu7.1 amd64 +ipython3 7.13.0-1 all +irqbalance 1.6.0-3ubuntu1 amd64 +isc-dhcp-client 4.4.1-2.1ubuntu5 amd64 -jhead 1:3.00-8~build0.18.04.1 amd64 -jq 1.5+dfsg-2 amd64 +jhead 1:3.04-1 amd64 +jq 1.6-1 amd64 -kapman 4:17.12.3-0ubuntu1 amd64 -katomic 4:17.12.3-0ubuntu1 amd64 +kapman 4:19.12.3-0ubuntu1 amd64 +katomic 4:19.12.3-0ubuntu1 amd64 -kblackbox 4:17.12.3-0ubuntu1 amd64 -kblocks 4:17.12.3-0ubuntu1 amd64 -kbounce 4:17.12.3-0ubuntu1 amd64 -kbreakout 4:17.12.3-0ubuntu1 amd64 -kde-l10n-de 4:17.08.3-0ubuntu4 all -kde-l10n-engb 4:17.08.3-0ubuntu4 all -kde-l10n-eo 4:17.08.3-0ubuntu4 all -kde-l10n-es 4:17.08.3-0ubuntu4 all -kde-l10n-fr 4:17.08.3-0ubuntu4 all -kde-l10n-pl 4:17.08.3-0ubuntu4 all -kde-l10n-ru 4:17.08.3-0ubuntu4 all -kde-l10n-uk 4:17.08.3-0ubuntu4 all +kblackbox 4:19.12.3-0ubuntu1 amd64 +kblocks 4:19.12.3-0ubuntu1 amd64 +kbounce 4:19.12.3-0ubuntu1 amd64 +kbreakout 4:19.12.3-0ubuntu1 amd64 -kde-style-breeze 4:5.12.8-0ubuntu0.1 amd64 +kde-style-breeze 4:5.18.4.1-0ubuntu1 amd64 -kdiamond 4:17.12.3-0ubuntu1 amd64 +kdiamond 4:19.12.3-0ubuntu1 amd64 -keepassxc 2.3.1+dfsg.1-1 amd64 +keepassxc 2.4.3+dfsg.1-1build1 amd64 -kfourinline 4:17.12.3-0ubuntu1 amd64 -kgoldrunner 4:17.12.3-0ubuntu2 amd64 -khangman 4:17.12.3-0ubuntu1 amd64 -kigo 4:17.12.3-0ubuntu2 amd64 -killbots 4:17.12.3-0ubuntu1 amd64 -kinit 5.44.0-0ubuntu1 amd64 -kio 5.44.0-0ubuntu1 amd64 -kiriki 4:17.12.3-0ubuntu1 amd64 -kjumpingcube 4:17.12.3-0ubuntu1 amd64 +kfourinline 4:19.12.3-0ubuntu1 amd64 +kgoldrunner 4:19.12.3-0ubuntu1 amd64 +khangman 4:19.12.3-0ubuntu1 amd64 +kigo 4:19.12.3-0ubuntu1 amd64 +killbots 4:19.12.3-0ubuntu1 amd64 +kinit 5.68.0-0ubuntu1 amd64 +kio 5.68.0-0ubuntu1 amd64 +kiriki 4:19.12.3-0ubuntu1 amd64 +kjumpingcube 4:19.12.3-0ubuntu1 amd64 -klickety 4:17.12.3-0ubuntu1 amd64 -klines 4:17.12.3-0ubuntu1 amd64 -kmahjongg 4:17.12.3-0ubuntu1 amd64 -kmines 4:17.12.3-0ubuntu1 amd64 +klickety 4:19.12.3-0ubuntu1 amd64 +klines 4:19.12.3-0ubuntu1 amd64 +kmahjongg 4:19.12.3-0ubuntu1 amd64 +kmines 4:19.12.3-0ubuntu1 amd64 -knavalbattle 4:17.12.3-0ubuntu1 amd64 +knavalbattle 4:19.12.3-0ubuntu1 amd64 -kolf 4:17.12.3-0ubuntu1 amd64 -kollision 4:17.12.3-0ubuntu1 amd64 -konquest 4:17.12.3-0ubuntu2 amd64 -kpackagetool5 5.44.0-0ubuntu1 amd64 +kolf 4:19.12.3-0ubuntu1 amd64 +kollision 4:19.12.3-0ubuntu1 amd64 +konquest 4:19.12.3-0ubuntu1 amd64 +kpackagetool5 5.68.0-0ubuntu1 amd64 -kpat 4:17.12.3-0ubuntu1 amd64 +kpat 4:19.12.3-0ubuntu1 amd64 -kreversi 4:17.12.3-0ubuntu2 amd64 -kshisen 4:17.12.3-0ubuntu1 amd64 -ksirk 4:17.12.3-0ubuntu1 amd64 -ksnakeduel 4:17.12.3-0ubuntu2 amd64 -kspaceduel 4:17.12.3-0ubuntu2 amd64 -ksquares 4:17.12.3-0ubuntu1 amd64 -ksudoku 4:17.12.3-0ubuntu2 amd64 -ktuberling 4:17.12.3-0ubuntu1 amd64 -kubrick 4:17.12.3-0ubuntu2 amd64 -kwayland-data 4:5.44.0-0ubuntu1 all +kreversi 4:19.12.3-0ubuntu1 amd64 +kshisen 4:19.12.3-0ubuntu1 amd64 +ksirk 4:19.12.3-0ubuntu1 amd64 +ksnakeduel 4:19.12.3-0ubuntu1 amd64 +kspaceduel 4:19.12.3-0ubuntu1 amd64 +ksquares 4:19.12.3-0ubuntu1 amd64 +ksudoku 4:19.12.3-0ubuntu1 amd64 +ktuberling 4:19.12.3-0ubuntu1 amd64 +kubrick 4:19.12.3-0ubuntu1 amd64 +kwayland-data 4:5.68.0-0ubuntu1 all -ldmtool 0.2.3-7 amd64 -less 487-0.1 amd64 -lftp 4.8.1-1ubuntu0.1 amd64 +ldmtool 0.2.4-3 amd64 +less 551-1ubuntu0.1 amd64 +lftp 4.8.4-2build3 amd64 -libaa1 1.4p5-44build2 amd64 +libaa1 1.4p5-46 amd64 -libabw-0.1-1 0.1.2-1ubuntu1 amd64 -libaccountsservice0 0.6.45-1ubuntu1 amd64 +libabw-0.1-1 0.1.3-1build1 amd64 +libaccountsservice0 0.6.55-0ubuntu12~20.04.1 amd64 +libamtk-5-0 5.0.2-1build1 amd64 +libamtk-5-common 5.0.2-1build1 all -libappindicator0.1-cil 12.10.1+18.04.20180322.1-1mint2 all +libappindicator0.1-cil 12.10.1+20.04.20200408.1-0ubuntu1 all -libappstream-glib8 0.7.7-2 amd64 -libappstream4 0.12.0-3ubuntu1 amd64 +libappstream-glib8 0.7.16-1ubuntu1 amd64 +libappstream4 0.12.10-2 amd64 -libaprutil1 1.6.1-2 amd64 -libaprutil1-dbd-sqlite3 1.6.1-2 amd64 -libaprutil1-ldap 1.6.1-2 amd64 +libaprutil1 1.6.1-4ubuntu2 amd64 +libaprutil1-dbd-sqlite3 1.6.1-4ubuntu2 amd64 +libaprutil1-ldap 1.6.1-4ubuntu2 amd64 -libargon2-0 0~20161029-1.1 amd64 +libargon2-0 0~20171227-0.2 amd64 +libargon2-1 0~20171227-0.2 amd64 -libarpack2 3.5.0+real-2 amd64 +libarpack2 3.7.0-3 amd64 +libarray-intspan-perl 2.003-1 all -libasan4 7.5.0-3ubuntu1~18.04 amd64 +libasan4 7.5.0-6ubuntu2 amd64 +libasan5 9.3.0-10ubuntu2 amd64 -libasound2-plugins 1.1.1-1ubuntu1 amd64 +libasound2-plugins 1.2.2-1ubuntu1 amd64 -libatkmm-1.6-1v5 2.24.2-3 amd64 +libatkmm-1.6-1v5 2.28.0-2build1 amd64 -libatomic1 8.4.0-1ubuntu1~18.04 amd64 -libatomic1 8.4.0-1ubuntu1~18.04 i386 +libatomic1 10-20200411-0ubuntu1 amd64 +libatomic1 10-20200411-0ubuntu1 i386 -libaudio2 1.9.4-6 amd64 +libaudio2 1.9.4-6build1 amd64 -libavahi-ui-gtk3-0 0.7-3.1ubuntu1.2 amd64 +libavahi-ui-gtk3-0 0.7-4ubuntu7 amd64 -libavcodec-extra 7:3.4.6-0ubuntu0.18.04.1 all +libavcodec-extra 7:4.2.2-1ubuntu1 amd64 +libavdevice58 7:4.2.2-1ubuntu1 amd64 +libavfilter7 7:4.2.2-1ubuntu1 amd64 +libavresample4 7:4.2.2-1ubuntu1 amd64 -libbasicusageenvironment1 2018.02.18-1 amd64 +libbasicusageenvironment1 2020.01.19-1build1 amd64 -libbinutils 2.30-21ubuntu1~18.04.3 amd64 +libbinutils 2.34-6ubuntu1 amd64 -libblockdev-crypto2 2.16-2 amd64 +libblockdev-crypto2 2.23-2ubuntu3 amd64 -libblockdev-part2 2.16-2 amd64 +libblockdev-part2 2.23-2ubuntu3 amd64 -libbrasero-media3-1 3.12.1-4ubuntu2 amd64 +libbrasero-media3-1 3.12.2-6ubuntu1 amd64 -libbs2b0 3.1.0+dfsg-2.2 amd64 +libbs2b0 3.1.0+dfsg-2.2build1 amd64 -libcaca0 0.99.beta19-2ubuntu0.18.04.1 amd64 +libcaca0 0.99.beta19-2.1ubuntu1 amd64 -libcairomm-1.0-1v5 1.12.2-3 amd64 -libcaja-extension1 1.22.2-2+tricia amd64 +libcairomm-1.0-1v5 1.12.2-4build1 amd64 +libcaja-extension1 1.24.0-linuxmint1 amd64 +libcapture-tiny-perl 0.48-1 all -libcc1-0 8.4.0-1ubuntu1~18.04 amd64 +libcc1-0 10-20200411-0ubuntu1 amd64 -libcdio-cdda2 10.2+0.94+2-2build1 amd64 -libcdio-paranoia2 10.2+0.94+2-2build1 amd64 +libcdio-cdda2 10.2+2.0.0-1 amd64 +libcdio-paranoia2 10.2+2.0.0-1 amd64 +libcdio18 2.0.0-2 amd64 -libcdr-0.1-1 0.1.4-1build1 amd64 -libcephfs2 12.2.13-0ubuntu0.18.04.2 amd64 +libcdr-0.1-1 0.1.6-1build2 amd64 +libcephfs2 15.2.3-0ubuntu0.20.04.1 amd64 -libchamplain-0.12-0 0.12.16-2 amd64 +libchamplain-0.12-0 0.12.20-1 amd64 -libcilkrts5 7.5.0-3ubuntu1~18.04 amd64 -libcinnamon-desktop4 4.4.1+tricia amd64 +libcilkrts5 7.5.0-6ubuntu2 amd64 +libcinnamon-desktop4 4.6.3+ulyana amd64 -libclucene-contribs1v5 2.3.3.4+dfsg-1 amd64 -libclucene-core1v5 2.3.3.4+dfsg-1 amd64 -libclutter-1.0-0 1.26.2+dfsg-4 amd64 +libclucene-contribs1v5 2.3.3.4+dfsg-1build1 amd64 +libclucene-core1v5 2.3.3.4+dfsg-1build1 amd64 +libclutter-1.0-0 1.26.4+dfsg-1 amd64 -libcmis-0.5-5v5 0.5.1+git20160603-3build2 amd64 +libcmis-0.5-5v5 0.5.2-1ubuntu1 amd64 -libcolord-gtk1 0.1.26-2 amd64 +libcolord-gtk1 0.2.0-0ubuntu1 amd64 -libcolorhug2 1.3.3-2build1 amd64 +libcolorhug2 1.4.4-2 amd64 +libcpanel-json-xs-perl 4.19-1build1 amd64 -libcryptsetup12 2:2.0.2-1ubuntu1.1 amd64 +libcryptsetup12 2:2.2.2-3ubuntu2 amd64 +libctf-nobfd0 2.34-6ubuntu1 amd64 +libctf0 2.34-6ubuntu1 amd64 -libcuneiform0 1.1.0+dfsg-7 amd64 +libcuneiform0 1.1.0+dfsg-7build1 amd64 -libcurl4 7.58.0-2ubuntu3.9 amd64 +libcurl4 7.68.0-1ubuntu2.1 amd64 -libdap25 3.19.1-2build1 amd64 -libdapclient6v5 3.19.1-2build1 amd64 +libdap25 3.20.5-1 amd64 +libdapclient6v5 3.20.5-1 amd64 -libdazzle-1.0-0 3.28.1-1 amd64 +libdazzle-1.0-0 3.36.0-1 amd64 -libdbusmenu-qt5-2 0.9.3+16.04.20160218-1ubuntu1 amd64 -libdc1394-22 2.2.5-1 amd64 +libdbusmenu-qt5-2 0.9.3+16.04.20160218-2build1 amd64 +libdc1394-22 2.2.5-2.1 amd64 -libdconf1 0.26.0-2ubuntu3 amd64 -libde265-0 1.0.2-2build1 amd64 +libdconf1 0.36.0-1 amd64 +libde265-0 1.0.4-1build1 amd64 +libdebhelper-perl 12.10ubuntu1 all -libdee-1.0-4 1.2.7+17.10.20170616-0ubuntu4 amd64 +libdee-1.0-4 1.2.7+17.10.20170616-4ubuntu6 amd64 +libdevel-size-perl 0.83-1build1 amd64 -libdevmapper1.02.1 2:1.02.145-4.1ubuntu3.18.04.3 amd64 +libdevmapper1.02.1 2:1.02.167-1ubuntu1 amd64 -libdirectfb-1.7-7 1.7.7-8 amd64 +libdirectfb-1.7-7 1.7.7-9build1 amd64 -libdjvulibre21 3.5.27.1-8ubuntu0.2 amd64 +libdjvulibre21 3.5.27.1-14build1 amd64 +libdns-export1109 1:9.11.16+dfsg-3~build1 amd64 -libdrm-amdgpu1 2.4.101-2~18.04.1 amd64 -libdrm-amdgpu1 2.4.101-2~18.04.1 i386 +libdrm-amdgpu1 2.4.101-2 amd64 +libdrm-amdgpu1 2.4.101-2 i386 -libdvdnav4 6.0.0-1 amd64 +libdvdnav4 6.0.1-1build1 amd64 +libdvdread7 6.1.0+really6.0.2-1 amd64 -libe-book-0.1-1 0.1.3-1 amd64 +libe-book-0.1-1 0.1.3-1build3 amd64 -libebml4v5 1.3.5-2ubuntu0.1 amd64 +libebml4v5 1.3.10-1build1 amd64 -libedit2 3.1-20170329-1 amd64 -libedit2 3.1-20170329-1 i386 +libedit2 3.1-20191231-1 amd64 +libedit2 3.1-20191231-1 i386 -libenchant1c2a 1.6.0-11.1 amd64 +libenchant1c2a 1.6.0-11.3build1 amd64 -libepubgen-0.1-1 0.1.0-2ubuntu1 amd64 +libepubgen-0.1-1 0.1.1-1ubuntu2 amd64 -libespeak-ng1 1.49.2+dfsg-1 amd64 +libespeak-ng1 1.50+dfsg-6 amd64 -libetonyek-0.1-1 0.1.7-3 amd64 +libetonyek-0.1-1 0.1.9-3 amd64 -libexif12 0.6.21-4ubuntu0.5 amd64 +libexif12 0.6.21-6ubuntu0.3 amd64 +libexiv2-27 0.27.2-8ubuntu2 amd64 -libfaad2 2.8.8-1 amd64 +libfaad2 2.9.1-1 amd64 -libfam0 2.7.0-17.2 amd64 +libfam0 2.7.0-17.3build2 amd64 -libffmpegthumbnailer4v5 2.1.1-0.1build1 amd64 -libfftw3-double3 3.3.7-1 amd64 +libffmpegthumbnailer4v5 2.1.1-0.2build2 amd64 +libfftw3-double3 3.3.8-2ubuntu1 amd64 +libfile-find-rule-perl 0.34-1 all -libfile-stripnondeterminism-perl 0.040-1.1~build1 all +libfile-stripnondeterminism-perl 1.7.0-1 all -libflac++6v5 1.3.2-1 amd64 -libflac8 1.3.2-1 amd64 -libflatpak0 1.0.9-0ubuntu0.1 amd64 +libfl2 2.6.4-6.2 amd64 +libflac++6v5 1.3.3-1build1 amd64 +libflac8 1.3.3-1build1 amd64 +libflatpak0 1.6.3-1 amd64 -libfltk1.1 1.1.10-23 amd64 +libfltk1.1 1.1.10-26ubuntu2 amd64 +libfluidsynth2 2.1.1-2 amd64 +libfont-ttf-perl 1.06-1 all -libfreehand-0.1-1 0.1.2-2 amd64 -libfreeimage3 3.17.0+ds1-5build2 amd64 -libfreerdp2-2 2.1.1+dfsg1-0ubuntu0.18.04.1 amd64 +libfreecell-solver0 5.0.0-2 amd64 +libfreehand-0.1-1 0.1.2-2ubuntu1 amd64 +libfreeimage3 3.18.0+ds2-1ubuntu3 amd64 +libfreerdp2-2 2.1.1+dfsg1-0ubuntu0.20.04.1 amd64 -libfwup1 12-3bionic2 amd64 +libfuture-perl 0.43-1 all -libfyba0 4.1.1-3 amd64 +libfwupdplugin1 1.3.11-1~focal1 amd64 +libfyba0 4.1.1-6build1 amd64 -libgail-common 2.24.32-1ubuntu1 amd64 -libgail18 2.24.32-1ubuntu1 amd64 +libgail-common 2.24.32-4ubuntu4 amd64 +libgail18 2.24.32-4ubuntu4 amd64 -libgc1c2 1:7.4.2-8ubuntu1 amd64 -libgcab-1.0-0 1.1-2 amd64 -libgcc-7-dev 7.5.0-3ubuntu1~18.04 amd64 +libgc1c2 1:7.6.4-0.4ubuntu1 amd64 +libgcab-1.0-0 1.4-1 amd64 +libgcc-7-dev 7.5.0-6ubuntu2 amd64 +libgcc-9-dev 9.3.0-10ubuntu2 amd64 -libgck-1-0 3.28.0-1 amd64 +libgck-1-0 3.36.0-2build1 amd64 -libgcr-base-3-1 3.28.0-1 amd64 -libgcr-ui-3-1 3.28.0-1 amd64 +libgcr-base-3-1 3.36.0-2build1 amd64 +libgcr-ui-3-1 3.36.0-2build1 amd64 -libgd3 2.2.5-4ubuntu0.4 amd64 -libgdal20 2.2.3+dfsg-2 amd64 +libgd3 2.2.5-5.2ubuntu2 amd64 -libgdiplus 4.2-2 amd64 +libgdiplus 6.0.4+dfsg-2 amd64 -libgeos-c1v5 3.6.2-1build2 amd64 +libgeos-3.8.0 3.8.0-1build1 amd64 +libgeos-c1v5 3.8.0-1build1 amd64 -libgexiv2-2 0.10.8-1 amd64 +libgexiv2-2 0.12.0-2 amd64 -libgfortran4 7.5.0-3ubuntu1~18.04 amd64 +libgfortran4 7.5.0-6ubuntu2 amd64 +libgfortran5 10-20200411-0ubuntu1 amd64 -libgit2-glib-1.0-0 0.26.2-1 amd64 +libgit2-28 0.28.4+dfsg.1-2 amd64 +libgit2-glib-1.0-0 0.28.0.1-2 amd64 -libglib2.0-cil 2.12.40-2 amd64 +libglib2.0-cil 2.12.40-3 amd64 -libglibmm-2.4-1v5 2.56.0-1 amd64 -libglu1-mesa 9.0.0-2.1build1 amd64 +libglibmm-2.4-1v5 2.64.2-1 amd64 +libglu1-mesa 9.0.1-1build1 amd64 -libgnome-bluetooth13 3.28.0-2ubuntu0.2 amd64 +libgnome-bluetooth13 3.34.1-1 amd64 -libgnome-todo 3.28.1-1 amd64 +libgnome-todo 3.28.1-5 amd64 -libgphoto2-6 2.5.16-2 amd64 +libgphoto2-6 2.5.25-0ubuntu0.1 amd64 -libgraphicsmagick++-q16-12 1.3.28-2ubuntu0.1 amd64 -libgraphicsmagick-q16-3 1.3.28-2ubuntu0.1 amd64 +libgraphicsmagick++-q16-12 1.4+really1.3.35-1 amd64 +libgraphicsmagick-q16-3 1.4+really1.3.35-1 amd64 -libgroupsock8 2018.02.18-1 amd64 -libgs9 9.26~dfsg+0-0ubuntu0.18.04.12 amd64 -libgs9-common 9.26~dfsg+0-0ubuntu0.18.04.12 all +libgroupsock8 2020.01.19-1build1 amd64 +libgs9 9.50~dfsg-5ubuntu4 amd64 +libgs9-common 9.50~dfsg-5ubuntu4 all -libgstreamer-gl1.0-0 1.14.5-0ubuntu1~18.04.1 amd64 -libgstreamer-plugins-bad1.0-0 1.14.5-0ubuntu1~18.04.1 amd64 -libgstreamer-plugins-base1.0-0 1.14.5-0ubuntu1~18.04.1 amd64 -libgstreamer-plugins-good1.0-0 1.14.5-0ubuntu1~18.04.1 amd64 -libgstreamer1.0-0 1.14.5-0ubuntu1~18.04.1 amd64 +libgssdp-1.2-0 1.2.2-1 amd64 +libgstreamer-gl1.0-0 1.16.2-4 amd64 +libgstreamer-plugins-bad1.0-0 1.16.2-2.1ubuntu1 amd64 +libgstreamer-plugins-base1.0-0 1.16.2-4 amd64 +libgstreamer-plugins-good1.0-0 1.16.2-1ubuntu2 amd64 +libgstreamer1.0-0 1.16.2-2 amd64 -libgtk-3-bin 3.22.30-1ubuntu4 amd64 +libgtk-3-bin 3.24.20-0ubuntu1 amd64 +libgtk-layer-shell0 0.1.0-3 amd64 -libgtk2.0-0 2.24.32-1ubuntu1 amd64 -libgtk2.0-bin 2.24.32-1ubuntu1 amd64 -libgtk2.0-cil 2.12.40-2 amd64 +libgtk2.0-0 2.24.32-4ubuntu4 amd64 +libgtk2.0-bin 2.24.32-4ubuntu4 amd64 +libgtk2.0-cil 2.12.40-3 amd64 -libgtkmm-2.4-1v5 1:2.24.5-2 amd64 -libgtkmm-3.0-1v5 3.22.2-2 amd64 +libgtkmm-2.4-1v5 1:2.24.5-4ubuntu2 amd64 +libgtkmm-3.0-1v5 3.24.2-1build1 amd64 -libgtkspell0 2.0.16-1.2 amd64 -libgtkspell3-3-0 3.0.9-2 amd64 +libgtksourceview-4-0 4.6.0-1 amd64 +libgtksourceview-4-common 4.6.0-1 all +libgtkspell0 2.0.16-1.3 amd64 +libgtkspell3-3-0 3.0.10-1 amd64 +libgupnp-1.2-0 1.2.2-1 amd64 -libgupnp-igd-1.0-4 0.2.5-1 amd64 +libgupnp-igd-1.0-4 0.2.5-5 amd64 -libgvnc-1.0-0 0.7.2-1 amd64 +libgvnc-1.0-0 1.0.0-1build1 amd64 -libharfbuzz-icu0 1.7.2-1ubuntu1 amd64 +libhandy-0.0-0 0.0.13-1 amd64 +libharfbuzz-icu0 2.6.4-1ubuntu4 amd64 +libhash-fieldhash-perl 0.15-1build2 amd64 -libhttp-date-perl 6.02-1 all -libhttp-message-perl 6.14-1 all +libhttp-date-perl 6.05-1 all +libhttp-message-perl 6.22-1 all +libhttp-parser2.9 2.9.2-2 amd64 -libido3-0.1-0 13.10.0+17.04.20161028-0ubuntu1 amd64 +libido3-0.1-0 13.10.0+17.04.20161028-0ubuntu2 amd64 +libigdgmm11 20.1.1+ds1-1 amd64 -libimobiledevice-utils 1.2.1~git20171128.5a854327+dfsg-0.1 amd64 -libimobiledevice6 1.2.1~git20171128.5a854327+dfsg-0.1 amd64 +libimobiledevice-utils 1.2.1~git20191129.9f79242-1build1 amd64 +libimobiledevice6 1.2.1~git20191129.9f79242-1build1 amd64 +libinstpatch-1.0-2 1.1.2-2build1 amd64 +libio-async-loop-epoll-perl 0.20-1 all +libio-async-perl 0.75-1 all -libio-socket-ssl-perl 2.060-3~ubuntu18.04.1 all +libio-socket-ssl-perl 2.067-1 all -libiptc0 1.6.1-2ubuntu2 amd64 +libiptc0 1.8.4-3ubuntu2 amd64 +libisc-export1105 1:9.11.16+dfsg-3~build1 amd64 -libisofs6 1.4.8-1 amd64 -libitm1 8.4.0-1ubuntu1~18.04 amd64 +libisl22 0.22.1-1 amd64 +libisofs6 1.5.2-1 amd64 +libitm1 10-20200411-0ubuntu1 amd64 -libjack-jackd2-0 1.9.12~dfsg-2 amd64 +libixml10 1:1.8.4-2ubuntu2 amd64 +libjack-jackd2-0 1.9.12~dfsg-2ubuntu2 amd64 -libjavascriptcoregtk-4.0-18 2.28.3-0ubuntu0.18.04.1 amd64 +libjavascriptcoregtk-4.0-18 2.28.3-0ubuntu0.20.04.1 amd64 -libjq1 1.5+dfsg-2 amd64 +libjq1 1.6-1 amd64 +libjson-maybexs-perl 1.004000-1 all +libjte2 1.22-3build1 amd64 -libkeduvocdocument-data 4:17.12.3-0ubuntu1 all -libkeduvocdocument5abi1 4:17.12.3-0ubuntu1 amd64 +libkeduvocdocument-data 4:19.12.3-0ubuntu1 all +libkeduvocdocument5abi1 4:19.12.3-0ubuntu1 amd64 -libkf5archive5 5.44.0-0ubuntu1 amd64 -libkf5attica5 5.44.0-0ubuntu1 amd64 +libkf5archive5 5.68.0-0ubuntu1 amd64 +libkf5attica5 5.68.0-0ubuntu1 amd64 -libkf5bookmarks-data 5.44.0-0ubuntu1 all -libkf5bookmarks5 5.44.0-0ubuntu1 amd64 -libkf5codecs-data 5.44.0-0ubuntu1 all -libkf5codecs5 5.44.0-0ubuntu1 amd64 -libkf5completion-data 5.44.0-0ubuntu1 all -libkf5completion5 5.44.0-0ubuntu1 amd64 -libkf5config-data 5.44.0-0ubuntu1.1 all -libkf5configcore5 5.44.0-0ubuntu1.1 amd64 -libkf5configgui5 5.44.0-0ubuntu1.1 amd64 +libkf5bookmarks-data 5.68.0-0ubuntu1 all +libkf5bookmarks5 5.68.0-0ubuntu1 amd64 +libkf5codecs-data 5.68.0-0ubuntu1 all +libkf5codecs5 5.68.0-0ubuntu1 amd64 +libkf5completion-data 5.68.0-0ubuntu1 all +libkf5completion5 5.68.0-0ubuntu1 amd64 +libkf5config-data 5.68.0-0ubuntu1 all +libkf5configcore5 5.68.0-0ubuntu1 amd64 +libkf5configgui5 5.68.0-0ubuntu1 amd64 -libkf5coreaddons-data 5.44.0a-0ubuntu1 all -libkf5coreaddons5 5.44.0a-0ubuntu1 amd64 -libkf5crash5 5.44.0-0ubuntu1 amd64 -libkf5dbusaddons-data 5.44.0-0ubuntu1 all -libkf5dbusaddons5 5.44.0-0ubuntu1 amd64 +libkf5coreaddons-data 5.68.0-0ubuntu1 all +libkf5coreaddons5 5.68.0-0ubuntu1 amd64 +libkf5crash5 5.68.0-0ubuntu1 amd64 +libkf5dbusaddons-data 5.68.0-0ubuntu1 all +libkf5dbusaddons5 5.68.0-0ubuntu1 amd64 -libkf5dnssd-data 5.44.0-0ubuntu1 all -libkf5dnssd5 5.44.0-0ubuntu1 amd64 -libkf5doctools5 5.44.0-0ubuntu1 amd64 -libkf5globalaccel-data 5.44.0-0ubuntu1 all -libkf5globalaccel5 5.44.0-0ubuntu1 amd64 -libkf5guiaddons5 5.44.0-0ubuntu1 amd64 -libkf5i18n-data 5.44.0-0ubuntu1 all -libkf5i18n5 5.44.0-0ubuntu1 amd64 -libkf5iconthemes-data 5.44.0-0ubuntu1 all -libkf5iconthemes5 5.44.0-0ubuntu1 amd64 -libkf5itemviews-data 5.44.0-0ubuntu1 all -libkf5itemviews5 5.44.0-0ubuntu1 amd64 -libkf5jobwidgets-data 5.44.0-0ubuntu1 all -libkf5jobwidgets5 5.44.0-0ubuntu1 amd64 +libkf5dnssd-data 5.68.0-0ubuntu1 all +libkf5dnssd5 5.68.0-0ubuntu1 amd64 +libkf5doctools5 5.68.0-0ubuntu1 amd64 +libkf5globalaccel-data 5.68.0-0ubuntu1 all +libkf5globalaccel5 5.68.0-0ubuntu1 amd64 +libkf5guiaddons5 5.68.0-0ubuntu1 amd64 +libkf5i18n-data 5.68.0-0ubuntu1 all +libkf5i18n5 5.68.0-0ubuntu1 amd64 +libkf5iconthemes-data 5.68.0-0ubuntu1 all +libkf5iconthemes5 5.68.0-0ubuntu1 amd64 +libkf5itemviews-data 5.68.0-0ubuntu1 all +libkf5itemviews5 5.68.0-0ubuntu1 amd64 +libkf5jobwidgets-data 5.68.0-0ubuntu1 all +libkf5jobwidgets5 5.68.0-0ubuntu1 amd64 -libkf5kdegamesprivate1 4:17.12.3-0ubuntu1 amd64 -libkf5kdelibs4support-data 5.44.0-0ubuntu3 all -libkf5kdelibs4support5 5.44.0-0ubuntu3 amd64 -libkf5kiocore5 5.44.0-0ubuntu1 amd64 -libkf5kiofilewidgets5 5.44.0-0ubuntu1 amd64 -libkf5kiontlm5 5.44.0-0ubuntu1 amd64 -libkf5kiowidgets5 5.44.0-0ubuntu1 amd64 -libkf5kmahjongglib-data 4:17.12.3-0ubuntu1 all -libkf5kmahjongglib5 4:17.12.3-0ubuntu1 amd64 -libkf5newstuff-data 5.44.0-0ubuntu1 all -libkf5newstuff5 5.44.0-0ubuntu1 amd64 -libkf5newstuffcore5 5.44.0-0ubuntu1 amd64 -libkf5notifications-data 5.44.0-0ubuntu1 all -libkf5notifications5 5.44.0-0ubuntu1 amd64 -libkf5notifyconfig-data 5.44.0-0ubuntu1 all -libkf5notifyconfig5 5.44.0-0ubuntu1 amd64 -libkf5package-data 5.44.0-0ubuntu1 all -libkf5package5 5.44.0-0ubuntu1 amd64 -libkf5parts-data 5.44.0-0ubuntu1 all -libkf5parts5 5.44.0-0ubuntu1 amd64 -libkf5service-bin 5.44.0-0ubuntu1 amd64 -libkf5service-data 5.44.0-0ubuntu1 all -libkf5service5 5.44.0-0ubuntu1 amd64 -libkf5solid5 5.44.0-0ubuntu1 amd64 -libkf5solid5-data 5.44.0-0ubuntu1 all -libkf5sonnet5-data 5.44.0-0ubuntu1 all -libkf5sonnetcore5 5.44.0-0ubuntu1 amd64 -libkf5sonnetui5 5.44.0-0ubuntu1 amd64 -libkf5style5 5.44.0-0ubuntu1 amd64 -libkf5textwidgets-data 5.44.0-0ubuntu1 all -libkf5textwidgets5 5.44.0-0ubuntu1 amd64 -libkf5wallet-bin 5.44.0-0ubuntu1 amd64 -libkf5wallet-data 5.44.0-0ubuntu1 all -libkf5wallet5 5.44.0-0ubuntu1 amd64 -libkf5waylandclient5 4:5.44.0-0ubuntu1 amd64 -libkf5widgetsaddons-data 5.44.0-0ubuntu1 all -libkf5widgetsaddons5 5.44.0-0ubuntu1 amd64 -libkf5windowsystem-data 5.44.0-0ubuntu1 all -libkf5windowsystem5 5.44.0-0ubuntu1 amd64 -libkf5xmlgui-bin 5.44.0-0ubuntu2 amd64 +libkf5kdegamesprivate1 4:19.12.3-1ubuntu1 amd64 +libkf5kdelibs4support-data 5.68.0-0ubuntu1 all +libkf5kdelibs4support5 5.68.0-0ubuntu1 amd64 +libkf5kiocore5 5.68.0-0ubuntu1 amd64 +libkf5kiofilewidgets5 5.68.0-0ubuntu1 amd64 +libkf5kiontlm5 5.68.0-0ubuntu1 amd64 +libkf5kiowidgets5 5.68.0-0ubuntu1 amd64 +libkf5kirigami2-5 5.68.0-0ubuntu2 amd64 +libkf5kmahjongglib-data 4:19.12.3-0ubuntu1 all +libkf5kmahjongglib5 4:19.12.3-0ubuntu1 amd64 +libkf5newstuff-data 5.68.0-0ubuntu2 all +libkf5newstuff5 5.68.0-0ubuntu2 amd64 +libkf5newstuffcore5 5.68.0-0ubuntu2 amd64 +libkf5notifications-data 5.68.0-0ubuntu1 all +libkf5notifications5 5.68.0-0ubuntu1 amd64 +libkf5notifyconfig-data 5.68.0-0ubuntu1 all +libkf5notifyconfig5 5.68.0-0ubuntu1 amd64 +libkf5package-data 5.68.0-0ubuntu1 all +libkf5package5 5.68.0-0ubuntu1 amd64 +libkf5parts-data 5.68.0-0ubuntu1 all +libkf5parts5 5.68.0-0ubuntu1 amd64 +libkf5quickaddons5 5.68.0-0ubuntu2 amd64 +libkf5service-bin 5.68.0-0ubuntu1 amd64 +libkf5service-data 5.68.0-0ubuntu1 all +libkf5service5 5.68.0-0ubuntu1 amd64 +libkf5solid5 5.68.0-0ubuntu1 amd64 +libkf5solid5-data 5.68.0-0ubuntu1 all +libkf5sonnet5-data 5.68.0-0ubuntu1 all +libkf5sonnetcore5 5.68.0-0ubuntu1 amd64 +libkf5sonnetui5 5.68.0-0ubuntu1 amd64 +libkf5style5 5.68.0-0ubuntu1 amd64 +libkf5textwidgets-data 5.68.0-0ubuntu1 all +libkf5textwidgets5 5.68.0-0ubuntu1 amd64 +libkf5wallet-bin 5.68.0-0ubuntu2 amd64 +libkf5wallet-data 5.68.0-0ubuntu2 all +libkf5wallet5 5.68.0-0ubuntu2 amd64 +libkf5waylandclient5 4:5.68.0-0ubuntu1 amd64 +libkf5widgetsaddons-data 5.68.0-0ubuntu1 all +libkf5widgetsaddons5 5.68.0-0ubuntu1 amd64 +libkf5windowsystem-data 5.68.0-0ubuntu1 all +libkf5windowsystem5 5.68.0-0ubuntu1 amd64 +libkf5xmlgui-bin 5.68.0-0ubuntu2 amd64 -libkmlbase1 1.3.0-5 amd64 -libkmldom1 1.3.0-5 amd64 -libkmlengine1 1.3.0-5 amd64 +libkmlbase1 1.3.0-8build1 amd64 +libkmldom1 1.3.0-8build1 amd64 +libkmlengine1 1.3.0-8build1 amd64 -libkrb5-26-heimdal 7.5.0+dfsg-1 amd64 +libkrb5-26-heimdal 7.7.0+dfsg-1ubuntu1 amd64 -libkwalletbackend5-5 5.44.0-0ubuntu1 amd64 -libkyotocabinet16v5 1.2.76-4.2 amd64 +libkwalletbackend5-5 5.68.0-0ubuntu2 amd64 +libkyotocabinet16v5 1.2.76-4.2build1 amd64 -liblapack3 3.7.1-4ubuntu1 amd64 +liblapack3 3.9.0-1build1 amd64 -liblilv-0-0 0.24.2~dfsg0-1 amd64 +liblilv-0-0 0.24.6-1ubuntu0.1 amd64 +liblinux-epoll-perl 0.017-1 amd64 +liblist-someutils-perl 0.58-1 all -libllvm10 1:10.0.0-4ubuntu1~18.04.1 amd64 -libllvm10 1:10.0.0-4ubuntu1~18.04.1 i386 -libllvm8 1:8-3~ubuntu18.04.2 amd64 +liblivemedia77 2020.01.19-1build1 amd64 +libllvm10 1:10.0.0-4ubuntu1 amd64 +libllvm10 1:10.0.0-4ubuntu1 i386 +libllvm8 1:8.0.1-9 amd64 +liblog-any-adapter-screen-perl 0.140-1 all +liblog-any-perl 1.708-1 all -liblouisutdml-bin 2.7.0-1 amd64 +liblouis20 3.12.0-3 amd64 +liblouisutdml-bin 2.8.0-3 amd64 +liblouisutdml9 2.8.0-3 amd64 -liblsan0 8.4.0-1ubuntu1~18.04 amd64 +liblsan0 10-20200411-0ubuntu1 amd64 -liblua5.2-0 5.2.4-1.1build1 amd64 -liblua5.3-0 5.3.3-1ubuntu0.18.04.1 amd64 +liblua5.2-0 5.2.4-1.1build3 amd64 +liblua5.3-0 5.3.3-1.1ubuntu2 amd64 +liblvm2cmd2.03 2.03.07-1ubuntu1 amd64 -libmagic-mgc 1:5.32-2ubuntu0.4 amd64 -libmagic1 1:5.32-2ubuntu0.4 amd64 +libmagic-mgc 1:5.38-4 amd64 +libmagic1 1:5.38-4 amd64 +libmagick++-6.q16-8 8:6.9.10.23+dfsg-2.1ubuntu11 amd64 +libmagickcore-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11 amd64 +libmagickwand-6.q16-6 8:6.9.10.23+dfsg-2.1ubuntu11 amd64 -libmailutils5 1:3.4-1 amd64 -libmarco-private2 1.22.3-2mint1+tricia amd64 -libmate-desktop-2-17 1.22.2-1+tricia amd64 +libmailutils6 1:3.7-2.1 amd64 +libmarco-private2 1.24.0-1ubuntu1 amd64 +libmate-desktop-2-17 1.24.0-2 amd64 -libmate-panel-applet-4-1 1.22.2-1mint1+tricia amd64 +libmate-panel-applet-4-1 1.24.0-2 amd64 -libmate-slab0 1.22.2-1+tricia amd64 -libmate-window-settings1 1.22.2-1+tricia amd64 -libmatedict6 1.22.2-1+tricia amd64 +libmate-slab0 1.24.0-linuxmint1 amd64 +libmate-window-settings1 1.24.0-linuxmint1 amd64 +libmatedict6 1.24.0-1 amd64 -libmateweather-common 1.22.1-1+tricia all -libmateweather1 1.22.1-1+tricia amd64 -libmatroska6v5 1.4.8-1.1 amd64 +libmateweather-common 1.24.0-1 all +libmateweather1 1.24.0-1 amd64 +libmatroska6v5 1.5.2-3build1 amd64 +libmbedcrypto3 2.16.4-1ubuntu2 amd64 +libmbedtls12 2.16.4-1ubuntu2 amd64 +libmbedx509-0 2.16.4-1ubuntu2 amd64 -libmetacity1 1:3.28.0-1ubuntu0.1 amd64 +libmetacity1 1:3.36.1-1 amd64 +libminiupnpc17 2.1.20190824-0ubuntu2 amd64 -libmng2 2.0.2-0ubuntu3 amd64 +libmng2 2.0.3+dfsg-3 amd64 -libmodplug1 1:0.8.9.0-1 amd64 +libmodplug1 1:0.8.9.0-2build1 amd64 -libmono-cairo4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-corlib4.5-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-posix4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-security4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-sharpzip4.84-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-system-configuration4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-system-core4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-system-drawing4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-system-security4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-system-xml4.0-cil 4.6.2.7+dfsg-1ubuntu1 all -libmono-system4.0-cil 4.6.2.7+dfsg-1ubuntu1 all +libmono-cairo4.0-cil 6.8.0.105+dfsg-2 all +libmono-corlib4.5-cil 6.8.0.105+dfsg-2 all +libmono-posix4.0-cil 6.8.0.105+dfsg-2 all +libmono-security4.0-cil 6.8.0.105+dfsg-2 all +libmono-sharpzip4.84-cil 6.8.0.105+dfsg-2 all +libmono-system-configuration4.0-cil 6.8.0.105+dfsg-2 all +libmono-system-core4.0-cil 6.8.0.105+dfsg-2 all +libmono-system-drawing4.0-cil 6.8.0.105+dfsg-2 all +libmono-system-numerics4.0-cil 6.8.0.105+dfsg-2 all +libmono-system-security4.0-cil 6.8.0.105+dfsg-2 all +libmono-system-xml4.0-cil 6.8.0.105+dfsg-2 all +libmono-system4.0-cil 6.8.0.105+dfsg-2 all +libmoox-aliases-perl 0.001006-1 all +libmoox-struct-perl 0.017-1 all -libmozjs-52-0 52.9.1-0ubuntu0.18.04.1 amd64 +libmozjs-52-0 52.9.1-1ubuntu3 amd64 -libmpcdec6 2:0.1~r495-1 amd64 +libmpcdec6 2:0.1~r495-2 amd64 -libmpeg2encpp-2.1-0 1:2.1.0+debian-5 amd64 +libmpeg2encpp-2.1-0 1:2.1.0+debian-6build1 amd64 -libmplex2-2.1-0 1:2.1.0+debian-5 amd64 -libmpv1 0.27.2-1ubuntu1 amd64 -libmpx2 8.4.0-1ubuntu1~18.04 amd64 +libmplex2-2.1-0 1:2.1.0+debian-6build1 amd64 +libmpv1 0.32.0-1ubuntu1 amd64 +libmpx2 8.4.0-3ubuntu2 amd64 -libmspub-0.1-1 0.1.4-1 amd64 +libmspub-0.1-1 0.1.4-1build3 amd64 -libmusicbrainz5-2 5.1.0+git20150707-7 amd64 -libmusicbrainz5cc2v5 5.1.0+git20150707-7 amd64 +libmusicbrainz5-2 5.1.0+git20150707-9build1 amd64 +libmusicbrainz5cc2v5 5.1.0+git20150707-9build1 amd64 -libmwaw-0.3-3 0.3.13-1 amd64 +libmwaw-0.3-3 0.3.15-2build1 amd64 +libmysofa1 1.0~dfsg0-1 amd64 -libmythes-1.2-0 2:1.2.4-3 amd64 +libmythes-1.2-0 2:1.2.4-3build1 amd64 -libneon27-gnutls 0.30.2-3~ubuntu18.04.1 amd64 +libneon27-gnutls 0.30.2-4 amd64 -libnet-dns-perl 1.10-2 all +libnet-dns-perl 1.22-1 all +libnfs13 4.0.0-1 amd64 -libnice10 0.1.14-1 amd64 +libnice10 0.1.16-1 amd64 -libnm0 1.10.6-2ubuntu1.4 amd64 -libnma0 1.8.10-2ubuntu3mint1 amd64 -libnorm1 1.5r6+dfsg1-6 amd64 +libnm0 1.22.10-1ubuntu2.1 amd64 +libnma0 1.8.24-linuxmint4 amd64 +libnorm1 1.5.8+dfsg2-2build1 amd64 +libntfs-3g883 1:2017.3.23AR.3-3ubuntu1 amd64 +libobject-id-perl 0.1.2-2ubuntu1 all -libodfgen-0.1-1 0.1.6-2 amd64 -libofa0 0.9.3-15 amd64 +libodfgen-0.1-1 0.1.7-1ubuntu2 amd64 +libofa0 0.9.3-21 amd64 +libonig5 6.9.4-1 amd64 -libopenal-data 1:1.18.2-2 all -libopenal1 1:1.18.2-2 amd64 +libopenal-data 1:1.19.1-1 all +libopenal1 1:1.19.1-1 amd64 -libopencv-highgui3.2 3.2.0+dfsg-4ubuntu0.1 amd64 -libopencv-imgcodecs3.2 3.2.0+dfsg-4ubuntu0.1 amd64 -libopencv-objdetect3.2 3.2.0+dfsg-4ubuntu0.1 amd64 -libopencv-videoio3.2 3.2.0+dfsg-4ubuntu0.1 amd64 -libopenmpt-modplug1 0.3.6-1 amd64 +libopenmpt-modplug1 0.4.11-1build1 amd64 -libosp5 1.5.2-13ubuntu2 amd64 -libostree-1-1 2018.8-0ubuntu0.2 amd64 +libosp5 1.5.2-13ubuntu3 amd64 +libostree-1-1 2020.3-1 amd64 -libpagemaker-0.0-0 0.0.4-1 amd64 +libpagemaker-0.0-0 0.0.4-1build1 amd64 -libpangomm-1.4-1v5 2.40.1-4 amd64 +libpangomm-1.4-1v5 2.42.0-2build1 amd64 -libpci3 1:3.5.2-1ubuntu1.1 amd64 +libpci3 1:3.6.4-1 amd64 +libpcre2-32-0 10.34-7 amd64 -libpcrecpp0v5 2:8.39-9 amd64 +libpcrecpp0v5 2:8.39-12build1 amd64 -libpeas-1.0-0 1.22.0-2 amd64 -libpeas-1.0-python2loader 1.22.0-2 amd64 +libpeas-1.0-0 1.26.0-2 amd64 -libpgm-5.2-0 5.2.122~dfsg-2 amd64 +libpgm-5.2-0 5.2.122~dfsg-3ubuntu1 amd64 -libphonenumber7 7.1.0-5ubuntu5 amd64 -libphonon4qt5-4 4:4.10.0-2 amd64 +libphonenumber7 7.1.0-5ubuntu11 amd64 +libphonon4qt5-4 4:4.11.1-3build1 amd64 +libphonon4qt5-data 4:4.11.1-3build1 all +libplacebo7 1.7.0-2 amd64 +libplymouth5 0.9.4git20200323-0ubuntu6 amd64 +libpmem1 1.8-1ubuntu1 amd64 -libportaudio2 19.6.0-1 amd64 -libportsmf0v5 0.1~svn20101010-5ubuntu1 amd64 +libportaudio2 19.6.0-1build1 amd64 +libportsmf0v5 0.1~svn20101010-5ubuntu2 amd64 +libpostproc55 7:4.2.2-1ubuntu1 amd64 +libproj15 6.3.1-1 amd64 +libprotobuf-lite17 3.6.1.3-2ubuntu5 amd64 +libproxy1-plugin-webkit 0.4.15-10ubuntu1 amd64 -libpython2.7 2.7.17-1~18.04ubuntu1 amd64 -libpython2.7-minimal 2.7.17-1~18.04ubuntu1 amd64 -libpython2.7-stdlib 2.7.17-1~18.04ubuntu1 amd64 +libpython2.7 2.7.18~rc1-2 amd64 +libpython2.7-minimal 2.7.18~rc1-2 amd64 +libpython2.7-stdlib 2.7.18~rc1-2 amd64 -libqca-qt5-2 2.1.3-2ubuntu2 amd64 +libqca-qt5-2 2.2.1-2build1 amd64 +libqrencode4 4.0.2-2 amd64 +libqt5concurrent5 5.12.8+dfsg-0ubuntu1 amd64 -libqt5help5 5.9.5-0ubuntu1 amd64 -libqt5keychain1 0.7.0-3 amd64 +libqt5help5 5.12.8-0ubuntu1 amd64 +libqt5keychain1 0.10.0-1build1 amd64 +libqt5multimediaquick5 5.12.8-0ubuntu1 amd64 +libqt5quickcontrols2-5 5.12.8+dfsg-0ubuntu1 amd64 +libqt5quicktemplates2-5 5.12.8+dfsg-0ubuntu1 amd64 -libquadmath0 8.4.0-1ubuntu1~18.04 amd64 +libquadmath0 10-20200411-0ubuntu1 amd64 +librda-common 0.0.5-1 all +librda0 0.0.5-1 amd64 +libre-engine-re2-perl 0.13-5 amd64 -libreadline5 5.2+dfsg-3build1 amd64 +libreadline5 5.2+dfsg-3build3 amd64 -libregexp-pattern-license-perl 3.0.31-3 all +libregexp-pattern-license-perl 3.2.0-1 all +libregexp-pattern-perl 0.2.12-1 all -libreoffice-help-de 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-en-gb 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-en-us 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-es 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-fr 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-it 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-pl 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-pt 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-pt-br 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-ru 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-vi 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-zh-cn 1:6.0.7-0ubuntu0.18.04.10 all -libreoffice-help-zh-tw 1:6.0.7-0ubuntu0.18.04.10 all +libreoffice-help-common 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-de 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-en-gb 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-en-us 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-es 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-fr 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-it 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-pl 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-pt 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-pt-br 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-ru 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-vi 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-zh-cn 1:6.4.4-0ubuntu0.20.04.1 all +libreoffice-help-zh-tw 1:6.4.4-0ubuntu0.20.04.1 all -libresid-builder0c2a 2.1.1-15ubuntu1 amd64 +libresid-builder0c2a 2.1.1-15ubuntu2 amd64 -librevenge-0.0-0 0.0.4-6ubuntu2 amd64 +librevenge-0.0-0 0.0.4-6ubuntu5 amd64 -libroken18-heimdal 7.5.0+dfsg-1 amd64 +libroken18-heimdal 7.7.0+dfsg-1ubuntu1 amd64 -librubberband2 1.8.1-7ubuntu2 amd64 +librubberband2 1.8.2-1build1 amd64 -librygel-core-2.6-2 0.36.1-1 amd64 -librygel-db-2.6-2 0.36.1-1 amd64 -librygel-renderer-2.6-2 0.36.1-1 amd64 -librygel-renderer-gst-2.6-2 0.36.1-1 amd64 -librygel-server-2.6-2 0.36.1-1 amd64 +libruby2.7 2.7.0-5ubuntu1.1 amd64 +librygel-core-2.6-2 0.38.3-1ubuntu1 amd64 +librygel-db-2.6-2 0.38.3-1ubuntu1 amd64 +librygel-renderer-2.6-2 0.38.3-1ubuntu1 amd64 +librygel-renderer-gst-2.6-2 0.38.3-1ubuntu1 amd64 +librygel-server-2.6-2 0.38.3-1ubuntu1 amd64 -libsane-common 1.0.27-1~experimental3ubuntu2.2 all +libsane 1.0.29-0ubuntu5 amd64 +libsane-common 1.0.29-0ubuntu5 all -libsane1 1.0.27-1~experimental3ubuntu2.2 amd64 +libsane1 1.0.29-0ubuntu5 amd64 -libsdl1.2debian 1.2.15+dfsg2-0.1ubuntu0.1 amd64 +libsdl1.2debian 1.2.15+dfsg2-5 amd64 -libsemanage-common 2.7-2build2 all -libsemanage1 2.7-2build2 amd64 +libsemanage-common 3.0-1build2 all +libsemanage1 3.0-1build2 amd64 -libserd-0-0 0.28.0~dfsg0-1 amd64 +libserd-0-0 0.30.2-1 amd64 +libsereal-decoder-perl 4.011+ds-1build1 amd64 +libsereal-encoder-perl 4.011+ds-1build1 amd64 -libsidplay1v5 1.36.59-11 amd64 -libsidplay2 2.1.1-15ubuntu1 amd64 -libsigc++-2.0-0v5 2.10.0-2 amd64 +libsidplay1v5 1.36.59-11build1 amd64 +libsidplay2 2.1.1-15ubuntu2 amd64 +libsigc++-2.0-0v5 2.10.2-1build1 amd64 -libslang2 2.3.1a-3ubuntu1 amd64 +libslang2 2.3.2-4 amd64 +libslirp0 4.1.0-2ubuntu2 amd64 -libsndfile1 1.0.28-4ubuntu0.18.04.1 amd64 +libsndfile1 1.0.28-7 amd64 +libsndio7.0 1.5.0-3 amd64 -libsocket++1 1.12.13-9 amd64 +libsocket++1 1.12.13-10build1 amd64 -libsoundtouch1 1.9.2-3 amd64 -libsoup-gnome2.4-1 2.62.1-1ubuntu0.4 amd64 -libsoup2.4-1 2.62.1-1ubuntu0.4 amd64 +libsoundtouch1 2.1.2+ds1-1build1 amd64 +libsoup-gnome2.4-1 2.70.0-1 amd64 +libsoup2.4-1 2.70.0-1 amd64 -libspatialite7 4.3.0a-5build1 amd64 +libspatialaudio0 0.3.0+git20180730+dfsg1-2build1 amd64 +libspatialite7 4.3.0a-6build1 amd64 -libspeexdsp1 1.2~rc1.2-1ubuntu2 amd64 -libspice-client-glib-2.0-8 0.34-1.1build1 amd64 -libspice-client-gtk-3.0-5 0.34-1.1build1 amd64 +libspeexdsp1 1.2~rc1.2-1.1ubuntu1 amd64 +libspice-client-glib-2.0-8 0.37-2fakesync1 amd64 +libspice-client-gtk-3.0-5 0.37-2fakesync1 amd64 -libsratom-0-0 0.6.0~dfsg0-1 amd64 +libsratom-0-0 0.6.4-1 amd64 +libsrt1 1.4.0-1build1 amd64 -libssl1.1 1.1.1-1ubuntu2.1~18.04.6 amd64 +libssl1.1 1.1.1f-1ubuntu2 amd64 -libstdc++-7-dev 7.5.0-3ubuntu1~18.04 amd64 +libstdc++-7-dev 7.5.0-6ubuntu2 amd64 +libstdc++-9-dev 9.3.0-10ubuntu2 amd64 +libstruct-dumb-perl 0.09-1 all +libsub-override-perl 0.09-2 all +libsys-cpuaffinity-perl 1.12-1build3 amd64 -libtag1v5 1.11.1+dfsg.1-0.2build2 amd64 -libtag1v5-vanilla 1.11.1+dfsg.1-0.2build2 amd64 +libtag1v5 1.11.1+dfsg.1-0.3ubuntu2 amd64 +libtag1v5-vanilla 1.11.1+dfsg.1-0.3ubuntu2 amd64 -libtbb2 2017~U7-8 amd64 -libtcl8.6 8.6.8+dfsg-3 amd64 +libtbb2 2020.1-2 amd64 +libtcl8.6 8.6.10+dfsg-1 amd64 +libtepl-4-0 4.4.0-1 amd64 -libtimezonemap-data 0.4.5 all -libtimezonemap1 0.4.5 amd64 +libtimezonemap-data 0.4.6-2 all +libtimezonemap1 0.4.6-2 amd64 -libtsan0 8.4.0-1ubuntu1~18.04 amd64 -libtsk13 4.4.2-3 amd64 +libtsan0 10-20200411-0ubuntu1 amd64 +libtsk13 4.6.7-1build1 amd64 +libtss2-esys0 2.3.2-1 amd64 +libtype-tiny-perl 1.008001-2 all -libubsan0 7.5.0-3ubuntu1~18.04 amd64 -libuchardet0 0.0.6-2 amd64 +libubsan0 7.5.0-6ubuntu2 amd64 +libubsan1 10-20200411-0ubuntu1 amd64 +libuchardet0 0.0.6-3build1 amd64 -libumfpack5 1:5.1.2-2 amd64 +libumfpack5 1:5.7.1+dfsg-2 amd64 +libupnp13 1:1.8.4-2ubuntu2 amd64 +libusbmuxd6 2.0.1-2 amd64 -libuser1 1:0.62~dfsg-0.1ubuntu2 amd64 +libuser1 1:0.62~dfsg-0.3 amd64 +libusrsctp1 0.9.3.0+20190901-1 amd64 +libuv1 1.34.2-1ubuntu1 amd64 +libvidstab1.1 1.1.0-2 amd64 +libvirglrenderer1 0.8.2-1ubuntu1 amd64 -libvisio-0.1-1 0.1.6-1build1 amd64 -libvisual-0.4-0 0.4.0-11 amd64 -libvisual-0.4-plugins 1:0.4.0+dfsg1-11 amd64 -libvlc-bin 3.0.8-0ubuntu18.04.1 amd64 -libvlc5 3.0.8-0ubuntu18.04.1 amd64 -libvlccore9 3.0.8-0ubuntu18.04.1 amd64 +libvisio-0.1-1 0.1.7-1build2 amd64 +libvisual-0.4-0 0.4.0-17 amd64 +libvisual-0.4-plugins 1:0.4.0+dfsg1-14 amd64 +libvlc-bin 3.0.9.2-1 amd64 +libvlc5 3.0.9.2-1 amd64 +libvlccore9 3.0.9.2-1 amd64 -libvte-2.91-0 0.52.2-1ubuntu1~18.04.2 amd64 -libvte-2.91-common 0.52.2-1ubuntu1~18.04.2 all +libvte-2.91-0 0.60.3-0ubuntu1~20.04 amd64 +libvte-2.91-common 0.60.3-0ubuntu1~20.04 amd64 -libwayland-server0 1.16.0-1ubuntu1.1~18.04.3 amd64 +libwayland-server0 1.18.0-1 amd64 -libwebkit2gtk-4.0-37 2.28.3-0ubuntu0.18.04.1 amd64 +libwebkit2gtk-4.0-37 2.28.3-0ubuntu0.20.04.1 amd64 -libwebrtc-audio-processing1 0.3-1 amd64 +libwebrtc-audio-processing1 0.3.1-0ubuntu3 amd64 -libwinpr2-2 2.1.1+dfsg1-0ubuntu0.18.04.1 amd64 +libwinpr2-2 2.1.1+dfsg1-0ubuntu0.20.04.1 amd64 +libwireshark13 3.2.3-1 amd64 +libwiretap10 3.2.3-1 amd64 -libwoff1 1.0.2-1build0.1 amd64 -libwpd-0.10-10 0.10.2-2 amd64 -libwpg-0.3-3 0.3.1-3 amd64 -libwps-0.4-4 0.4.8-1 amd64 +libwoff1 1.0.2-1build2 amd64 +libwpd-0.10-10 0.10.3-1build1 amd64 +libwpg-0.3-3 0.3.3-1build1 amd64 +libwps-0.4-4 0.4.10-1build1 amd64 +libwsutil11 3.2.3-1 amd64 -libwww-perl 6.31-1ubuntu0.1 all +libwww-perl 6.43-1 all -libwxbase3.0-0v5 3.0.4+dfsg-3 amd64 +libwxbase3.0-0v5 3.0.4+dfsg-15build1 amd64 +libwxgtk3.0-gtk3-0v5 3.0.4+dfsg-15build1 amd64 -libxatracker2 20.0.8-0ubuntu1~18.04.1 amd64 +libxatracker2 20.0.8-0ubuntu1~20.04.1 amd64 -libxenstore3.0 4.9.2-0ubuntu1 amd64 -libxerces-c3.2 3.2.0+debian-2 amd64 +libxenstore3.0 4.11.3+24-g14b62ab3e5-1ubuntu2 amd64 +libxentoolcore1 4.11.3+24-g14b62ab3e5-1ubuntu2 amd64 +libxerces-c3.2 3.2.2+debian-1build3 amd64 +libxml-libxml-perl 2.0134+dfsg-1build1 amd64 +libxml-writer-perl 0.625-1 all -libxreaderdocument3 2.4.4+tricia amd64 -libxreaderview3 2.4.4+tricia amd64 +libxreaderdocument3 2.6.4+ulyana amd64 +libxreaderview3 2.6.4+ulyana amd64 -libxslt1.1 1.1.29-5ubuntu0.2 amd64 +libxslt1.1 1.1.34-4 amd64 -libyelp0 3.26.0-1ubuntu2mint1 amd64 -libykpers-1-1 1.18.0-1 amd64 +libyelp0 3.36.0-linuxmint1 amd64 +libykpers-1-1 1.20.0-2 amd64 -libzfs2linux 0.7.5-1ubuntu16.9 amd64 +libzfs2linux 0.8.3-1ubuntu12.2 amd64 -libzmq5 4.2.5-1ubuntu0.2 amd64 -libzpool2linux 0.7.5-1ubuntu16.9 amd64 +libzip5 1.5.1-0ubuntu1 amd64 +libzmq5 4.3.2-2ubuntu1 amd64 +libzpool2linux 0.8.3-1ubuntu12.2 amd64 -licensecheck 3.0.31-2 all +licensecheck 3.0.45-1 all -lintian 2.5.81ubuntu1 all +lintian 2.62.0 all -linux-generic-hwe-18.04 5.3.0.62.115 amd64 +linux-generic 5.4.0.42.45 amd64 +linux-generic-hwe-18.04 5.4.0.42.45 amd64 -linux-headers-generic-hwe-18.04 5.3.0.62.115 amd64 +linux-headers-5.4.0-42 5.4.0-42.46 all +linux-headers-5.4.0-42-generic 5.4.0-42.46 amd64 +linux-headers-generic 5.4.0.42.45 amd64 +linux-headers-generic-hwe-18.04 5.4.0.42.45 amd64 -linux-image-generic-hwe-18.04 5.3.0.62.115 amd64 +linux-image-5.4.0-42-generic 5.4.0-42.46 amd64 +linux-image-generic 5.4.0.42.45 amd64 +linux-image-generic-hwe-18.04 5.4.0.42.45 amd64 +linux-modules-5.4.0-42-generic 5.4.0-42.46 amd64 +linux-modules-extra-5.4.0-42-generic 5.4.0-42.46 amd64 -login 1:4.5-1ubuntu2 amd64 +login 1:4.8.1-1ubuntu5.20.04 amd64 -lsdvd 0.17-1build1 amd64 -lshw 02.18-0.1ubuntu6.18.04.1 amd64 -lskat 4:17.12.3-0ubuntu2 amd64 +lsdvd 0.17-1build2 amd64 +lshw 02.18.85-0.3ubuntu2 amd64 +lskat 4:19.12.3-0ubuntu1 amd64 +lskat-data 4:19.12.3-0ubuntu1 all -lvm2 2.02.176-4.1ubuntu3.18.04.3 amd64 +lvm2 2.03.07-1ubuntu1 amd64 -mailutils 1:3.4-1 amd64 -mailutils-common 1:3.4-1 all +mailutils 1:3.7-2.1 amd64 +mailutils-common 1:3.7-2.1 all -man-db 2.8.3-2ubuntu0.1 amd64 +man-db 2.9.1-1 amd64 -marco 1.22.3-2mint1+tricia amd64 -marco-common 1.22.3-2mint1+tricia all +marco 1.24.0-1ubuntu1 amd64 +marco-common 1.24.0-1ubuntu1 all -mariadb-client-core-10.1 1:10.1.44-0ubuntu0.18.04.1 amd64 +mariadb-client-10.3 1:10.3.22-1ubuntu1 amd64 +mariadb-client-core-10.3 1:10.3.22-1ubuntu1 amd64 -mariadb-server 1:10.1.44-0ubuntu0.18.04.1 all +mariadb-server 1:10.3.22-1ubuntu1 all -mariadb-server-core-10.1 1:10.1.44-0ubuntu0.18.04.1 amd64 +mariadb-server-10.3 1:10.3.22-1ubuntu1 amd64 +mariadb-server-core-10.3 1:10.3.22-1ubuntu1 amd64 -mate-control-center 1.22.2-1+tricia amd64 -mate-control-center-common 1.22.2-1+tricia all +mate-control-center 1.24.0-linuxmint1 amd64 +mate-control-center-common 1.24.0-linuxmint1 all -mate-panel 1.22.2-1mint1+tricia amd64 -mate-panel-common 1.22.2-1mint1+tricia all +mate-panel 1.24.0-2 amd64 +mate-panel-common 1.24.0-2 all -mate-screensaver 1.22.2-1+tricia amd64 -mate-screensaver-common 1.22.2-1+tricia all +mate-screensaver 1.24.0-1 amd64 +mate-screensaver-common 1.24.0-1 all -mate-settings-daemon 1.22.1-1+tricia amd64 -mate-settings-daemon-common 1.22.1-1+tricia all -mate-system-monitor 1.22.2-1+tricia amd64 -mate-system-monitor-common 1.22.2-1+tricia all +mate-settings-daemon 1.24.0-1 amd64 +mate-settings-daemon-common 1.24.0-1 all +mate-system-monitor 1.24.0-1 amd64 +mate-system-monitor-common 1.24.0-1 all -mate-tweak 18.04.16-1 all +mate-tweak 20.04.0-1ubuntu3 all -mate-utils 1.22.2-1+tricia amd64 -mate-utils-common 1.22.2-1+tricia all -mawk 1.3.3-17ubuntu3 amd64 -mdadm 4.1~rc1-3~ubuntu18.04.4 amd64 +mate-utils 1.24.0-1 amd64 +mate-utils-common 1.24.0-1 all +mawk 1.3.4.20200120-2 amd64 +mdadm 4.1-5ubuntu1 amd64 -mencoder 2:1.3.0-7build2 amd64 +mencoder 2:1.3.0-8build5 amd64 -mesa-va-drivers 20.0.8-0ubuntu1~18.04.1 amd64 -mesa-vdpau-drivers 20.0.8-0ubuntu1~18.04.1 amd64 -metacity 1:3.28.0-1ubuntu0.1 amd64 -metacity-common 1:3.28.0-1ubuntu0.1 all +mesa-va-drivers 20.0.8-0ubuntu1~20.04.1 amd64 +mesa-vdpau-drivers 20.0.8-0ubuntu1~20.04.1 amd64 +metacity 1:3.36.1-1 amd64 +metacity-common 1:3.36.1-1 all -mint-artwork 1.3.4 all +mint-artwork 1.4.3 all -mint-common 2.0.9 all +mint-backgrounds-ulyana 1.1 all +mint-common 2.1.3 all -mint-meta-codecs 2019.12.28 all +mint-meta-codecs 2020.07.09 all -mono-4.0-gac 4.6.2.7+dfsg-1ubuntu1 all -mono-gac 4.6.2.7+dfsg-1ubuntu1 all -mono-runtime 4.6.2.7+dfsg-1ubuntu1 amd64 -mono-runtime-common 4.6.2.7+dfsg-1ubuntu1 amd64 -mono-runtime-sgen 4.6.2.7+dfsg-1ubuntu1 amd64 +mono-4.0-gac 6.8.0.105+dfsg-2 all +mono-gac 6.8.0.105+dfsg-2 all +mono-runtime 6.8.0.105+dfsg-2 amd64 +mono-runtime-common 6.8.0.105+dfsg-2 amd64 +mono-runtime-sgen 6.8.0.105+dfsg-2 amd64 -mplayer 2:1.3.0-7build2 amd64 +mplayer 2:1.3.0-8build5 amd64 -mtr-tiny 0.92-1 amd64 +mtr-tiny 0.93-1 amd64 -nano 2.9.3-2 amd64 +nano 4.8-1ubuntu1 amd64 -ncurses-base 6.1-1ubuntu1.18.04 all -ncurses-bin 6.1-1ubuntu1.18.04 amd64 -ncurses-term 6.1-1ubuntu1.18.04 all +ncurses-base 6.2-0ubuntu2 all +ncurses-bin 6.2-0ubuntu2 amd64 +ncurses-term 6.2-0ubuntu2 all -nemo-python 3.6.0-1 amd64 +nemo-python 4.4.0-3 amd64 -netplan.io 0.99-0ubuntu3~18.04.3 amd64 -network-manager 1.10.6-2ubuntu1.4 amd64 -network-manager-config-connectivity-ubuntu 1.10.6-2ubuntu1.4 all -network-manager-gnome 1.8.10-2ubuntu3mint1 amd64 +netplan.io 0.99-0ubuntu3~20.04.2 amd64 +network-manager 1.22.10-1ubuntu2.1 amd64 +network-manager-config-connectivity-ubuntu 1.22.10-1ubuntu2.1 all +network-manager-gnome 1.8.24-linuxmint4 amd64 -ntfs-3g 1:2017.3.23-2ubuntu0.18.04.2 amd64 +ntfs-3g 1:2017.3.23AR.3-3ubuntu1 amd64 -openjdk-8-jdk 8u252-b09-1~18.04 amd64 -openjdk-8-jdk-headless 8u252-b09-1~18.04 amd64 -openjdk-8-jre 8u252-b09-1~18.04 amd64 -openjdk-8-jre-headless 8u252-b09-1~18.04 amd64 +openjdk-8-jdk 8u252-b09-1ubuntu1 amd64 +openjdk-8-jdk-headless 8u252-b09-1ubuntu1 amd64 +openjdk-8-jre 8u252-b09-1ubuntu1 amd64 +openjdk-8-jre-headless 8u252-b09-1ubuntu1 amd64 -opensp 1.5.2-13ubuntu2 amd64 +opensp 1.5.2-13ubuntu3 amd64 -p11-kit 0.23.9-2 amd64 +p11-kit 0.23.20-1build1 amd64 -p7zip 16.02+dfsg-6 amd64 -p7zip-full 16.02+dfsg-6 amd64 +p7zip 16.02+dfsg-7build1 amd64 +p7zip-full 16.02+dfsg-7build1 amd64 -palapeli 4:17.12.3-0ubuntu2 amd64 -palapeli-data 4:17.12.3-0ubuntu2 all +palapeli 4:19.12.3-0ubuntu1 amd64 +palapeli-data 4:19.12.3-0ubuntu1 all -passwd 1:4.5-1ubuntu2 amd64 -pastebinit 1.5-2 all +passwd 1:4.8.1-1ubuntu5.20.04 amd64 +pastebinit 1.5.1-1 all -pbzip2 1.1.9-1build1 amd64 -pciutils 1:3.5.2-1ubuntu1.1 amd64 +pbzip2 1.1.13-1build1 amd64 +pci.ids 0.0~2020.03.20-1 all +pciutils 1:3.6.4-1 amd64 -phonon-backend-gstreamer-common 4:4.9.0-1 amd64 -phonon4qt5 4:4.10.0-2 amd64 -phonon4qt5-backend-vlc 0.10.1-2 amd64 -picmi 4:17.12.3-0ubuntu1 amd64 +phonon-backend-gstreamer-common 4:4.10.0-1build1 amd64 +phonon4qt5 4:4.11.1-3build1 amd64 +phonon4qt5-backend-vlc 0.11.1-1build1 amd64 +picmi 4:19.12.3-1ubuntu1 amd64 -pinentry-curses 1.1.0-1 amd64 -pinentry-gnome3 1.1.0-1 amd64 -pix 2.4.6+tricia amd64 -pix-data 2.4.6+tricia all -pix-dbg 2.4.6+tricia amd64 +pinentry-curses 1.1.0-3build1 amd64 +pinentry-gnome3 1.1.0-3build1 amd64 +pix 2.4.11+ulyana amd64 +pix-data 2.4.11+ulyana all +pix-dbg 2.4.11+ulyana amd64 +pixz 1.0.6-2build1 amd64 -plymouth 0.9.3+mint2 amd64 -plymouth-label 0.9.3+mint2 amd64 -plymouth-theme-ubuntu-text 0.9.3+mint2 amd64 +plymouth 0.9.4git20200323-0ubuntu6 amd64 +plymouth-label 0.9.4git20200323-0ubuntu6 amd64 +plymouth-theme-ubuntu-text 0.9.4git20200323-0ubuntu6 amd64 -poppler-utils 0.62.0-2ubuntu2.10 amd64 -posterazor 1.5.1-2build1 amd64 -postfix 3.3.0-1ubuntu0.2 amd64 -postfix-cdb 3.3.0-1ubuntu0.2 amd64 -postfix-ldap 3.3.0-1ubuntu0.2 amd64 -postfix-mysql 3.3.0-1ubuntu0.2 amd64 -postfix-pcre 3.3.0-1ubuntu0.2 amd64 -postfix-pgsql 3.3.0-1ubuntu0.2 amd64 -postfix-sqlite 3.3.0-1ubuntu0.2 amd64 +poppler-utils 0.86.1-0ubuntu1 amd64 +posterazor 1.5.1-2build2 amd64 +postfix 3.4.13-0ubuntu1 amd64 +postfix-cdb 3.4.13-0ubuntu1 amd64 +postfix-ldap 3.4.13-0ubuntu1 amd64 +postfix-mysql 3.4.13-0ubuntu1 amd64 +postfix-pcre 3.4.13-0ubuntu1 amd64 +postfix-pgsql 3.4.13-0ubuntu1 amd64 +postfix-sqlite 3.4.13-0ubuntu1 amd64 -printer-driver-brlaser 4-1 amd64 +printer-driver-brlaser 6-1build1 amd64 -printer-driver-postscript-hp 3.17.10+repack0-5 all +printer-driver-postscript-hp 3.20.3+dfsg0-2 amd64 -printer-driver-splix 2.0.0+svn315-6fakesync1 amd64 -pristine-tar 1.42 amd64 +printer-driver-splix 2.0.0+svn315-7fakesync1build1 amd64 +pristine-tar 1.47 amd64 -python-asn1crypto 0.24.0-1 all +python-asn1crypto 0.24.0-1build1 all -python-bs4 4.6.0-1 all -python-cairo 1.16.2-1 amd64 -python-caja 1.22.1-1+tricia amd64 -python-caja-common 1.22.1-1+tricia all -python-certifi 2018.1.18-2 all -python-cffi-backend 1.11.5-1 amd64 -python-chardet 3.0.4-1 all +python-backports.functools-lru-cache 1.5-3build1 all +python-bs4 4.8.2-1 all +python-cairo 1.16.2-2ubuntu2 amd64 +python-caja-common 1.24.0-2 all +python-certifi 2019.11.28-1 all +python-cffi-backend 1.14.0-1build1 amd64 +python-chardet 3.0.4-4build1 all -python-configparser 3.5.0-1 all -python-crypto 2.6.1-8ubuntu2 amd64 -python-cryptography 2.1.4-1ubuntu1.3 amd64 -python-dateutil 2.6.1-1 all -python-dbus 1.2.6-1 amd64 -python-decorator 4.1.2-1 all -python-dnspython 1.15.0-1 all -python-enum34 1.1.6-2 all -python-funcsigs 1.0.2-4 all +python-configparser 3.5.0b2-3build1 all +python-crypto 2.6.1-13ubuntu2 amd64 +python-cryptography 2.8-3 amd64 +python-dateutil 2.7.3-3ubuntu1 all +python-dbus 1.2.16-1build1 amd64 +python-decorator 4.4.2-0ubuntu1 all +python-dnspython 1.16.0-1build1 all +python-enum34 1.1.6-2ubuntu1 all +python-funcsigs 1.0.2-4build1 all -python-gobject-2 2.28.6-12ubuntu3 amd64 +python-gobject-2 2.28.6-14ubuntu1 amd64 -python-html5lib 0.999999999-1 all -python-httplib2 0.9.2+dfsg-1ubuntu0.2 all -python-idna 2.6-1 all +python-html5lib 1.0.1-2 all +python-httplib2 0.14.0-1ubuntu1 all +python-idna 2.8-1 all -python-ipaddress 1.0.17-1 all +python-ipaddress 1.0.17-1build1 all -python-ipython-genutils 0.2.0-1 all +python-ipython-genutils 0.2.0-1ubuntu1 all -python-jinja2 2.10-1ubuntu0.18.04.1 all +python-jinja2 2.10.1-2 all -python-libxml2 2.9.4+dfsg1-6.1ubuntu1.3 amd64 -python-lxml 4.2.1-1ubuntu0.1 amd64 -python-markupsafe 1.0-1build1 amd64 +python-libxml2 2.9.10+dfsg-5 amd64 +python-lxml 4.5.0-1 amd64 +python-markupsafe 1.1.0-1build2 amd64 -python-mock 2.0.0-3 all +python-mock 3.0.5-1build1 all -python-olefile 0.45.1-1 all -python-openssl 17.5.0-1ubuntu1 all +python-olefile 0.46-2 all +python-openssl 19.0.0-1build1 all -python-pathlib2 2.3.0-1 all -python-pbr 3.1.1-3ubuntu3 all -python-pexpect 4.2.1-1 all +python-pathlib2 2.3.5-1ubuntu1 all +python-pbr 5.4.5-0ubuntu1 all +python-pexpect 4.6.0-1build1 all -python-pil 5.1.0-1ubuntu0.2 amd64 +python-pil 6.2.1-3 amd64 -python-psutil 5.4.2-1ubuntu0.1 amd64 -python-ptyprocess 0.5.2-1 all -python-pycodestyle 2.3.1-2 all -python-pycurl 7.43.0.1-0.2 amd64 +python-psutil 5.5.1-1ubuntu4 amd64 +python-ptyprocess 0.6.0-1ubuntu1 all +python-pycodestyle 2.5.0-2 all +python-pycurl 7.43.0.2-1ubuntu5 amd64 -python-scandir 1.7-1 amd64 -python-setproctitle 1.1.10-1build2 amd64 +python-scandir 1.10.0-2ubuntu3 amd64 +python-setproctitle 1.1.10-1ubuntu1 amd64 -python-six 1.11.0-2 all +python-six 1.14.0-2 all +python-soupsieve 1.9.5+dfsg-1 all -python-tz 2018.3-2 all +python-tz 2019.3-1 all -python-wcwidth 0.1.7+dfsg1-1 all -python-webencodings 0.5-2 all -python-xdg 0.25-4ubuntu1 all -python-xlib 0.20-3 all -python-yaml 3.12-1build2 amd64 +python-wcwidth 0.1.8+dfsg1-3 all +python-webencodings 0.5.1-1ubuntu1 all +python-xdg 0.26-1ubuntu1 all +python-xlib 0.23-2build1 all +python-yaml 5.3.1-1 amd64 -python2.7 2.7.17-1~18.04ubuntu1 amd64 -python2.7-minimal 2.7.17-1~18.04ubuntu1 amd64 +python2.7 2.7.18~rc1-2 amd64 +python2.7-minimal 2.7.18~rc1-2 amd64 -python3-apparmor 2.12-4ubuntu5.1 amd64 -python3-apport 2.20.9-0ubuntu7.15 all +python3-apparmor 2.13.3-7ubuntu5.1 amd64 +python3-appdirs 1.4.3-2.1 all +python3-apport 2.20.11-0ubuntu27.4 all +python3-atomicwrites 1.1.5-2build1 all +python3-backcall 0.1.0-2 all +python3-blinker 1.4+dfsg1-0.3ubuntu1 all -python3-bs4 4.6.0-1 all +python3-bs4 4.8.2-1 all +python3-caja 1.24.0-2 amd64 +python3-compizconfig 1:0.9.14.1+20.04.20200211-0ubuntu1 amd64 +python3-distlib 0.3.0-1 all -python3-flake8 3.5.0-1 all -python3-gdbm 3.6.9-1~18.04 amd64 +python3-entrypoints 0.3-2ubuntu1 all +python3-filelock 3.0.12-2 all +python3-flake8 3.7.9-2 all +python3-gdbm 3.8.2-1ubuntu1 amd64 +python3-hamcrest 1.9.0-3 all +python3-importlib-metadata 1.5.0-1 all -python3-ipython 5.5.0-1 all +python3-iniparse 0.4-3 all +python3-ipython 7.13.0-1 all +python3-jedi 0.15.2-1 all -python3-keyring 10.6.0-1 all +python3-jwt 1.7.1-2ubuntu2 all +python3-keyring 18.0.1-2ubuntu1 all +python3-launchpadlib 1.10.13-1 all +python3-lazr.restfulclient 0.14.2-2build1 all +python3-lazr.uri 1.0.3-4build1 all -python3-lib2to3 3.6.9-1~18.04 all +python3-lib2to3 3.8.2-1ubuntu1 all -python3-louis 3.5.0-1ubuntu0.3 all +python3-libvirt 6.1.0-1 amd64 +python3-libxml2 2.9.10+dfsg-5 amd64 +python3-louis 3.12.0-3 all -python3-mako 1.0.7+ds1-1 all +python3-mako 1.1.0+ds1-1ubuntu2 all +python3-more-itertools 4.2.0-1build1 all +python3-oauthlib 3.1.0-1ubuntu2 all +python3-packaging 20.3-1 all +python3-parso 0.5.2-1ubuntu1 all -python3-pluggy 0.6.0-1 all +python3-pluggy 0.13.0-2 all -python3-prompt-toolkit 1.0.15-1 all +python3-prompt-toolkit 2.0.10-2 all -python3-pycodestyle 2.3.1-2 all +python3-pycodestyle 2.5.0-2 all +python3-pyparsing 2.4.6-1 all -python3-pytest 3.3.2-2 all +python3-pytest 4.6.9-1 all -python3-reportlab 3.4.0-3ubuntu0.1 all +python3-reportlab 3.5.34-1ubuntu1 all +python3-simplejson 3.16.0-2ubuntu2 amd64 +python3-soupsieve 1.9.5+dfsg-1 all -python3-twisted 17.9.0-2ubuntu0.1 all +python3-twisted 18.9.0-11 all -python3-virtualenv 15.1.0+ds-1.1 all +python3-urwid 2.0.1-3 amd64 +python3-virtualenv 20.0.17-1 all +python3-wadllib 1.3.3-3build1 all +python3-zipp 1.0.0-1 all -qasmixer 0.21.0-1.1 amd64 +qasmixer 0.22.0-1build1 amd64 -qemu-block-extra 1:2.11+dfsg-1ubuntu7.28 amd64 -qemu-kvm 1:2.11+dfsg-1ubuntu7.28 amd64 -qemu-system-common 1:2.11+dfsg-1ubuntu7.28 amd64 -qemu-system-x86 1:2.11+dfsg-1ubuntu7.28 amd64 -qemu-utils 1:2.11+dfsg-1ubuntu7.28 amd64 -qml-module-org-kde-games-core 4:17.12.3-0ubuntu1 amd64 +qemu-block-extra 1:4.2-3ubuntu6.3 amd64 +qemu-kvm 1:4.2-3ubuntu6.3 amd64 +qemu-system-common 1:4.2-3ubuntu6.3 amd64 +qemu-system-data 1:4.2-3ubuntu6.3 all +qemu-system-x86 1:4.2-3ubuntu6.3 amd64 +qemu-utils 1:4.2-3ubuntu6.3 amd64 +qml-module-org-kde-games-core 4:19.12.3-1ubuntu1 amd64 +qml-module-org-kde-kirigami2 5.68.0-0ubuntu2 amd64 +qml-module-org-kde-kquickcontrolsaddons 5.68.0-0ubuntu2 amd64 +qml-module-org-kde-newstuff 5.68.0-0ubuntu2 amd64 -qml-module-qtmultimedia 5.9.5-0ubuntu1 amd64 +qml-module-qtmultimedia 5.12.8-0ubuntu1 amd64 +qml-module-qtqml-models2 5.12.8-0ubuntu1 amd64 +qml-module-qtquick-controls2 5.12.8+dfsg-0ubuntu1 amd64 +qml-module-qtquick-templates2 5.12.8+dfsg-0ubuntu1 amd64 -qpdf 8.0.2-3 amd64 +qpdf 9.1.1-1build1 amd64 -redshift 1.11-1ubuntu1mint1 amd64 -redshift-gtk 1.11-1ubuntu1mint1 all +redshift 1.12-linuxmint2 amd64 +redshift-gtk 1.12-linuxmint2 all -rlwrap 0.43-1 amd64 +rlwrap 0.43-1build3 amd64 -ruby 1:2.5.1 amd64 +ruby 1:2.7+1 amd64 +ruby-xmlrpc 0.3.0-2 all +ruby2.7 2.7.0-5ubuntu1.1 amd64 -rygel 0.36.1-1 amd64 -rygel-playbin 0.36.1-1 amd64 -rygel-tracker 0.36.1-1 amd64 -s-nail 14.9.6-3 amd64 +rygel 0.38.3-1ubuntu1 amd64 +rygel-playbin 0.38.3-1ubuntu1 amd64 +rygel-tracker 0.38.3-1ubuntu1 amd64 +s-nail 14.9.15-1 amd64 -sane-utils 1.0.27-1~experimental3ubuntu2.2 amd64 +sane-utils 1.0.29-0ubuntu5 amd64 -screen 4.6.2-1ubuntu1 amd64 +screen 4.8.0-1 amd64 -seahorse 3.20.0-5 amd64 +seahorse 3.36-1 amd64 -sgabios 0.0~svn8-4 all -shotwell 0.28.4-0ubuntu2 amd64 +shotwell 0.30.10-0ubuntu0.1 amd64 -simple-scan 3.28.0-0ubuntu1 amd64 +simple-scan 3.36.0-0ubuntu1 amd64 -sleuthkit 4.4.2-3 amd64 -slick-greeter 1.3.2+tricia amd64 +sleuthkit 4.6.7-1build1 amd64 +slick-greeter 1.4.1+ulyana amd64 -smartmontools 6.5+svn4324-1 amd64 +smartmontools 7.1-1build1 amd64 -speedometer 2.8-2 all +speedometer 2.8-3 all -ssh-import-id 5.7-0ubuntu1.1 all +ssh-import-id 5.10-0ubuntu1 all -strace 4.21-1ubuntu1 amd64 +strace 5.5-3ubuntu1 amd64 -supermin 5.1.19-2ubuntu1 amd64 +supermin 5.1.20-2ubuntu1 amd64 -systemtap 3.1-3ubuntu0.1 amd64 -systemtap-common 3.1-3ubuntu0.1 all -systemtap-runtime 3.1-3ubuntu0.1 amd64 +systemtap 4.2-3 amd64 +systemtap-common 4.2-3 all +systemtap-runtime 4.2-3 amd64 -thermald 1.7.0-5ubuntu5 amd64 -thunderbird 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-gnome-support 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-locale-de 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-locale-en 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 +thermald 1.9.1-1ubuntu0.2 amd64 +thunderbird 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-gnome-support 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-locale-de 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-locale-en 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 -thunderbird-locale-es 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 +thunderbird-locale-es 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 -thunderbird-locale-fr 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-locale-pl 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-locale-ru 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-locale-uk 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -thunderbird-locale-vi 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 +thunderbird-locale-fr 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-locale-pl 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-locale-ru 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-locale-uk 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +thunderbird-locale-vi 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 -tmux 2.6-3ubuntu0.2 amd64 +timgm6mb-soundfont 1.3-3 all +tmux 3.0a-2 amd64 +tpm-udev 0.4 all -transmission-common 2.92-3ubuntu2 all -transmission-gtk 2.92-3ubuntu2 amd64 -tshark 2.6.10-1~ubuntu18.04.0 amd64 +transmission-common 2.94-2ubuntu3 all +transmission-gtk 2.94-2ubuntu3 amd64 +tshark 3.2.3-1 amd64 -ubuntu-wallpapers 18.04.1-0ubuntu1 all +ubuntu-wallpapers 20.04.2-0ubuntu1 all +ubuntu-wallpapers-focal 20.04.2-0ubuntu1 all -ulogd2 2.0.5-5 amd64 -ulogd2-json 2.0.5-5 amd64 -ulogd2-mysql 2.0.5-5 amd64 -ulogd2-pcap 2.0.5-5 amd64 -ulogd2-pgsql 2.0.5-5 amd64 -ulogd2-sqlite3 2.0.5-5 amd64 +ulogd2 2.0.7-1build1 amd64 +ulogd2-json 2.0.7-1build1 amd64 +ulogd2-mysql 2.0.7-1build1 amd64 +ulogd2-pcap 2.0.7-1build1 amd64 +ulogd2-pgsql 2.0.7-1build1 amd64 +ulogd2-sqlite3 2.0.7-1build1 amd64 -unrar 1:5.5.8-1 amd64 +unrar 1:5.6.6-2build1 amd64 +usb.ids 2020.03.19-1 all -usbutils 1:007-4build1 amd64 +usbutils 1:012-2 amd64 -util-linux 2.31.1-0.4ubuntu3.6 amd64 +util-linux 2.34-0.1ubuntu9 amd64 -va-driver-all 2.1.0-3 amd64 -variety 0.6.7-1 all -vde2 2.3.2+r586-2.1build1 amd64 -vim 2:8.0.1453-1ubuntu1.3 amd64 +va-driver-all 2.7.0-2 amd64 +variety 0.8.3-1 all +vde2 2.3.2+r586-2.2build1 amd64 +vim 2:8.1.2269-1ubuntu5 amd64 -vim-common 2:8.0.1453-1ubuntu1.3 all -vim-gtk3 2:8.0.1453-1ubuntu1.3 amd64 -vim-gui-common 2:8.0.1453-1ubuntu1.3 all +vim-common 2:8.1.2269-1ubuntu5 all +vim-gtk3 2:8.1.2269-1ubuntu5 amd64 +vim-gui-common 2:8.1.2269-1ubuntu5 all -vim-runtime 2:8.0.1453-1ubuntu1.3 all +vim-runtime 2:8.1.2269-1ubuntu5 all -vim-tiny 2:8.0.1453-1ubuntu1.3 amd64 +vim-tiny 2:8.1.2269-1ubuntu5 amd64 -vino 3.22.0-3ubuntu1 amd64 -virt-manager 1:1.5.1-0ubuntu1.2 all -virt-viewer 6.0-2 amd64 -virtinst 1:1.5.1-0ubuntu1.2 all +vino 3.22.0-5ubuntu2 amd64 +virt-manager 1:2.2.1-3ubuntu2 all +virt-viewer 7.0-2build1 amd64 +virtinst 1:2.2.1-3ubuntu2 all -vlc 3.0.8-0ubuntu18.04.1 amd64 -vlc-bin 3.0.8-0ubuntu18.04.1 amd64 -vlc-data 3.0.8-0ubuntu18.04.1 all +vlc 3.0.9.2-1 amd64 +vlc-bin 3.0.9.2-1 amd64 +vlc-data 3.0.9.2-1 all -vlc-plugin-base 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-notify 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-qt 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-samba 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-skins2 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-video-output 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-video-splitter 3.0.8-0ubuntu18.04.1 amd64 -vlc-plugin-visualization 3.0.8-0ubuntu18.04.1 amd64 +vlc-plugin-base 3.0.9.2-1 amd64 +vlc-plugin-notify 3.0.9.2-1 amd64 +vlc-plugin-qt 3.0.9.2-1 amd64 +vlc-plugin-samba 3.0.9.2-1 amd64 +vlc-plugin-skins2 3.0.9.2-1 amd64 +vlc-plugin-video-output 3.0.9.2-1 amd64 +vlc-plugin-video-splitter 3.0.9.2-1 amd64 +vlc-plugin-visualization 3.0.9.2-1 amd64 -wdiff 1.2.2-2 amd64 +wdiff 1.2.2-2build1 amd64 -wget 1.19.4-1ubuntu2.2 amd64 -whiptail 0.52.20-1ubuntu1 amd64 +wget 1.20.3-1ubuntu1 amd64 +whiptail 0.52.21-4ubuntu2 amd64 -wireshark 2.6.10-1~ubuntu18.04.0 amd64 -wireshark-common 2.6.10-1~ubuntu18.04.0 amd64 -wireshark-qt 2.6.10-1~ubuntu18.04.0 amd64 +wireshark 3.2.3-1 amd64 +wireshark-common 3.2.3-1 amd64 +wireshark-qt 3.2.3-1 amd64 +wmdocker 1.5-2 amd64 -wpasupplicant 2:2.6-15ubuntu2.5 amd64 +wpasupplicant 2:2.9-1ubuntu4.1 amd64 -x11-apps 7.7+6ubuntu1 amd64 +x11-apps 7.7+8 amd64 -xbrlapi 5.5-4ubuntu2.0.1 amd64 +xbrlapi 6.0+dfsg-4ubuntu6 amd64 -xdg-desktop-portal 1.0.3-0ubuntu0.2 amd64 -xdg-desktop-portal-gtk 1.0.2-0ubuntu1.1 amd64 +xdg-dbus-proxy 0.1.2-1 amd64 +xdg-desktop-portal 1.6.0-1 amd64 +xdg-desktop-portal-gtk 1.6.0-1build1 amd64 -xfsprogs 4.9.0+nmu1ubuntu2 amd64 +xfsprogs 5.3.0-1ubuntu2 amd64 -xorg 1:7.7+19ubuntu7.1 amd64 +xorg 1:7.7+19ubuntu14 amd64 -xreader 2.4.4+tricia amd64 +xreader 2.6.4+ulyana amd64 -xreader-dbg 2.4.4+tricia amd64 +xreader-dbg 2.6.4+ulyana amd64 -xserver-xephyr-hwe-18.04 2:1.20.8-2ubuntu2.2~18.04.1 amd64 +xserver-xephyr 2:1.20.8-2ubuntu2.2 amd64 +xserver-xephyr-hwe-18.04 3:14.5 amd64 -xserver-xorg-video-all-hwe-18.04 1:7.7+19ubuntu8~18.04.3 amd64 -xserver-xorg-video-amdgpu-hwe-18.04 19.1.0-1~18.04.1 amd64 -xserver-xorg-video-ati-hwe-18.04 1:19.1.0-1~18.04.1 amd64 -xserver-xorg-video-fbdev-hwe-18.04 1:0.5.0-1ubuntu1~18.04.1 amd64 -xserver-xorg-video-intel-hwe-18.04 2:2.99.917+git20171229-1ubuntu1~18.04.1 amd64 -xserver-xorg-video-nouveau-hwe-18.04 1:1.0.16-1~18.04.1 amd64 -xserver-xorg-video-qxl-hwe-18.04 0.1.5-2build2~18.04.1 amd64 -xserver-xorg-video-radeon-hwe-18.04 1:19.1.0-1~18.04.1 amd64 -xserver-xorg-video-vesa-hwe-18.04 1:2.4.0-1~18.04.1 amd64 -xserver-xorg-video-vmware-hwe-18.04 1:13.3.0-2build1~18.04.1 amd64 +xserver-xorg-video-all 1:7.7+19ubuntu14 amd64 +xserver-xorg-video-all-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-amdgpu 19.1.0-1 amd64 +xserver-xorg-video-amdgpu-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-ati 1:19.1.0-1 amd64 +xserver-xorg-video-ati-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-fbdev 1:0.5.0-1ubuntu1 amd64 +xserver-xorg-video-fbdev-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-intel 2:2.99.917+git20200226-1 amd64 +xserver-xorg-video-intel-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-nouveau 1:1.0.16-1 amd64 +xserver-xorg-video-nouveau-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-qxl 0.1.5+git20200331-1 amd64 +xserver-xorg-video-qxl-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-radeon 1:19.1.0-1 amd64 +xserver-xorg-video-radeon-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-vesa 1:2.4.0-2 amd64 +xserver-xorg-video-vesa-hwe-18.04 3:14.5 amd64 +xserver-xorg-video-vmware 1:13.3.0-3 amd64 +xserver-xorg-video-vmware-hwe-18.04 3:14.5 amd64 -xul-ext-lightning 1:68.10.0+build1-0ubuntu0.18.04.1 amd64 -xviewer 2.4.3+tricia amd64 -xviewer-dbg 2.4.3+tricia amd64 -xviewer-plugins 1.2.0+tara amd64 -xwayland-hwe-18.04 2:1.20.8-2ubuntu2.2~18.04.1 amd64 +xul-ext-lightning 1:68.10.0+build1-0ubuntu0.20.04.1 amd64 +xviewer 2.6.2+ulyana amd64 +xviewer-dbg 2.6.2+ulyana amd64 +xviewer-plugins 1.2.0+ulyana amd64 +xwayland 2:1.20.8-2ubuntu2.2 amd64 +xwayland-hwe-18.04 3:14.5 amd64 -yelp 3.26.0-1ubuntu2mint1 amd64 +yelp 3.36.0-linuxmint1 amd64 -zfs-zed 0.7.5-1ubuntu16.9 amd64 -zfsutils-linux 0.7.5-1ubuntu16.9 amd64 +zfs-zed 0.8.3-1ubuntu12.2 amd64 +zfsutils-linux 0.8.3-1ubuntu12.2 amd64 --- diff --git a/.etckeeper b/.etckeeper index d1d848a..9f1666f 100755 --- a/.etckeeper +++ b/.etckeeper @@ -16,6 +16,7 @@ mkdir -p './brltty/Input/xw' mkdir -p './cups/interfaces' mkdir -p './cups/ssl' mkdir -p './dbus-1/session.d' +mkdir -p './dconf/db' mkdir -p './glvnd/egl_vendor.d' mkdir -p './gss/mech.d' mkdir -p './guest-session' @@ -38,6 +39,7 @@ mkdir -p './libvirt/secrets' mkdir -p './mate-settings-daemon/xrandr' mkdir -p './molly-guard/messages.d' mkdir -p './mono/certstore' +mkdir -p './mono/registry/LocalMachine' mkdir -p './network/interfaces.d' mkdir -p './networkd-dispatcher/carrier.d' mkdir -p './networkd-dispatcher/degraded.d' @@ -229,6 +231,7 @@ maybe chmod 0644 'aliases' maybe chmod 0644 'aliases.db' maybe chmod 0755 'alsa' maybe chmod 0755 'alsa/conf.d' +maybe chmod 0644 'alsa/conf.d/99-pulseaudio-default.conf.example' maybe chmod 0755 'alternatives' maybe chmod 0644 'alternatives/README' maybe chmod 0644 'anacrontab' @@ -579,7 +582,6 @@ maybe chmod 0644 'bash_completion.d/apport_completion' maybe chmod 0644 'bash_completion.d/apt-linux-mint' maybe chmod 0644 'bash_completion.d/dkms' maybe chmod 0644 'bash_completion.d/git-prompt' -maybe chmod 0644 'bash_completion.d/grub' maybe chgrp 'bind' 'bind' maybe chmod 2755 'bind' maybe chmod 0644 'bind/bind.keys' @@ -625,6 +627,9 @@ maybe chmod 0644 'brltty/Contraction/af.ctb' maybe chmod 0644 'brltty/Contraction/am.ctb' maybe chmod 0644 'brltty/Contraction/countries.cti' maybe chmod 0644 'brltty/Contraction/de-basis.ctb' +maybe chmod 0644 'brltty/Contraction/de-kurzschrift-1998.ctb' +maybe chmod 0644 'brltty/Contraction/de-kurzschrift-2015.ctb' +maybe chmod 0644 'brltty/Contraction/de-kurzschrift-wort.cti' maybe chmod 0644 'brltty/Contraction/de-kurzschrift.ctb' maybe chmod 0644 'brltty/Contraction/de-vollschrift.ctb' maybe chmod 0644 'brltty/Contraction/en-ueb-g2.ctb' @@ -641,6 +646,7 @@ maybe chmod 0644 'brltty/Contraction/ko-g2.ctb' maybe chmod 0644 'brltty/Contraction/ko.ctb' maybe chmod 0755 'brltty/Contraction/latex-access.ctb' maybe chmod 0644 'brltty/Contraction/letters-latin.cti' +maybe chmod 0644 'brltty/Contraction/lt.ctb' maybe chmod 0644 'brltty/Contraction/mg.ctb' maybe chmod 0644 'brltty/Contraction/mun.ctb' maybe chmod 0644 'brltty/Contraction/nabcc.cti' @@ -648,6 +654,7 @@ maybe chmod 0644 'brltty/Contraction/nl.ctb' maybe chmod 0644 'brltty/Contraction/ny.ctb' maybe chmod 0644 'brltty/Contraction/pt.ctb' maybe chmod 0644 'brltty/Contraction/si.ctb' +maybe chmod 0644 'brltty/Contraction/spaces.cti' maybe chmod 0644 'brltty/Contraction/sw.ctb' maybe chmod 0644 'brltty/Contraction/th.ctb' maybe chmod 0644 'brltty/Contraction/zh-tw-ucb.ctb' @@ -683,6 +690,7 @@ maybe chmod 0755 'brltty/Input/bl' maybe chmod 0644 'brltty/Input/bl/18.txt' maybe chmod 0644 'brltty/Input/bl/40_m20_m40.txt' maybe chmod 0755 'brltty/Input/bm' +maybe chmod 0644 'brltty/Input/bm/b2g.ktb' maybe chmod 0644 'brltty/Input/bm/b9b10.kti' maybe chmod 0644 'brltty/Input/bm/b9b11b10.kti' maybe chmod 0644 'brltty/Input/bm/command.kti' @@ -703,6 +711,7 @@ maybe chmod 0644 'brltty/Input/bm/pro.ktb' maybe chmod 0644 'brltty/Input/bm/pronto.ktb' maybe chmod 0644 'brltty/Input/bm/pv.ktb' maybe chmod 0644 'brltty/Input/bm/rb.ktb' +maybe chmod 0644 'brltty/Input/bm/routing.kti' maybe chmod 0644 'brltty/Input/bm/routing6.kti' maybe chmod 0644 'brltty/Input/bm/routing7.kti' maybe chmod 0644 'brltty/Input/bm/status.kti' @@ -775,6 +784,7 @@ maybe chmod 0644 'brltty/Input/hm/scroll.kti' maybe chmod 0644 'brltty/Input/hm/sync.ktb' maybe chmod 0755 'brltty/Input/ht' maybe chmod 0644 'brltty/Input/ht/ab40.ktb' +maybe chmod 0644 'brltty/Input/ht/ac4.ktb' maybe chmod 0644 'brltty/Input/ht/alo.ktb' maybe chmod 0644 'brltty/Input/ht/as40.ktb' maybe chmod 0644 'brltty/Input/ht/bb.ktb' @@ -797,10 +807,21 @@ maybe chmod 0644 'brltty/Input/ht/me88.ktb' maybe chmod 0644 'brltty/Input/ht/rockers.kti' maybe chmod 0644 'brltty/Input/ht/wave.ktb' maybe chmod 0755 'brltty/Input/hw' +maybe chmod 0644 'brltty/Input/hw/B80.ktb' +maybe chmod 0644 'brltty/Input/hw/BI14.ktb' +maybe chmod 0644 'brltty/Input/hw/BI32.ktb' +maybe chmod 0644 'brltty/Input/hw/BI40.ktb' +maybe chmod 0644 'brltty/Input/hw/braille.kti' +maybe chmod 0644 'brltty/Input/hw/command.kti' +maybe chmod 0644 'brltty/Input/hw/joystick.kti' maybe chmod 0644 'brltty/Input/hw/kbd.kti' maybe chmod 0644 'brltty/Input/hw/mb1.ktb' maybe chmod 0644 'brltty/Input/hw/mb2.ktb' maybe chmod 0644 'brltty/Input/hw/nav.kti' +maybe chmod 0644 'brltty/Input/hw/thumb.kti' +maybe chmod 0644 'brltty/Input/hw/touch.ktb' +maybe chmod 0755 'brltty/Input/ic' +maybe chmod 0644 'brltty/Input/ic/all.ktb' maybe chmod 0755 'brltty/Input/ir' maybe chmod 0644 'brltty/Input/ir/all.kti' maybe chmod 0644 'brltty/Input/ir/brl.ktb' @@ -923,6 +944,7 @@ maybe chmod 0644 'brltty/Keyboard/kp_speak.kti' maybe chmod 0644 'brltty/Keyboard/laptop.ktb' maybe chmod 0644 'brltty/Keyboard/sun_type6.ktb' maybe chmod 0755 'brltty/Text' +maybe chmod 0644 'brltty/Text/alias.tti' maybe chmod 0644 'brltty/Text/ar.ttb' maybe chmod 0644 'brltty/Text/as.ttb' maybe chmod 0644 'brltty/Text/ascii-basic.tti' @@ -1029,6 +1051,7 @@ maybe chmod 0644 'brltty/Text/ru.ttb' maybe chmod 0644 'brltty/Text/sa.ttb' maybe chmod 0644 'brltty/Text/sat.ttb' maybe chmod 0644 'brltty/Text/sd.ttb' +maybe chmod 0644 'brltty/Text/se.ttb' maybe chmod 0644 'brltty/Text/sk.ttb' maybe chmod 0644 'brltty/Text/sl.ttb' maybe chmod 0644 'brltty/Text/spaces.tti' @@ -1041,7 +1064,9 @@ maybe chmod 0644 'brltty/Text/tamil.tti' maybe chmod 0644 'brltty/Text/te.ttb' maybe chmod 0644 'brltty/Text/telugu.tti' maybe chmod 0644 'brltty/Text/tr.ttb' +maybe chmod 0644 'brltty/Text/uk.ttb' maybe chmod 0644 'brltty/Text/vi.ttb' +maybe chmod 0644 'brltty/Text/win-1252.tti' maybe chmod 0755 'byobu' maybe chmod 0644 'byobu/backend' maybe chmod 0644 'byobu/socketdir' @@ -1119,7 +1144,6 @@ maybe chmod 0755 'cron.d' maybe chmod 0644 'cron.d/.placeholder' maybe chmod 0644 'cron.d/anacron' maybe chmod 0644 'cron.d/e2scrub_all' -maybe chmod 0644 'cron.d/mdadm' maybe chmod 0644 'cron.d/timeshift-hourly' maybe chmod 0644 'cron.d/zfsutils-linux' maybe chmod 0755 'cron.daily' @@ -1134,9 +1158,7 @@ maybe chmod 0755 'cron.daily/dpkg' maybe chmod 0755 'cron.daily/etckeeper' maybe chmod 0755 'cron.daily/logrotate' maybe chmod 0755 'cron.daily/man-db' -maybe chmod 0755 'cron.daily/mdadm' maybe chmod 0755 'cron.daily/mlocate' -maybe chmod 0755 'cron.daily/passwd' maybe chmod 0755 'cron.daily/samba' maybe chmod 0755 'cron.daily/update-notifier-common' maybe chmod 0755 'cron.hourly' @@ -1249,20 +1271,14 @@ maybe chmod 0644 'dbus-1/system.d/dnsmasq.conf' maybe chmod 0644 'dbus-1/system.d/gdm.conf' maybe chmod 0644 'dbus-1/system.d/kerneloops.conf' maybe chmod 0644 'dbus-1/system.d/net.hadess.SensorProxy.conf' -maybe chmod 0644 'dbus-1/system.d/nm-dispatcher.conf' maybe chmod 0644 'dbus-1/system.d/org.debian.apt.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.Accounts.conf' -maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ColorManager.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.DisplayManager.conf' -maybe chmod 0644 'dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.GeoClue2.Agent.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.GeoClue2.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ModemManager1.conf' -maybe chmod 0644 'dbus-1/system.d/org.freedesktop.NetworkManager.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.PackageKit.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf' -maybe chmod 0644 'dbus-1/system.d/org.freedesktop.bolt.conf' -maybe chmod 0644 'dbus-1/system.d/org.freedesktop.fwupd.conf' maybe chmod 0644 'dbus-1/system.d/org.freedesktop.thermald.conf' maybe chmod 0644 'dbus-1/system.d/org.kde.auth.conf' maybe chmod 0644 'dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf' @@ -1273,6 +1289,8 @@ maybe chmod 0644 'dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf' maybe chmod 0644 'dbus-1/system.d/pulseaudio-system.conf' maybe chmod 0644 'dbus-1/system.d/smart-notifier.conf' maybe chmod 0644 'dbus-1/system.d/wpa_supplicant.conf' +maybe chmod 0755 'dconf' +maybe chmod 0755 'dconf/db' maybe chmod 0644 'debconf.conf' maybe chmod 0644 'debian_version' maybe chmod 0755 'default' @@ -1301,12 +1319,11 @@ maybe chmod 0644 'default/grub' maybe chmod 0755 'default/grub.d' maybe chmod 0644 'default/grub.d/50_linuxmint.cfg' maybe chmod 0644 'default/grub.d/60_mint-theme.cfg' +maybe chmod 0644 'default/grub.d/init-select.cfg' maybe chmod 0644 'default/hddtemp' maybe chmod 0644 'default/im-config' maybe chmod 0644 'default/intel-microcode' maybe chmod 0644 'default/irqbalance' -maybe chmod 0755 'default/kdm.d' -maybe chmod 0644 'default/kdm.d/10_desktop-base' maybe chmod 0644 'default/kerneloops' maybe chmod 0644 'default/keyboard' maybe chmod 0644 'default/libvirt-guests' @@ -1316,6 +1333,7 @@ maybe chmod 0644 'default/locale' maybe chmod 0644 'default/mdadm' maybe chmod 0644 'default/motd-news' maybe chmod 0644 'default/mysql' +maybe chmod 0644 'default/named' maybe chmod 0644 'default/netfilter-persistent' maybe chmod 0644 'default/networkd-dispatcher' maybe chmod 0644 'default/networking' @@ -1458,7 +1476,6 @@ maybe chmod 0644 'etckeeper/update-ignore.d/README' maybe chmod 0755 'etckeeper/vcs.d' maybe chmod 0755 'etckeeper/vcs.d/50vcs-cmd' maybe chmod 0644 'ethertypes' -maybe chmod 0644 'ffserver.conf' maybe chmod 0755 'firefox' maybe chmod 0755 'firefox/pref' maybe chmod 0644 'firefox/pref/apturl.js' @@ -1576,7 +1593,9 @@ maybe chmod 0644 'fwupd/remotes.d/lvfs-testing.conf' maybe chmod 0644 'fwupd/remotes.d/lvfs.conf' maybe chmod 0644 'fwupd/remotes.d/vendor-directory.conf' maybe chmod 0644 'fwupd/remotes.d/vendor.conf' +maybe chmod 0644 'fwupd/thunderbolt.conf' maybe chmod 0644 'fwupd/uefi.conf' +maybe chmod 0644 'fwupd/upower.conf' maybe chmod 0644 'g15daemon.conf' maybe chmod 0644 'gai.conf' maybe chmod 0755 'gconf' @@ -1653,6 +1672,7 @@ maybe chmod 0755 'grub.d' maybe chmod 0755 'grub.d/00_header' maybe chmod 0755 'grub.d/05_debian_theme' maybe chmod 0755 'grub.d/10_linux' +maybe chmod 0755 'grub.d/10_linux_zfs' maybe chmod 0755 'grub.d/20_linux_xen' maybe chmod 0755 'grub.d/20_memtest86+' maybe chmod 0755 'grub.d/30_os-prober' @@ -1937,6 +1957,7 @@ maybe chmod 0644 'hdparm.conf' maybe chmod 0755 'highlight' maybe chmod 0644 'highlight/filetypes.conf' maybe chmod 0644 'host.conf' +maybe chmod 0644 'hostid' maybe chmod 0644 'hostname' maybe chmod 0644 'hosts' maybe chmod 0644 'hosts.allow' @@ -1957,7 +1978,6 @@ maybe chmod 0755 'init.d/apparmor' maybe chmod 0755 'init.d/apport' maybe chmod 0755 'init.d/atd' maybe chmod 0755 'init.d/avahi-daemon' -maybe chmod 0755 'init.d/bind9' maybe chmod 0755 'init.d/bluetooth' maybe chmod 0755 'init.d/cgroupfs-mount' maybe chmod 0755 'init.d/chrony' @@ -1982,12 +2002,10 @@ maybe chmod 0755 'init.d/kmod' maybe chmod 0755 'init.d/lightdm' maybe chmod 0755 'init.d/lm-sensors' maybe chmod 0755 'init.d/lvm2' -maybe chmod 0755 'init.d/lvm2-lvmetad' maybe chmod 0755 'init.d/lvm2-lvmpolld' -maybe chmod 0755 'init.d/mdadm' -maybe chmod 0755 'init.d/mdadm-waitidle' maybe chmod 0755 'init.d/mintsystem' maybe chmod 0755 'init.d/mysql' +maybe chmod 0755 'init.d/named' maybe chmod 0755 'init.d/netfilter-persistent' maybe chmod 0755 'init.d/network-manager' maybe chmod 0755 'init.d/networking' @@ -2016,8 +2034,11 @@ maybe chmod 0755 'init.d/ulogd2' maybe chmod 0755 'init.d/uuidd' maybe chmod 0755 'init.d/winbind' maybe chmod 0755 'init.d/x11-common' +maybe chmod 0755 'init.d/zfs-import' +maybe chmod 0755 'init.d/zfs-mount' +maybe chmod 0755 'init.d/zfs-share' +maybe chmod 0755 'init.d/zfs-zed' maybe chmod 0644 'init/lightdm.conf' -maybe chmod 0644 'init/ulogd2.conf' maybe chmod 0755 'initramfs-tools' maybe chmod 0755 'initramfs-tools/conf.d' maybe chmod 0755 'initramfs-tools/hooks' @@ -2227,16 +2248,19 @@ maybe chmod 0755 'logcheck' maybe chmod 0755 'logcheck/ignore.d.paranoid' maybe chmod 0644 'logcheck/ignore.d.paranoid/cracklib-runtime' maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_1' +maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_3' maybe chmod 0755 'logcheck/ignore.d.server' maybe chmod 0644 'logcheck/ignore.d.server/gpg-agent' maybe chmod 0644 'logcheck/ignore.d.server/hddtemp' maybe chmod 0644 'logcheck/ignore.d.server/libsasl2-modules' maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_1' +maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_3' maybe chmod 0644 'logcheck/ignore.d.server/mdadm' maybe chmod 0644 'logcheck/ignore.d.server/ntpdate' maybe chmod 0644 'logcheck/ignore.d.server/rsyslog' maybe chmod 0755 'logcheck/ignore.d.workstation' maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_1' +maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_3' maybe chmod 0755 'logcheck/violations.d' maybe chmod 0644 'logcheck/violations.d/mdadm' maybe chmod 0644 'login.defs' @@ -2246,6 +2270,7 @@ maybe chmod 0644 'logrotate.d/alternatives' maybe chmod 0644 'logrotate.d/apport' maybe chmod 0644 'logrotate.d/apt' maybe chmod 0644 'logrotate.d/aptitude' +maybe chmod 0644 'logrotate.d/bootlog' maybe chmod 0644 'logrotate.d/btmp' maybe chmod 0644 'logrotate.d/chrony' maybe chmod 0644 'logrotate.d/ctdb' @@ -2285,6 +2310,7 @@ maybe chmod 0644 'lvm/profile/lvmdbusd.profile' maybe chmod 0644 'lvm/profile/metadata_profile_template.profile' maybe chmod 0644 'lvm/profile/thin-generic.profile' maybe chmod 0644 'lvm/profile/thin-performance.profile' +maybe chmod 0644 'lvm/profile/vdo-small.profile' maybe chmod 0444 'machine-id' maybe chmod 0644 'magic' maybe chmod 0644 'magic.mime' @@ -2352,6 +2378,8 @@ maybe chmod 0644 'mono/4.5/web.config' maybe chmod 0644 'mono/browscap.ini' maybe chmod 0755 'mono/certstore' maybe chmod 0644 'mono/config' +maybe chmod 0755 'mono/registry' +maybe chmod 0755 'mono/registry/LocalMachine' maybe chmod 0644 'motd.tail.bruni' maybe chmod 0644 'motd.tail.nadja' maybe chmod 0755 'mplayer' @@ -2479,6 +2507,7 @@ maybe chmod 0644 'pam.d/runuser-l' maybe chmod 0644 'pam.d/samba' maybe chmod 0644 'pam.d/sshd' maybe chmod 0644 'pam.d/su' +maybe chmod 0644 'pam.d/su-l' maybe chmod 0644 'pam.d/sudo' maybe chmod 0644 'pam.d/systemd-user' maybe chmod 0644 'papersize' @@ -2525,7 +2554,6 @@ maybe chmod 0644 'postfix/generic' maybe chmod 0644 'postfix/generic.db' maybe chmod 0644 'postfix/main.cf' maybe chmod 0644 'postfix/main.cf.proto' -maybe chmod 0644 'postfix/makedefs.out' maybe chmod 0644 'postfix/master.cf' maybe chmod 0644 'postfix/master.cf.proto' maybe chmod 0755 'postfix/post-install' @@ -2585,8 +2613,11 @@ maybe chown 'frank' 'profile.d/fbrehm.sh' maybe chgrp 'users' 'profile.d/fbrehm.sh' maybe chmod 0644 'profile.d/fbrehm.sh' maybe chmod 0644 'profile.d/flatpak.sh' +maybe chmod 0644 'profile.d/gawk.csh' +maybe chmod 0644 'profile.d/gawk.sh' maybe chmod 0644 'profile.d/libvirt-uri.sh' maybe chmod 0644 'profile.d/vte-2.91.sh' +maybe chmod 0644 'profile.d/vte.csh' maybe chmod 0644 'profile.d/xdg_dirs_desktop_session.sh' maybe chmod 0644 'protocols' maybe chmod 0755 'pulse' @@ -2671,6 +2702,7 @@ maybe chmod 0644 'sane.d/epjitsu.conf' maybe chmod 0644 'sane.d/epson.conf' maybe chmod 0644 'sane.d/epson2.conf' maybe chmod 0644 'sane.d/epsonds.conf' +maybe chmod 0644 'sane.d/escl.conf' maybe chmod 0644 'sane.d/fujitsu.conf' maybe chmod 0644 'sane.d/genesys.conf' maybe chmod 0644 'sane.d/gphoto2.conf' @@ -2728,7 +2760,6 @@ maybe chmod 0644 'sane.d/xerox_mfp.conf' maybe chmod 0755 'sasl2' maybe chmod 0644 'sasl2/libvirt.conf' maybe chmod 0644 'screenrc' -maybe chmod 0644 'securetty' maybe chmod 0755 'security' maybe chmod 0644 'security/access.conf' maybe chmod 0644 'security/capability.conf' @@ -2815,7 +2846,6 @@ maybe chmod 0644 'smartd.conf' maybe chmod 0755 'smartmontools' maybe chmod 0755 'smartmontools/run.d' maybe chmod 0755 'smartmontools/run.d/10mail' -maybe chmod 0755 'smartmontools/run.d/10powersave-notify' maybe chmod 0755 'smartmontools/run.d/60smart-notifier' maybe chmod 0755 'smartmontools/smartd_warning.d' maybe chmod 0644 'smi.conf' @@ -2945,11 +2975,13 @@ maybe chmod 0755 'systemd/system/bluetooth.target.wants' maybe chmod 0755 'systemd/system/cloud-final.service.wants' maybe chmod 0755 'systemd/system/default.target.wants' maybe chmod 0755 'systemd/system/display-manager.service.wants' +maybe chmod 0755 'systemd/system/emergency.target.wants' maybe chmod 0755 'systemd/system/final.target.wants' maybe chmod 0755 'systemd/system/getty.target.wants' maybe chmod 0755 'systemd/system/graphical.target.wants' maybe chmod 0644 'systemd/system/hddtemp.service' maybe chmod 0644 'systemd/system/local.service' +maybe chmod 0755 'systemd/system/mdmonitor.service.wants' maybe chmod 0755 'systemd/system/multi-user.target.wants' maybe chmod 0755 'systemd/system/netfilter-persistent.service.d' maybe chmod 0644 'systemd/system/netfilter-persistent.service.d/iptables.conf' @@ -2960,6 +2992,7 @@ maybe chmod 0755 'systemd/system/postfix.service.d' maybe chmod 0644 'systemd/system/postfix.service.d/override.conf' maybe chmod 0755 'systemd/system/printer.target.wants' maybe chmod 0755 'systemd/system/remote-fs.target.wants' +maybe chmod 0755 'systemd/system/rescue.target.wants' maybe chmod 0644 'systemd/system/snap-core-9436.mount' maybe chmod 0644 'systemd/system/snap-core-9665.mount' maybe chmod 0644 'systemd/system/snap-pycharm\x2dcommunity-197.mount' @@ -2970,6 +3003,7 @@ maybe chmod 0755 'systemd/system/timers.target.wants' maybe chmod 0755 'systemd/system/zfs-import.target.wants' maybe chmod 0755 'systemd/system/zfs-mount.service.wants' maybe chmod 0755 'systemd/system/zfs-share.service.wants' +maybe chmod 0755 'systemd/system/zfs-volumes.target.wants' maybe chmod 0755 'systemd/system/zfs.target.wants' maybe chmod 0755 'systemd/user' maybe chmod 0644 'systemd/user.conf' @@ -2988,6 +3022,8 @@ maybe chmod 0644 'timeshift.json' maybe chmod 0755 'timeshift/restore-hooks.d' maybe chmod 0755 'timeshift/restore-hooks.d/50_linuxmint' maybe chmod 0644 'timezone' +maybe chmod 0755 'timidity' +maybe chmod 0644 'timidity/timgm6mb.cfg' maybe chmod 0755 'tmpfiles.d' maybe chmod 0644 'tmpfiles.d/screen-cleanup.conf' maybe chmod 0755 'ubuntu-advantage' @@ -3026,6 +3062,7 @@ maybe chmod 0755 'update-motd.d' maybe chmod 0755 'update-motd.d/00-header' maybe chmod 0755 'update-motd.d/10-help-text' maybe chmod 0755 'update-motd.d/50-motd-news' +maybe chmod 0755 'update-motd.d/85-fwupd' maybe chmod 0755 'update-motd.d/90-updates-available' maybe chmod 0755 'update-motd.d/91-release-upgrade' maybe chmod 0755 'update-motd.d/95-hwe-eol' @@ -3069,7 +3106,6 @@ maybe chmod 0644 'xdg/Trolltech.conf' maybe chmod 0755 'xdg/Xwayland-session.d' maybe chmod 0755 'xdg/Xwayland-session.d/00-xrdb' maybe chmod 0644 'xdg/accept-languages.codes' -maybe chmod 0644 'xdg/attica.categories' maybe chmod 0755 'xdg/autostart' maybe chmod 0644 'xdg/autostart/at-spi-dbus-bus.desktop' maybe chmod 0644 'xdg/autostart/blueberry-obex-agent.desktop' @@ -3137,14 +3173,9 @@ maybe chmod 0644 'xdg/colors/Oxygen.colors' maybe chmod 0644 'xdg/colors/Rainbow.colors' maybe chmod 0644 'xdg/colors/Royal.colors' maybe chmod 0644 'xdg/colors/Web.colors' -maybe chmod 0644 'xdg/karchive.categories' maybe chmod 0644 'xdg/katomic.knsrc' maybe chmod 0644 'xdg/kblocks.knsrc' -maybe chmod 0644 'xdg/kbookmarks.categories' maybe chmod 0644 'xdg/kcardtheme.knsrc' -maybe chmod 0644 'xdg/kcodecs.categories' -maybe chmod 0644 'xdg/kcrash.categories' -maybe chmod 0644 'xdg/kdbusaddons.categories' maybe chmod 0644 'xdg/kdebug.areas' maybe chmod 0644 'xdg/kdebugrc' maybe chmod 0644 'xdg/kdiamond.knsrc' @@ -3153,18 +3184,12 @@ maybe chmod 0644 'xdg/kgoldrunner.knsrc' maybe chmod 0644 'xdg/khangman.knsrc' maybe chmod 0644 'xdg/kigo-games.knsrc' maybe chmod 0644 'xdg/kigo.knsrc' -maybe chmod 0644 'xdg/kjobwidgets.categories' -maybe chmod 0644 'xdg/knewstuff.categories' -maybe chmod 0644 'xdg/kpackage.categories' maybe chmod 0644 'xdg/kpat.knsrc' -maybe chmod 0644 'xdg/kservice.categories' maybe chmod 0644 'xdg/kshorturifilterrc' maybe chmod 0644 'xdg/ksirk.knsrc' maybe chmod 0644 'xdg/ksnakeduel.knsrc' maybe chmod 0644 'xdg/ksslcalist' maybe chmod 0644 'xdg/ksudokurc' -maybe chmod 0644 'xdg/kwallet.categories' -maybe chmod 0644 'xdg/lskat.categories' maybe chmod 0755 'xdg/menus' maybe chmod 0644 'xdg/menus/gnome-applications.menu' maybe chmod 0644 'xdg/menus/kde-information.menu' @@ -3175,9 +3200,7 @@ maybe chmod 0644 'xdg/menus/mate-preferences-categories.menu' maybe chmod 0644 'xdg/menus/mate-screensavers.menu' maybe chmod 0644 'xdg/menus/mate-settings.menu' maybe chmod 0644 'xdg/menus/matecc.menu' -maybe chmod 0644 'xdg/org_kde_kwayland.categories' maybe chmod 0644 'xdg/palapeli-collectionrc' -maybe chmod 0644 'xdg/sonnet.categories' maybe chmod 0755 'xdg/systemd' maybe chmod 0755 'xdg/ui' maybe chmod 0644 'xdg/ui/ui_standards.rc' diff --git a/NetworkManager/dispatcher.d/20-chrony b/NetworkManager/dispatcher.d/20-chrony index 8bd7df0..0b0c3e7 100755 --- a/NetworkManager/dispatcher.d/20-chrony +++ b/NetworkManager/dispatcher.d/20-chrony @@ -10,32 +10,6 @@ export LC_ALL=C # Note: for networkd-dispatcher routable.d ~= on and off.d ~= off -# Check if there is a default route - -if /sbin/ip route list 2> /dev/null | grep -q '^default'; then - chronyc online > /dev/null 2>&1 - exit 0 -fi - -sources=$(chronyc -c -n sources 2> /dev/null) - -[ $? -ne 0 ] && exit 0 - -# Check each configured source if it has a route - -echo "$sources" | while IFS=, read mode state address rest; do - [ "$mode" != '^' ] && [ "$mode" != '=' ] && continue - - /sbin/ip route get "$address" > /dev/null 2>&1 && command="online" || command="offline" - - # Set priority of sources so that the selected source is set as - # last if offline to avoid unnecessary reselection - [ "$state" != '*' ] && priority=1 || priority=2 - - echo "$priority $command $address" - -done | sort | while read priority command address; do - echo "$command $address" -done | chronyc > /dev/null 2>&1 +chronyc onoffline > /dev/null 2>&1 exit 0 diff --git a/X11/Xsession.d/20flatpak b/X11/Xsession.d/20flatpak index ce183f5..6c6e113 100644 --- a/X11/Xsession.d/20flatpak +++ b/X11/Xsession.d/20flatpak @@ -1,7 +1,26 @@ -# /etc/profile.d/flatpak.sh - set XDG_DATA_DIRS +if command -v flatpak > /dev/null; then + # set XDG_DATA_DIRS to include Flatpak installations -if [ "${XDG_DATA_DIRS#*flatpak}" = "${XDG_DATA_DIRS}" ]; then - XDG_DATA_DIRS="${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak/exports/share:/var/lib/flatpak/exports/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" -fi + new_dirs=$( + ( + unset G_MESSAGES_DEBUG + echo "${XDG_DATA_HOME:-"$HOME/.local/share"}/flatpak" + flatpak --installations + ) | ( + new_dirs= + while read -r install_path + do + share_path=$install_path/exports/share + case ":$XDG_DATA_DIRS:" in + (*":$share_path:"*) :;; + (*":$share_path/:"*) :;; + (*) new_dirs=${new_dirs:+${new_dirs}:}$share_path;; + esac + done + echo "$new_dirs" + ) + ) -export XDG_DATA_DIRS + export XDG_DATA_DIRS + XDG_DATA_DIRS="${new_dirs:+${new_dirs}:}${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" +fi diff --git a/X11/app-defaults/XCalc b/X11/app-defaults/XCalc index 540df58..fa3684c 100644 --- a/X11/app-defaults/XCalc +++ b/X11/app-defaults/XCalc @@ -42,6 +42,15 @@ XCalc*bevel.screen.P.label: () XCalc*bevel.screen.P.fromHoriz: GRAD XCalc*bevel.screen.P.fromVert: LCD XCalc*bevel.screen.P.horizDistance: 2 +XCalc*bevel.screen.HEX.fromHoriz: P +XCalc*bevel.screen.HEX.fromVert: LCD +XCalc*bevel.screen.HEX.horizDistance: 1 +XCalc*bevel.screen.DEC.fromHoriz: P +XCalc*bevel.screen.DEC.fromVert: LCD +XCalc*bevel.screen.DEC.horizDistance: 1 +XCalc*bevel.screen.OCT.fromHoriz: P +XCalc*bevel.screen.OCT.fromVert: LCD +XCalc*bevel.screen.OCT.horizDistance: 1 !XCalc*ti.Geometry: 171x252 XCalc*ti.bevel.screen.LCD.width: 186 @@ -59,6 +68,12 @@ XCalc*ti.bevel.screen.LCD.translations: #replace\n\ None7:digit(7)\n\ None8:digit(8)\n\ None9:digit(9)\n\ + Shifta:digit(A)\n\ + Shiftb:digit(B)\n\ + Shiftc:digit(C)\n\ + Shiftd:digit(D)\n\ + Shifte:digit(E)\n\ + Shiftf:digit(F)\n\ KP_0:digit(0)\n\ KP_1:digit(1)\n\ KP_2:digit(2)\n\ @@ -71,6 +86,7 @@ XCalc*ti.bevel.screen.LCD.translations: #replace\n\ KP_9:digit(9)\n\ KP_Enter:equal()\n\ KP_Equal:equal()\n\ + Return:equal()\n\ KP_Multiply:multiply()\n\ KP_Add:add()\n\ KP_Subtract:subtract()\n\ @@ -87,6 +103,13 @@ XCalc*ti.bevel.screen.LCD.translations: #replace\n\ :(:leftParen()\n\ :):rightParen()\n\ :!:factorial()\n\ + :|:or()\n\ + :&:and()\n\ + :<:shl()\n\ + :>:shr()\n\ + :~:not()\n\ + :%:mod()\n\ + x:xor()\n\ e:e()\n\ :^:power()\n\ p:pi()\n\ @@ -140,62 +163,95 @@ XCalc*ti.button14.translations: #override,:naturalLog()unset() XCalc*ti.button15.label: y^x XCalc*ti.button15.translations: #override,:power()unset() -XCalc*ti.button16.font: -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* -XCalc*ti.button16.label: \160 -XCalc*ti.button16.translations: #override,:pi()unset() -XCalc*ti.button17.label: x! -XCalc*ti.button17.translations: #override,:factorial()unset() -XCalc*ti.button18.label: ( -XCalc*ti.button18.translations: #override,:leftParen()unset() -XCalc*ti.button19.label: ) -XCalc*ti.button19.translations: #override,:rightParen()unset() -XCalc*ti.button20.font: -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* -XCalc*ti.button20.label: \270 -XCalc*ti.button20.translations: #override,:divide()unset() - -XCalc*ti.button21.label: STO -XCalc*ti.button21.translations: #override,:store()unset() -XCalc*ti.button22.label: 7 -XCalc*ti.button22.translations: #override,:digit(7)unset() -XCalc*ti.button23.label: 8 -XCalc*ti.button23.translations: #override,:digit(8)unset() -XCalc*ti.button24.label: 9 -XCalc*ti.button24.translations: #override,:digit(9)unset() -XCalc*ti.button25.label: * -XCalc*ti.button25.translations: #override,:multiply()unset() - -XCalc*ti.button26.label: RCL -XCalc*ti.button26.translations: #override,:recall()unset() -XCalc*ti.button27.label: 4 -XCalc*ti.button27.translations: #override,:digit(4)unset() -XCalc*ti.button28.label: 5 -XCalc*ti.button28.translations: #override,:digit(5)unset() -XCalc*ti.button29.label: 6 -XCalc*ti.button29.translations: #override,:digit(6)unset() -XCalc*ti.button30.label: - -XCalc*ti.button30.translations: #override,:subtract()unset() - -XCalc*ti.button31.label: SUM -XCalc*ti.button31.translations: #override,:sum()unset() -XCalc*ti.button32.label: 1 -XCalc*ti.button32.translations: #override,:digit(1)unset() -XCalc*ti.button33.label: 2 -XCalc*ti.button33.translations: #override,:digit(2)unset() -XCalc*ti.button34.label: 3 -XCalc*ti.button34.translations: #override,:digit(3)unset() -XCalc*ti.button35.label: + -XCalc*ti.button35.translations: #override,:add()unset() - -XCalc*ti.button36.label: EXC -XCalc*ti.button36.translations: #override,:exchange()unset() -XCalc*ti.button37.label: 0 -XCalc*ti.button37.translations: #override,:digit(0)unset() -XCalc*ti.button38.label: . -XCalc*ti.button38.translations: #override,:decimal()unset() -XCalc*ti.button39.label: +/- -XCalc*ti.button39.translations: #override,:negate()unset() -XCalc*ti.button40.label: = -XCalc*ti.button40.translations: #override,:equal()unset() +XCalc*ti.button16.label: not +XCalc*ti.button16.translations: #override,:not()unset() +XCalc*ti.button17.label: and +XCalc*ti.button17.translations: #override,:and()unset() +XCalc*ti.button18.label: or +XCalc*ti.button18.translations: #override,:or()unset() +XCalc*ti.button19.label: xor +XCalc*ti.button19.translations: #override,:xor()unset() +XCalc*ti.button20.label: trunc +XCalc*ti.button20.translations: #override,:trunc()unset() + +XCalc*ti.button21.font: -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* +XCalc*ti.button21.label: \160 +XCalc*ti.button21.translations: #override,:pi()unset() +XCalc*ti.button22.label: x! +XCalc*ti.button22.translations: #override,:factorial()unset() +XCalc*ti.button23.label: ( +XCalc*ti.button23.translations: #override,:leftParen()unset() +XCalc*ti.button24.label: ) +XCalc*ti.button24.translations: #override,:rightParen()unset() +XCalc*ti.button25.label: base +XCalc*ti.button25.translations: #override,:base()unset() + +XCalc*ti.button26.label: shl +XCalc*ti.button26.translations: #override,:shl()unset() +XCalc*ti.button27.label: D +XCalc*ti.button27.translations: #override,:digit(D)unset() +XCalc*ti.button28.label: E +XCalc*ti.button28.translations: #override,:digit(E)unset() +XCalc*ti.button29.label: F +XCalc*ti.button29.translations: #override,:digit(F)unset() +XCalc*ti.button30.label: shr +XCalc*ti.button30.translations: #override,:shr()unset() + +XCalc*ti.button31.label: mod +XCalc*ti.button31.translations: #override,:mod()unset() +XCalc*ti.button32.label: A +XCalc*ti.button32.translations: #override,:digit(A)unset() +XCalc*ti.button33.label: B +XCalc*ti.button33.translations: #override,:digit(B)unset() +XCalc*ti.button34.label: C +XCalc*ti.button34.translations: #override,:digit(C)unset() +XCalc*ti.button35.font: -adobe-symbol-*-*-*-*-*-120-*-*-*-*-*-* +XCalc*ti.button35.label: \270 +XCalc*ti.button35.translations: #override,:divide()unset() + +XCalc*ti.button36.label: STO +XCalc*ti.button36.translations: #override,:store()unset() +XCalc*ti.button37.label: 7 +XCalc*ti.button37.translations: #override,:digit(7)unset() +XCalc*ti.button38.label: 8 +XCalc*ti.button38.translations: #override,:digit(8)unset() +XCalc*ti.button39.label: 9 +XCalc*ti.button39.translations: #override,:digit(9)unset() +XCalc*ti.button40.label: * +XCalc*ti.button40.translations: #override,:multiply()unset() + +XCalc*ti.button41.label: RCL +XCalc*ti.button41.translations: #override,:recall()unset() +XCalc*ti.button42.label: 4 +XCalc*ti.button42.translations: #override,:digit(4)unset() +XCalc*ti.button43.label: 5 +XCalc*ti.button43.translations: #override,:digit(5)unset() +XCalc*ti.button44.label: 6 +XCalc*ti.button44.translations: #override,:digit(6)unset() +XCalc*ti.button45.label: - +XCalc*ti.button45.translations: #override,:subtract()unset() + +XCalc*ti.button46.label: SUM +XCalc*ti.button46.translations: #override,:sum()unset() +XCalc*ti.button47.label: 1 +XCalc*ti.button47.translations: #override,:digit(1)unset() +XCalc*ti.button48.label: 2 +XCalc*ti.button48.translations: #override,:digit(2)unset() +XCalc*ti.button49.label: 3 +XCalc*ti.button49.translations: #override,:digit(3)unset() +XCalc*ti.button50.label: + +XCalc*ti.button50.translations: #override,:add()unset() + +XCalc*ti.button51.label: EXC +XCalc*ti.button51.translations: #override,:exchange()unset() +XCalc*ti.button52.label: 0 +XCalc*ti.button52.translations: #override,:digit(0)unset() +XCalc*ti.button53.label: . +XCalc*ti.button53.translations: #override,:decimal()unset() +XCalc*ti.button54.label: +/- +XCalc*ti.button54.translations: #override,:negate()unset() +XCalc*ti.button55.label: = +XCalc*ti.button55.translations: #override,:equal()unset() XCalc*ti.button1.horizDistance: 4 XCalc*ti.button1.vertDistance: 12 @@ -290,6 +346,38 @@ XCalc*ti.button39.fromVert: button34 XCalc*ti.button40.fromHoriz: button39 XCalc*ti.button40.fromVert: button35 +XCalc*ti.button41.horizDistance: 4 +XCalc*ti.button41.fromVert: button36 +XCalc*ti.button42.fromHoriz: button41 +XCalc*ti.button42.fromVert: button37 +XCalc*ti.button43.fromHoriz: button42 +XCalc*ti.button43.fromVert: button38 +XCalc*ti.button44.fromHoriz: button43 +XCalc*ti.button44.fromVert: button39 +XCalc*ti.button45.fromHoriz: button44 +XCalc*ti.button45.fromVert: button40 + +XCalc*ti.button46.horizDistance: 4 +XCalc*ti.button46.fromVert: button41 +XCalc*ti.button47.fromHoriz: button46 +XCalc*ti.button47.fromVert: button42 +XCalc*ti.button48.fromHoriz: button47 +XCalc*ti.button48.fromVert: button43 +XCalc*ti.button49.fromHoriz: button48 +XCalc*ti.button49.fromVert: button44 +XCalc*ti.button50.fromHoriz: button49 +XCalc*ti.button50.fromVert: button45 + +XCalc*ti.button51.horizDistance: 4 +XCalc*ti.button51.fromVert: button46 +XCalc*ti.button52.fromHoriz: button51 +XCalc*ti.button52.fromVert: button47 +XCalc*ti.button53.fromHoriz: button52 +XCalc*ti.button53.fromVert: button48 +XCalc*ti.button54.fromHoriz: button53 +XCalc*ti.button54.fromVert: button49 +XCalc*ti.button55.fromHoriz: button54 +XCalc*ti.button55.fromVert: button50 !XCalc*hp.Geometry: 336x164 XCalc*hp.bevel.screen.LCD.width: 186 diff --git a/X11/app-defaults/XLogo b/X11/app-defaults/XLogo index a70ff3c..6525c6d 100644 --- a/X11/app-defaults/XLogo +++ b/X11/app-defaults/XLogo @@ -1,4 +1,5 @@ XLogo*iconPixmap: xlogo32 XLogo*iconMask: xlogo32 XLogo*baseTranslations: #override \ -q,Escape: quit() +q: quit() \n\ +Escape: quit() diff --git a/alsa/conf.d/10-samplerate.conf b/alsa/conf.d/10-samplerate.conf new file mode 120000 index 0000000..3f12fdb --- /dev/null +++ b/alsa/conf.d/10-samplerate.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/10-samplerate.conf \ No newline at end of file diff --git a/alsa/conf.d/10-speexrate.conf b/alsa/conf.d/10-speexrate.conf new file mode 120000 index 0000000..abc4b34 --- /dev/null +++ b/alsa/conf.d/10-speexrate.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/10-speexrate.conf \ No newline at end of file diff --git a/alsa/conf.d/50-arcam-av-ctl.conf b/alsa/conf.d/50-arcam-av-ctl.conf new file mode 120000 index 0000000..a4546a3 --- /dev/null +++ b/alsa/conf.d/50-arcam-av-ctl.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/50-arcam-av-ctl.conf \ No newline at end of file diff --git a/alsa/conf.d/50-jack.conf b/alsa/conf.d/50-jack.conf new file mode 120000 index 0000000..5e220fb --- /dev/null +++ b/alsa/conf.d/50-jack.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/50-jack.conf \ No newline at end of file diff --git a/alsa/conf.d/50-oss.conf b/alsa/conf.d/50-oss.conf new file mode 120000 index 0000000..8834acf --- /dev/null +++ b/alsa/conf.d/50-oss.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/50-oss.conf \ No newline at end of file diff --git a/alsa/conf.d/50-pulseaudio.conf b/alsa/conf.d/50-pulseaudio.conf new file mode 120000 index 0000000..02f0d5f --- /dev/null +++ b/alsa/conf.d/50-pulseaudio.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/50-pulseaudio.conf \ No newline at end of file diff --git a/alsa/conf.d/60-upmix.conf b/alsa/conf.d/60-upmix.conf new file mode 120000 index 0000000..ce7e4a2 --- /dev/null +++ b/alsa/conf.d/60-upmix.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/60-upmix.conf \ No newline at end of file diff --git a/alsa/conf.d/60-vdownmix.conf b/alsa/conf.d/60-vdownmix.conf new file mode 120000 index 0000000..d937c36 --- /dev/null +++ b/alsa/conf.d/60-vdownmix.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/60-vdownmix.conf \ No newline at end of file diff --git a/alsa/conf.d/98-usb-stream.conf b/alsa/conf.d/98-usb-stream.conf new file mode 120000 index 0000000..95e52bd --- /dev/null +++ b/alsa/conf.d/98-usb-stream.conf @@ -0,0 +1 @@ +/usr/share/alsa/alsa.conf.d/98-usb-stream.conf \ No newline at end of file diff --git a/alsa/conf.d/99-pulseaudio-default.conf.example b/alsa/conf.d/99-pulseaudio-default.conf.example new file mode 100644 index 0000000..4f58858 --- /dev/null +++ b/alsa/conf.d/99-pulseaudio-default.conf.example @@ -0,0 +1,13 @@ +# Default to PulseAudio + +pcm.!default { + type pulse + hint { + show on + description "Default ALSA Output (currently PulseAudio Sound Server)" + } +} + +ctl.!default { + type pulse +} diff --git a/alternatives/default-GM.sf2 b/alternatives/default-GM.sf2 new file mode 120000 index 0000000..4015b76 --- /dev/null +++ b/alternatives/default-GM.sf2 @@ -0,0 +1 @@ +/usr/share/sounds/sf2/TimGM6mb.sf2 \ No newline at end of file diff --git a/alternatives/default-GM.sf3 b/alternatives/default-GM.sf3 new file mode 120000 index 0000000..4015b76 --- /dev/null +++ b/alternatives/default-GM.sf3 @@ -0,0 +1 @@ +/usr/share/sounds/sf2/TimGM6mb.sf2 \ No newline at end of file diff --git a/alternatives/desktop-background b/alternatives/desktop-background index b9d5245..5fac71f 120000 --- a/alternatives/desktop-background +++ b/alternatives/desktop-background @@ -1 +1 @@ -/usr/share/images/desktop-base/lines-wallpaper_1920x1080.svg \ No newline at end of file +/usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg \ No newline at end of file diff --git a/alternatives/desktop-background.xml b/alternatives/desktop-background.xml index d707100..f158dfe 120000 --- a/alternatives/desktop-background.xml +++ b/alternatives/desktop-background.xml @@ -1 +1 @@ -/usr/share/images/desktop-base/lines.xml \ No newline at end of file +/usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml \ No newline at end of file diff --git a/alternatives/desktop-grub b/alternatives/desktop-grub deleted file mode 120000 index aa84da8..0000000 --- a/alternatives/desktop-grub +++ /dev/null @@ -1 +0,0 @@ -/usr/share/images/desktop-base/lines-grub.png \ No newline at end of file diff --git a/alternatives/desktop-lockscreen.xml b/alternatives/desktop-lockscreen.xml new file mode 120000 index 0000000..b4557f7 --- /dev/null +++ b/alternatives/desktop-lockscreen.xml @@ -0,0 +1 @@ +/usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml \ No newline at end of file diff --git a/alternatives/desktop-login-background b/alternatives/desktop-login-background new file mode 120000 index 0000000..fc7d730 --- /dev/null +++ b/alternatives/desktop-login-background @@ -0,0 +1 @@ +/usr/share/desktop-base/active-theme/login/background.svg \ No newline at end of file diff --git a/alternatives/desktop-plasma5-wallpaper b/alternatives/desktop-plasma5-wallpaper new file mode 120000 index 0000000..77e8630 --- /dev/null +++ b/alternatives/desktop-plasma5-wallpaper @@ -0,0 +1 @@ +/usr/share/desktop-base/active-theme/wallpaper \ No newline at end of file diff --git a/alternatives/desktop-splash b/alternatives/desktop-splash deleted file mode 120000 index 35a3b0d..0000000 --- a/alternatives/desktop-splash +++ /dev/null @@ -1 +0,0 @@ -/usr/share/images/desktop-base/spacefun-splash.svg \ No newline at end of file diff --git a/alternatives/desktop-theme b/alternatives/desktop-theme new file mode 120000 index 0000000..704f933 --- /dev/null +++ b/alternatives/desktop-theme @@ -0,0 +1 @@ +/usr/share/desktop-base/futureprototype-theme \ No newline at end of file diff --git a/alternatives/editor.da.1.gz b/alternatives/editor.da.1.gz new file mode 120000 index 0000000..c90068f --- /dev/null +++ b/alternatives/editor.da.1.gz @@ -0,0 +1 @@ +/usr/share/man/da/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/editor.de.1.gz b/alternatives/editor.de.1.gz new file mode 120000 index 0000000..d89833a --- /dev/null +++ b/alternatives/editor.de.1.gz @@ -0,0 +1 @@ +/usr/share/man/de/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/emblem-vendor-128 b/alternatives/emblem-vendor-128 new file mode 120000 index 0000000..eaab191 --- /dev/null +++ b/alternatives/emblem-vendor-128 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/128x128/emblems/emblem-debian.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-256 b/alternatives/emblem-vendor-256 new file mode 120000 index 0000000..ce44438 --- /dev/null +++ b/alternatives/emblem-vendor-256 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/256x256/emblems/emblem-debian.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-64 b/alternatives/emblem-vendor-64 new file mode 120000 index 0000000..4f7e876 --- /dev/null +++ b/alternatives/emblem-vendor-64 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/64x64/emblems/emblem-debian.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-scalable b/alternatives/emblem-vendor-scalable new file mode 120000 index 0000000..1aa8935 --- /dev/null +++ b/alternatives/emblem-vendor-scalable @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/scalable/emblems/emblem-debian.svg \ No newline at end of file diff --git a/alternatives/emblem-vendor-symbolic-128 b/alternatives/emblem-vendor-symbolic-128 new file mode 120000 index 0000000..621bc8a --- /dev/null +++ b/alternatives/emblem-vendor-symbolic-128 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/128x128/emblems/emblem-debian-symbolic.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-symbolic-256 b/alternatives/emblem-vendor-symbolic-256 new file mode 120000 index 0000000..569a281 --- /dev/null +++ b/alternatives/emblem-vendor-symbolic-256 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/256x256/emblems/emblem-debian-symbolic.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-symbolic-64 b/alternatives/emblem-vendor-symbolic-64 new file mode 120000 index 0000000..d27c9fb --- /dev/null +++ b/alternatives/emblem-vendor-symbolic-64 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/64x64/emblems/emblem-debian-symbolic.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-symbolic-scalable b/alternatives/emblem-vendor-symbolic-scalable new file mode 120000 index 0000000..231ebdd --- /dev/null +++ b/alternatives/emblem-vendor-symbolic-scalable @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/scalable/emblems/emblem-debian-symbolic.svg \ No newline at end of file diff --git a/alternatives/emblem-vendor-white-128 b/alternatives/emblem-vendor-white-128 new file mode 120000 index 0000000..c3811c3 --- /dev/null +++ b/alternatives/emblem-vendor-white-128 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/128x128/emblems/emblem-debian-white.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-white-256 b/alternatives/emblem-vendor-white-256 new file mode 120000 index 0000000..6f4626b --- /dev/null +++ b/alternatives/emblem-vendor-white-256 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/256x256/emblems/emblem-debian-white.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-white-64 b/alternatives/emblem-vendor-white-64 new file mode 120000 index 0000000..1c3d3a3 --- /dev/null +++ b/alternatives/emblem-vendor-white-64 @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/64x64/emblems/emblem-debian-white.png \ No newline at end of file diff --git a/alternatives/emblem-vendor-white-scalable b/alternatives/emblem-vendor-white-scalable new file mode 120000 index 0000000..a0585f0 --- /dev/null +++ b/alternatives/emblem-vendor-white-scalable @@ -0,0 +1 @@ +/usr/share/icons/desktop-base/scalable/emblems/emblem-debian-white.svg \ No newline at end of file diff --git a/alternatives/ex.da.1.gz b/alternatives/ex.da.1.gz new file mode 120000 index 0000000..c90068f --- /dev/null +++ b/alternatives/ex.da.1.gz @@ -0,0 +1 @@ +/usr/share/man/da/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/ex.de.1.gz b/alternatives/ex.de.1.gz new file mode 120000 index 0000000..d89833a --- /dev/null +++ b/alternatives/ex.de.1.gz @@ -0,0 +1 @@ +/usr/share/man/de/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/pager b/alternatives/pager index cbce297..a967155 120000 --- a/alternatives/pager +++ b/alternatives/pager @@ -1 +1 @@ -/bin/less \ No newline at end of file +/usr/bin/less \ No newline at end of file diff --git a/alternatives/spice-xpi-client b/alternatives/spice-xpi-client deleted file mode 120000 index e3e580c..0000000 --- a/alternatives/spice-xpi-client +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/spice-xpi-client-remote-viewer \ No newline at end of file diff --git a/alternatives/vendor-logos b/alternatives/vendor-logos new file mode 120000 index 0000000..ff148ae --- /dev/null +++ b/alternatives/vendor-logos @@ -0,0 +1 @@ +/usr/share/desktop-base/debian-logos \ No newline at end of file diff --git a/alternatives/vi.da.1.gz b/alternatives/vi.da.1.gz new file mode 120000 index 0000000..c90068f --- /dev/null +++ b/alternatives/vi.da.1.gz @@ -0,0 +1 @@ +/usr/share/man/da/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/vi.de.1.gz b/alternatives/vi.de.1.gz new file mode 120000 index 0000000..d89833a --- /dev/null +++ b/alternatives/vi.de.1.gz @@ -0,0 +1 @@ +/usr/share/man/de/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/view.da.1.gz b/alternatives/view.da.1.gz new file mode 120000 index 0000000..c90068f --- /dev/null +++ b/alternatives/view.da.1.gz @@ -0,0 +1 @@ +/usr/share/man/da/man1/vim.1.gz \ No newline at end of file diff --git a/alternatives/view.de.1.gz b/alternatives/view.de.1.gz new file mode 120000 index 0000000..d89833a --- /dev/null +++ b/alternatives/view.de.1.gz @@ -0,0 +1 @@ +/usr/share/man/de/man1/vim.1.gz \ No newline at end of file diff --git a/apparmor.d/sbin.dhclient b/apparmor.d/sbin.dhclient index b141209..b6e2b9d 100644 --- a/apparmor.d/sbin.dhclient +++ b/apparmor.d/sbin.dhclient @@ -1,7 +1,7 @@ # vim:syntax=apparmor #include -/sbin/dhclient flags=(attach_disconnected) { +/{,usr/}sbin/dhclient flags=(attach_disconnected) { #include #include #include @@ -17,9 +17,9 @@ @{PROC}/[0-9]*/net/ r, @{PROC}/[0-9]*/net/** r, - /sbin/dhclient mr, + /{,usr/}sbin/dhclient mr, # LP: #1197484 and LP: #1202203 - why is this needed? :( - /bin/bash mr, + /{,usr/}bin/bash mr, /etc/dhclient.conf r, /etc/dhcp/ r, @@ -54,7 +54,7 @@ # able to subvert dhclient-script or write to the hooks.d directories. As # such, if the dhclient3 daemon is subverted, this effectively limits it to # only being able to run the hooks scripts. - /sbin/dhclient-script Uxr, + /{,usr/}sbin/dhclient-script Uxr, # Run the ELF executables under their own unrestricted profiles /usr/lib/NetworkManager/nm-dhcp-client.action Pxrm, diff --git a/apparmor.d/usr.bin.man b/apparmor.d/usr.bin.man index 1738079..b016052 100644 --- a/apparmor.d/usr.bin.man +++ b/apparmor.d/usr.bin.man @@ -20,8 +20,8 @@ # Similarly, use a special profile when man calls decompressors and other # simple filters. - /bin/bzip2 rmCx -> &man_filter, - /bin/gzip rmCx -> &man_filter, + /{,usr/}bin/bzip2 rmCx -> &man_filter, + /{,usr/}bin/gzip rmCx -> &man_filter, /usr/bin/col rmCx -> &man_filter, /usr/bin/compress rmCx -> &man_filter, /usr/bin/iconv rmCx -> &man_filter, @@ -34,12 +34,14 @@ # nice in the future, but is tricky since it's quite configurable), but to # confine the processes it calls that parse untrusted data. /** mrixwlk, + unix, capability setuid, capability setgid, - signal peer=man_groff, - signal peer=man_filter, + signal peer=@{profile_name}, + signal peer=/usr/bin/man//&man_groff, + signal peer=/usr/bin/man//&man_filter, # Site-specific additions and overrides. See local/README for details. #include @@ -64,10 +66,13 @@ profile man_groff { /usr/bin/vgrind rm, /etc/groff/** r, + /etc/papersize r, /usr/lib/groff/site-tmac/** r, /usr/share/groff/** r, signal peer=/usr/bin/man, + # @{profile_name} doesn't seem to work here. + signal peer=/usr/bin/man//&man_groff, } profile man_filter { @@ -77,8 +82,8 @@ profile man_filter { # open FDs before execve. #include - /bin/bzip2 rm, - /bin/gzip rm, + /{,usr/}bin/bzip2 rm, + /{,usr/}bin/gzip rm, /usr/bin/col rm, /usr/bin/compress rm, /usr/bin/iconv rm, @@ -91,5 +96,10 @@ profile man_filter { # do is feed data to the invoking man process. /** r, + # Allow writing cat pages. + /var/cache/man/** w, + signal peer=/usr/bin/man, + # @{profile_name} doesn't seem to work here. + signal peer=/usr/bin/man//&man_filter, } diff --git a/apparmor.d/usr.sbin.chronyd b/apparmor.d/usr.sbin.chronyd index 4424e3c..9437506 100644 --- a/apparmor.d/usr.sbin.chronyd +++ b/apparmor.d/usr.sbin.chronyd @@ -1,6 +1,5 @@ # Last Modified: Sat Jan 20 10:45:05 2018 #include -#include /usr/sbin/chronyd (attach_disconnected) { #include @@ -14,7 +13,7 @@ capability sys_resource, # for /run/chrony to be created capability chown, - # for hwtimestamp + # Needed to support HW timestamping capability net_admin, /usr/sbin/chronyd mr, @@ -39,8 +38,7 @@ # Example gpsd socket is outside /{,var/}run/chrony/ /{,var/}run/chrony.tty{,*}.sock rw, # To sign replies to MS-SNTP clients by the smbd daemon - /var/lib/samba/ntp_signd r, - /var/lib/samba/ntp_signd/{,*} rw, + /var/lib/samba/ntp_signd/socket rw, # rtc /etc/adjtime r, diff --git a/apparmor.d/usr.sbin.named b/apparmor.d/usr.sbin.named index 6d52342..a4622da 100644 --- a/apparmor.d/usr.sbin.named +++ b/apparmor.d/usr.sbin.named @@ -22,6 +22,9 @@ /var/cache/bind/** lrw, /var/cache/bind/ rw, + # Database file used by allow-new-zones + /var/cache/bind/_default.nzd-lock rwk, + # gssapi /etc/krb5.keytab kr, /etc/bind/krb5.keytab kr, @@ -29,6 +32,9 @@ # ssl /etc/ssl/openssl.cnf r, + # root hints from dns-data-root + /usr/share/dns/root.* r, + # GeoIP data files for GeoIP ACLs /usr/share/GeoIP/** r, @@ -51,8 +57,6 @@ # syslog do the heavy lifting. /var/log/named/** rw, /var/log/named/ rw, - /var/log/bind/** rw, - /var/log/bind/ rw, # gssapi /var/lib/sss/pubconf/krb5.include.d/** r, @@ -67,6 +71,24 @@ # dynamic updates /var/tmp/DNS_* rw, + # dyndb backends + /usr/lib/bind/*.so rm, + + # Samba DLZ + /{usr/,}lib/@{multiarch}/samba/bind9/*.so rm, + /{usr/,}lib/@{multiarch}/samba/gensec/*.so rm, + /{usr/,}lib/@{multiarch}/samba/ldb/*.so rm, + /{usr/,}lib/@{multiarch}/ldb/modules/ldb/*.so rm, + /var/lib/samba/bind-dns/dns.keytab rk, + /var/lib/samba/bind-dns/named.conf r, + /var/lib/samba/bind-dns/dns/** rwk, + /var/lib/samba/private/dns.keytab rk, + /var/lib/samba/private/named.conf r, + /var/lib/samba/private/dns/** rwk, + /etc/samba/smb.conf r, + /dev/urandom rwmk, + owner /var/tmp/krb5_* rwk, + # Site-specific additions and overrides. See local/README for details. #include } diff --git a/apparmor/logprof.conf b/apparmor/logprof.conf index 18481e6..75859f6 100644 --- a/apparmor/logprof.conf +++ b/apparmor/logprof.conf @@ -49,6 +49,8 @@ /usr/bin/ksh = icnu /bin/dash = icnu /usr/bin/dash = icnu + /bin/zsh = icnu + /usr/bin/zsh = icnu # these programs can't function if they're confined /bin/mount = u @@ -114,6 +116,7 @@ /usr/bin/python3.4 = icn /usr/bin/python3.5 = icn /usr/bin/python3.6 = icn + /usr/bin/python3.7 = icn /usr/bin/tr = icn [required_hats] @@ -138,7 +141,7 @@ ^/home/[^\/]+ = /home/* # if they use any perl modules, grant access to all - ^/usr/lib/x86_64-linux-gnu/perl5/5.26/.+$ = /usr/lib/x86_64-linux-gnu/perl5/5.26/** + ^/usr/lib/perl5/.+$ = /usr/lib/perl5/** ^/usr/lib/[^\/]+/perl5?/.+$ = /usr/lib/@{multiarch}/perl{,5}/** # locale foo diff --git a/apparmor/severity.db b/apparmor/severity.db index ed411b5..3c02840 100644 --- a/apparmor/severity.db +++ b/apparmor/severity.db @@ -231,7 +231,7 @@ /usr/lib/tcl** 2 5 3 /usr/lib/lib*so* 3 8 4 /usr/lib/iptables/* 2 8 2 -/usr/lib/x86_64-linux-gnu/perl5/5.26/** 4 10 6 +/usr/lib/perl5/** 4 10 6 /usr/lib/*/perl/** 4 10 6 /usr/lib/*/perl5/** 4 10 6 /usr/lib/gconv/* 4 7 4 diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index be4a344..b5eeb7e 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,69 +1,44 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-image-5\.3\.0-61-generic$"; - "^linux-image-5\.3\.0-62-generic$"; - "^linux-headers-5\.3\.0-61-generic$"; - "^linux-headers-5\.3\.0-62-generic$"; - "^linux-image-extra-5\.3\.0-61-generic$"; - "^linux-image-extra-5\.3\.0-62-generic$"; - "^linux-modules-5\.3\.0-61-generic$"; - "^linux-modules-5\.3\.0-62-generic$"; - "^linux-modules-extra-5\.3\.0-61-generic$"; - "^linux-modules-extra-5\.3\.0-62-generic$"; - "^linux-signed-image-5\.3\.0-61-generic$"; - "^linux-signed-image-5\.3\.0-62-generic$"; - "^linux-image-unsigned-5\.3\.0-61-generic$"; - "^linux-image-unsigned-5\.3\.0-62-generic$"; - "^kfreebsd-image-5\.3\.0-61-generic$"; - "^kfreebsd-image-5\.3\.0-62-generic$"; - "^kfreebsd-headers-5\.3\.0-61-generic$"; - "^kfreebsd-headers-5\.3\.0-62-generic$"; - "^gnumach-image-5\.3\.0-61-generic$"; - "^gnumach-image-5\.3\.0-62-generic$"; - "^.*-modules-5\.3\.0-61-generic$"; + "^linux-.*-5\.3\.0-62-generic$"; + "^linux-.*-5\.4\.0-42-generic$"; + "^kfreebsd-.*-5\.3\.0-62-generic$"; + "^kfreebsd-.*-5\.4\.0-42-generic$"; + "^gnumach-.*-5\.3\.0-62-generic$"; + "^gnumach-.*-5\.4\.0-42-generic$"; "^.*-modules-5\.3\.0-62-generic$"; - "^.*-kernel-5\.3\.0-61-generic$"; + "^.*-modules-5\.4\.0-42-generic$"; "^.*-kernel-5\.3\.0-62-generic$"; - "^linux-backports-modules-.*-5\.3\.0-61-generic$"; - "^linux-backports-modules-.*-5\.3\.0-62-generic$"; - "^linux-modules-.*-5\.3\.0-61-generic$"; - "^linux-modules-.*-5\.3\.0-62-generic$"; - "^linux-tools-5\.3\.0-61-generic$"; - "^linux-tools-5\.3\.0-62-generic$"; - "^linux-cloud-tools-5\.3\.0-61-generic$"; - "^linux-cloud-tools-5\.3\.0-62-generic$"; - "^linux-buildinfo-5\.3\.0-61-generic$"; - "^linux-buildinfo-5\.3\.0-62-generic$"; - "^linux-source-5\.3\.0-61-generic$"; - "^linux-source-5\.3\.0-62-generic$"; + "^.*-kernel-5\.4\.0-42-generic$"; }; /* Debug information: # dpkg list: -ii linux-image-5.0.0-32-generic 5.0.0-32.34~18.04.2 amd64 Signed kernel image generic -rc linux-image-5.3.0-51-generic 5.3.0-51.44~18.04.2 amd64 Signed kernel image generic -ii linux-image-5.3.0-59-generic 5.3.0-59.53~18.04.1 amd64 Signed kernel image generic -ii linux-image-5.3.0-61-generic 5.3.0-61.55~18.04.1 amd64 Signed kernel image generic -iF linux-image-5.3.0-62-generic 5.3.0-62.56~18.04.1 amd64 Signed kernel image generic -ii linux-image-generic-hwe-18.04 5.3.0.62.115 amd64 Generic Linux kernel image +ii linux-image-5.0.0-32-generic 5.0.0-32.34~18.04.2 amd64 Signed kernel image generic +rc linux-image-5.3.0-51-generic 5.3.0-51.44~18.04.2 amd64 Signed kernel image generic +ii linux-image-5.3.0-61-generic 5.3.0-61.55~18.04.1 amd64 Signed kernel image generic +ii linux-image-5.3.0-62-generic 5.3.0-62.56~18.04.1 amd64 Signed kernel image generic +iF linux-image-5.4.0-42-generic 5.4.0-42.46 amd64 Signed kernel image generic +ii linux-image-generic 5.4.0.42.45 amd64 Generic Linux kernel image +ii linux-image-generic-hwe-18.04 5.4.0.42.45 amd64 Generic Linux kernel image (dummy transitional package) # list of installed kernel packages: 5.0.0-32-generic 5.0.0-32.34~18.04.2 -5.3.0-59-generic 5.3.0-59.53~18.04.1 5.3.0-61-generic 5.3.0-61.55~18.04.1 5.3.0-62-generic 5.3.0-62.56~18.04.1 +5.4.0-42-generic 5.4.0-42.46 # list of different kernel versions: +5.4.0-42.46 5.3.0-62.56~18.04.1 5.3.0-61.55~18.04.1 -5.3.0-59.53~18.04.1 5.0.0-32.34~18.04.2 -# Installing kernel: 5.3.0-62.56~18.04.1 (5.3.0-62-generic) -# Running kernel: 5.3.0-61.55~18.04.1 (5.3.0-61-generic) -# Last kernel: 5.3.0-62.56~18.04.1 -# Previous kernel: 5.3.0-61.55~18.04.1 +# Installing kernel: 5.4.0-42.46 (5.4.0-42-generic) +# Running kernel: 5.3.0-62.56~18.04.1 (5.3.0-62-generic) +# Last kernel: 5.4.0-42.46 +# Previous kernel: 5.3.0-62.56~18.04.1 # Kernel versions list to keep: -5.3.0-61.55~18.04.1 5.3.0-62.56~18.04.1 +5.4.0-42.46 # Kernel packages (version part) to protect: -5\.3\.0-61-generic 5\.3\.0-62-generic +5\.4\.0-42-generic */ diff --git a/apt/apt.conf.d/50appstream b/apt/apt.conf.d/50appstream index e4bbc3e..a5e0d46 100644 --- a/apt/apt.conf.d/50appstream +++ b/apt/apt.conf.d/50appstream @@ -73,5 +73,5 @@ Acquire::IndexTargets { # Refresh AppStream cache when APT's cache is updated (i.e. apt update) APT::Update::Post-Invoke-Success { - "if /usr/bin/test -w /var/cache/app-info -a -e /usr/bin/appstreamcli; then appstreamcli refresh-cache > /dev/null; fi"; + "if /usr/bin/test -w /var/cache/app-info -a -e /usr/bin/appstreamcli; then appstreamcli refresh-cache > /dev/null || true; fi"; }; diff --git a/bash_completion.d/grub b/bash_completion.d/grub deleted file mode 100644 index 29a5963..0000000 --- a/bash_completion.d/grub +++ /dev/null @@ -1,495 +0,0 @@ -# -# Bash completion for grub -# -# Copyright (C) 2010 Free Software Foundation, Inc. -# -# GRUB is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# GRUB is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GRUB. If not, see . -# bash completion for grub - -__grub_dir() { - local i c=1 boot_dir - - for (( c=1; c <= ${#COMP_WORDS[@]}; c++ )); do - i="${COMP_WORDS[c]}" - case "$i" in - --boot-directory) - c=$((++c)) - i="${COMP_WORDS[c]}" - boot_dir="${i##*=}"; - break - ;; - esac - done - boot_dir=${boot_dir-/boot} - echo "${boot_dir%/}/grub" -} - - -# This function generates completion reply with compgen -# - arg: accepts 1, 2, 3, or 4 arguments -# $1 wordlist separate by space, tab or newline -# $2 (optional) prefix to add -# $3 (optional) current word to complete -# $4 (optional) suffix to add -__grubcomp () { - local cur="${COMP_WORDS[COMP_CWORD]}" - if [ $# -gt 2 ]; then - cur="$3" - fi - case "$cur" in - --*=) - COMPREPLY=() - ;; - *) - local IFS=' '$'\t'$'\n' - COMPREPLY=($(compgen -P "${2-}" -W "${1-}" -S "${4-}" -- "$cur")) - ;; - esac -} - -# Function that return long options from the help of the command -# - arg: $1 (optional) command to get the long options from -__grub_get_options_from_help () { - local prog - - if [ $# -ge 1 ]; then - prog="$1" - else - prog="${COMP_WORDS[0]}" - fi - - local i IFS=" "$'\t'$'\n' - for i in $(LC_ALL=C $prog --help) - do - case $i in - --*) echo "${i%=*}";; - esac - done -} - -# Function that return long options from the usage of the command -# - arg: $1 (optional) command to get the long options from -__grub_get_options_from_usage () { - local prog - - if [ $# -ge 1 ]; then - prog="$1" - else - prog="${COMP_WORDS[0]}" - fi - - local i IFS=" "$'\t'$'\n' - for i in $(LC_ALL=C $prog --usage) - do - case $i in - \[--*\]) i=${i#[} # Remove leading [ - echo ${i%%?(=*)]} # Remove optional value and trailing ] - ;; - esac - done -} - -__grub_get_last_option () { - local i - for (( i=$COMP_CWORD-1; i > 0; i-- )); do - if [[ "${COMP_WORDS[i]}" == -* ]]; then - echo "${COMP_WORDS[i]}" - break; - fi - done -} - -__grub_list_menuentries () { - local cur="${COMP_WORDS[COMP_CWORD]}" - local config_file=$(__grub_dir)/grub.cfg - - if [ -f "$config_file" ];then - local IFS=$'\n' - COMPREPLY=( $(compgen \ - -W "$( awk -F "[\"']" '/menuentry/ { print $2 }' $config_file )" \ - -- "$cur" )) #'# Help emacs syntax highlighting - fi -} - -__grub_list_modules () { - local grub_dir=$(__grub_dir) - local IFS=$'\n' - COMPREPLY=( $( compgen -f -X '!*/*.mod' -- "${grub_dir}/$cur" | { - while read -r tmp; do - [ -n $tmp ] && { - tmp=${tmp##*/} - printf '%s\n' ${tmp%.mod} - } - done - } - )) -} - -# -# grub-set-default & grub-reboot -# -_grub_set_entry () { - local cur prev split=false - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - _split_longopt && split=true - - case "$prev" in - --boot-directory) - _filedir -d - return - ;; - esac - - $split && return 0 - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a menuentry - __grub_list_menuentries - fi -} - -__grub_set_default_program="grub-set-default" -have ${__grub_set_default_program} && \ - complete -F _grub_set_entry -o filenames ${__grub_set_default_program} -unset __grub_set_default_program - -__grub_reboot_program="grub-reboot" -have ${__grub_reboot_program} && \ - complete -F _grub_set_entry -o filenames ${__grub_reboot_program} -unset __grub_reboot_program - - -# -# grub-editenv -# -_grub_editenv () { - local cur prev - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - case "$prev" in - create|list|set|unset) - COMPREPLY=( "" ) - return - ;; - esac - - __grubcomp "$(__grub_get_options_from_help) - create list set unset" -} - -__grub_editenv_program="grub-editenv" -have ${__grub_editenv_program} && \ - complete -F _grub_editenv -o filenames ${__grub_editenv_program} -unset __grub_editenv_program - - -# -# grub-mkconfig -# -_grub_mkconfig () { - local cur prev - - COMPREPLY=() - cur=`_get_cword` - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - _filedir - fi -} -__grub_mkconfig_program="grub-mkconfig" -have ${__grub_mkconfig_program} && \ - complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program} -unset __grub_mkconfig_program - - -# -# grub-setup -# -_grub_setup () { - local cur prev split=false - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - _split_longopt && split=true - - case "$prev" in - -d|--directory) - _filedir -d - return - ;; - esac - - $split && return 0 - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a filename - _filedir - fi -} - -__grub_bios_setup_program="grub-bios-setup" -have ${__grub_bios_setup_program} && \ - complete -F _grub_setup -o filenames ${__grub_bios_setup_program} -unset __grub_bios_setup_program - -__grub_sparc64_setup_program="grub-sparc64-setup" -have ${__grub_sparc64_setup_program} && \ - complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program} -unset __grub_sparc64_setup_program - - -# -# grub-install -# -_grub_install () { - local cur prev last split=false - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - last=$(__grub_get_last_option) - - _split_longopt && split=true - - case "$prev" in - --boot-directory) - _filedir -d - return - ;; - --disk-module) - __grubcomp "biosdisk ata" - return - ;; - esac - - $split && return 0 - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - case "$last" in - --modules) - __grub_list_modules - return - ;; - esac - - # Default complete with a filename - _filedir - fi -} -__grub_install_program="grub-install" -have ${__grub_install_program} && \ - complete -F _grub_install -o filenames ${__grub_install_program} -unset __grub_install_program - - -# -# grub-mkfont -# -_grub_mkfont () { - local cur - - COMPREPLY=() - cur=`_get_cword` - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a filename - _filedir - fi -} -__grub_mkfont_program="grub-mkfont" -have ${__grub_mkfont_program} && \ - complete -F _grub_mkfont -o filenames ${__grub_mkfont_program} -unset __grub_mkfont_program - - -# -# grub-mkrescue -# -_grub_mkrescue () { - local cur prev last - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - last=$(__grub_get_last_option) - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - case "$last" in - --modules) - __grub_list_modules - return - ;; - esac - - # Default complete with a filename - _filedir - fi -} -__grub_mkrescue_program="grub-mkrescue" -have ${__grub_mkrescue_program} && \ - complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program} -unset __grub_mkrescue_program - - -# -# grub-mkimage -# -_grub_mkimage () { - local cur prev split=false - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - _split_longopt && split=true - - case "$prev" in - -d|--directory|-p|--prefix) - _filedir -d - return - ;; - -O|--format) - # Get available format from help - local prog=${COMP_WORDS[0]} - __grubcomp "$(LC_ALL=C $prog --help | \ - awk -F ":" '/available formats/ { print $2 }' | \ - sed 's/, / /g')" - return - ;; - esac - - $split && return 0 - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a filename - _filedir - fi -} -__grub_mkimage_program="grub-mkimage" -have ${__grub_mkimage_program} && \ - complete -F _grub_mkimage -o filenames ${__grub_mkimage_program} -unset __grub_mkimage_program - - -# -# grub-mkpasswd-pbkdf2 -# -_grub_mkpasswd_pbkdf2 () { - local cur - - COMPREPLY=() - cur=`_get_cword` - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a filename - _filedir - fi -} -__grub_mkpasswd_pbkdf2_program="grub-mkpasswd-pbkdf2" -have ${__grub_mkpasswd_pbkdf2_program} && \ - complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program} -unset __grub_mkpasswd_pbkdf2_program - - -# -# grub-probe -# -_grub_probe () { - local cur prev split=false - - COMPREPLY=() - cur=`_get_cword` - prev=${COMP_WORDS[COMP_CWORD-1]} - - _split_longopt && split=true - - case "$prev" in - -t|--target) - # Get target type from help - local prog=${COMP_WORDS[0]} - __grubcomp "$(LC_ALL=C $prog --help | \ - awk -F "[()]" '/--target=/ { print $2 }' | \ - sed 's/|/ /g')" - return - ;; - esac - - $split && return 0 - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a filename - _filedir - fi -} -__grub_probe_program="grub-probe" -have ${__grub_probe_program} && \ - complete -F _grub_probe -o filenames ${__grub_probe_program} -unset __grub_probe_program - - -# -# grub-script-check -# -_grub_script_check () { - local cur - - COMPREPLY=() - cur=`_get_cword` - - if [[ "$cur" == -* ]]; then - __grubcomp "$(__grub_get_options_from_help)" - else - # Default complete with a filename - _filedir - fi -} -__grub_script_check_program="grub-script-check" -have ${__grub_script_check_program} && \ - complete -F _grub_script_check -o filenames ${__grub_script_check_program} - - -# Local variables: -# mode: shell-script -# sh-basic-offset: 4 -# sh-indent-comment: t -# indent-tabs-mode: nil -# End: -# ex: ts=4 sw=4 et filetype=sh diff --git a/bind/bind.keys b/bind/bind.keys index 5e5a32b..6d4217f 100644 --- a/bind/bind.keys +++ b/bind/bind.keys @@ -4,42 +4,30 @@ # be configured elsewhere; if they are configured here, they will not be # recognized or used by named. # -# The built-in trust anchors are provided for convenience of configuration. -# They are not activated within named.conf unless specifically switched on. -# To use the built-in key, use "dnssec-validation auto;" in the -# named.conf options. Without this option being set, the keys in this -# file are ignored. +# To use the built-in root key, set "dnssec-validation auto;" in the +# named.conf options, or else leave "dnssec-validation" unset. If +# "dnssec-validation" is set to "yes", then the keys in this file are +# ignored; keys will need to be explicitly configured in named.conf for +# validation to work. "auto" is the default setting, unless named is +# built with "configure --disable-auto-validation", in which case the +# default is "yes". # # This file is NOT expected to be user-configured. # -# These keys are current as of October 2017. If any key fails to -# initialize correctly, it may have expired. In that event you should -# replace this file with a current version. The latest version of -# bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys. +# Servers being set up for the first time can use the contents of this file +# as initializing keys; thereafter, the keys in the managed key database +# will be trusted and maintained automatically. # -# See https://data.iana.org/root-anchors/root-anchors.xml -# for current trust anchor information for the root zone. - -managed-keys { - # This key (19036) is to be phased out starting in 2017. It will - # remain in the root zone for some time after its successor key - # has been added. It will remain this file until it is removed from - # the root zone. - . initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF - FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX - bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD - X6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpz - W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS - Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq - QxA+Uk1ihz0="; +# These keys are current as of Mar 2019. If any key fails to initialize +# correctly, it may have expired. In that event you should replace this +# file with a current version. The latest version of bind.keys can always +# be obtained from ISC at https://www.isc.org/bind-keys. +# +# See https://data.iana.org/root-anchors/root-anchors.xml for current trust +# anchor information for the root zone. +trust-anchors { # This key (20326) was published in the root zone in 2017. - # Servers which were already using the old key (19036) should - # roll seamlessly to this new one via RFC 5011 rollover. Servers - # being set up for the first time can use the contents of this - # file as initializing keys; thereafter, the keys in the - # managed key database will be trusted and maintained - # automatically. . initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3 +/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF diff --git a/bind/named.conf.default-zones b/bind/named.conf.default-zones index 355338b..1a85ad3 100644 --- a/bind/named.conf.default-zones +++ b/bind/named.conf.default-zones @@ -1,7 +1,7 @@ // prime the server with knowledge of the root servers zone "." { type hint; - file "/etc/bind/db.root"; + file "/usr/share/dns/root.hints"; }; // be authoritative for the localhost forward and reverse zones, and for diff --git a/bind/named.conf.options b/bind/named.conf.options index cb9cc32..4778d18 100644 --- a/bind/named.conf.options +++ b/bind/named.conf.options @@ -20,80 +20,5 @@ options { //======================================================================== dnssec-validation auto; - auth-nxdomain no; # conform to RFC1035 listen-on-v6 { any; }; - listen-on { any; }; - - allow-query { - /* - * Accept queries from our "trusted" ACL. We will - * allow anyone to query our master zones below. - * This prevents us from becoming a free DNS server - * to the masses. - */ - trusted; - local_ips; - private_ips; - }; - - allow-query-cache { - /* Use the cache for the "trusted" ACL. */ - trusted; - local_ips; - private_ips; - }; - - allow-recursion { - /* Only trusted addresses are allowed to use recursion. */ - trusted; - local_ips; - private_ips; - }; - - allow-transfer { - /* Zone tranfers are denied by default. */ - trusted; - private_ips; - }; - - allow-update { - /* Don't allow updates, e.g. via nsupdate. */ - none; - }; - - /* - * If you've got a DNS server around at your upstream provider, enter its - * IP address here, and enable the line below. This will make you benefit - * from its cache, thus reduce overall DNS traffic in the Internet. - * - * Uncomment the following lines to turn on DNS forwarding, and change - * and/or update the forwarding ip address(es): - */ - forward first; - forwarders { - // 123.123.123.123; // Your ISP NS - // 124.124.124.124; // Your ISP NS - // 4.2.2.1; // Level3 Public DNS - // 4.2.2.2; // Level3 Public DNS - 10.12.11.254; - 8.8.8.8; // Google Open DNS - 8.8.4.4; // Google Open DNS - }; - -}; - -// Managed Keys -include "/etc/bind/bind.keys"; - -include "/etc/bind/rndc.key"; - -controls { - inet 127.0.0.1 port 953 allow { - 127.0.0.1; - ::1/128; - } keys { - "rndc-key"; - }; }; - -# vim: ts=4 filetype=named noai diff --git a/brltty.conf b/brltty.conf index 2d0d087..daa8dc4 100644 --- a/brltty.conf +++ b/brltty.conf @@ -3,16 +3,16 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # # This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -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 @@ -202,6 +203,7 @@ #text-table pt # Portuguese #text-table ro # Romanian #text-table ru # Russian +#text-table se # Sami (Northern) #text-table sa # Sanskrit #text-table sat # Santali #text-table sd # Sindhi @@ -214,6 +216,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. @@ -232,6 +235,8 @@ #contraction-table am # Amharic (uncontracted) #contraction-table de-basis # German (uncontracted) #contraction-table de-kurzschrift # German (contracted - 1998 standard) +#contraction-table de-kurzschrift-1998 # German (contracted - 1998 standard) +#contraction-table de-kurzschrift-2015 # German (contracted - 2015 standard) #contraction-table de-vollschrift # German (basic contractions) #contraction-table en-ueb-g2 # English (Unified English Braille, grade 2) #contraction-table en-us-g2 # English (US, grade 2) @@ -244,6 +249,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) @@ -300,7 +306,7 @@ #braille-parameters lb:Table=us.tbl # # TSI Braille Driver Parameters -#braille-parameters ts:HighBaud=yes # [no,yes] +#braille-parameters ts:HighBaud=yes # [yes,no] #braille-parameters ts:SetBaud=9600 # [4800,9600,19200] # TTY Braille Driver Parameters @@ -340,6 +346,7 @@ #speech-driver an # Android (text to speech engine) #speech-driver bl # BrailleLite #speech-driver cb # CombiBraille +#speech-driver en # eSpeak-NG (text to speech engine) #speech-driver es # eSpeak (text to speech engine) #speech-driver fl # FestivalLite (text to speech engine) #speech-driver fv # Festival (text to speech engine) @@ -380,6 +387,12 @@ #speech-parameters es:PunctList= #speech-parameters es:Voice=default +# eSpeak-NG Speech Driver Parameters +#speech-parameters en:MaxRate=450 # [80-] +#speech-parameters en:Path= +#speech-parameters en:PunctList= +#speech-parameters en:Voice=en + # ExternalSpeech Speech Driver Parameters #speech-parameters xs:Program=/usr/local/bin/externalspeech #speech-parameters xs:Uid=65534 @@ -416,20 +429,21 @@ #speech-parameters th:Pitch=0.0 # [-2.0-2.0] # ViaVoice Speech Driver Parameters -#speech-parameters vv:IniFile=/usr/lib/ViaVoiceTTS/eci.ini -#speech-parameters vv:SampleRate= # [8000,11025,22050] -#speech-parameters vv:AbbreviationMode= # [on,off] -#speech-parameters vv:NumberMode= # [word,year] -#speech-parameters vv:SynthMode= # [sentence,none] -#speech-parameters vv:TextMode= # [talk,spell,literal,phonetic] -#speech-parameters vv:Language= # [AmericanEnglish,BritishEnglish,CastilianSpanish,MexicanSpanish,StandardFrench,CanadianFrench,StandardGerman,StandardItalian,SimplifiedChinese,BrazilianPortuguese] -#speech-parameters vv:Voice= # [AdultMale,AdultFemale,Child,ElderlyFemale,ElderlyMale] -#speech-parameters vv:VocalTract= # [male,female] -#speech-parameters vv:Breathiness= # [0-100] +#speech-parameters vv:Quality= # [fair,poor,good] +#speech-parameters vv:Mode= # [words,letters,punctuation,phonetic] +#speech-parameters vv:Synthesize= # [sentences,all] +#speech-parameters vv:Abbreviations= # [on,off] +#speech-parameters vv:Years= # [on,off] +#speech-parameters vv:Language= # [American-English, British-English, Castilian-Spanish, Mexican-Spanish, Standard-French, Canadian-French, Standard-German, Standard-Italian, Standard-Mandarin-GBK, Standard-Mandarin-PinYin, Standard-Mandarin-UCS2, Taiwanese-Mandarin-Big5, Taiwanese-Mandarin-ZhuYin, Taiwanese-Mandarin-PinYin, Taiwanese-Mandarin-UCS2, Brazilian-Portuguese, Standard-Japanese-SJIS, Standard-Japanese-UCS2, Standard-Finnish, Standard-Korean-UHC, Standard-Korean-UCS2, Standard-Cantonese-GBK, Standard-Cantonese-UCS2, HongKong-Cantonese-Big5, HongKong-Cantonese-UCS2, Standard-Dutch, Standard-Norwegian, Standard-Swedish, Standard-Danish, Standard-Thai-TIS620] +#speech-parameters vv:Voice= # [man,woman,child,patriarch,matriarch] +#speech-parameters vv:Gender= # [male,female] #speech-parameters vv:HeadSize= # [0-100] -#speech-parameters vv:PitchBaseline= # [0-100] -#speech-parameters vv:PitchFluctuation= # [0-100] +#speech-parameters vv:PitchBaseline= # [40-422 Hz] +#speech-parameters vv:Expressiveness= # [0-100] (pitch fluctuation) #speech-parameters vv:Roughness= # [0-100] +#speech-parameters vv:Breathiness= # [0-100] +#speech-parameters vv:Volume= # [0-100 %] +#speech-parameters vv:Speed= # [70-1297 wpm] ##################### @@ -574,6 +588,17 @@ # (can be overridden with the -T [--tables-directory=] option) #tables-directory /etc/brltty +# The start-message directive specifies the text to be shown when the braille +# driver starts and to be spoken when the speech driver starts. If not +# specified, "BRLTTY 6.0" will be used. +# (can be overridden with the -Y [--start-message=] option) +#start-message BRLTTY\s6.0 + +# The stop-message directive specifies the text to be shown when the braille +# driver stops. If not specified, "BRLTTY stopped" will be used. +# (can be overridden with the -Z [--stop-message=] option) +#stop-message BRLTTY\sstopped + ################################################ # Application Programming Interface Parameters # @@ -632,8 +657,9 @@ # Linux Screen Driver Parameters #screen-parameters lx:Charset=name+... # [] -#screen-parameters lx:DebugSfm=no # [no,yes] #screen-parameters lx:HFB=auto # [auto,vga,fb,0-7] +#screen-parameters lx:logSFM=no # [no,yes] +#screen-parameters lx:Unicode=yes # [yes,no] #screen-parameters lx:VT=0 # [0-63] # Windows Screen Driver Parameters diff --git a/brltty/Attributes/invleft_right.atb b/brltty/Attributes/invleft_right.atb index ae102f8..0e8ecd5 100644 --- a/brltty/Attributes/invleft_right.atb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Attributes/left_right.atb b/brltty/Attributes/left_right.atb index bb2adaa..820e2c7 100644 --- a/brltty/Attributes/left_right.atb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Attributes/upper_lower.atb b/brltty/Attributes/upper_lower.atb index bd60ef0..5fbb80f 100644 --- a/brltty/Attributes/upper_lower.atb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/af.ctb b/brltty/Contraction/af.ctb index f11fe25..46ba3e8 100644 --- a/brltty/Contraction/af.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -72,3 +72,6 @@ always * 35-35 always ^ 45 numsign 3456 capsign 6 + +# inline contraction of emoji descriptions +cldr af diff --git a/brltty/Contraction/am.ctb b/brltty/Contraction/am.ctb index 66a8ca1..77f03d9 100644 --- a/brltty/Contraction/am.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/countries.cti b/brltty/Contraction/countries.cti index 51df4a4..f1856bf 100644 --- a/brltty/Contraction/countries.cti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/de-basis.ctb b/brltty/Contraction/de-basis.ctb index 90e22e6..6b2fc65 100644 --- a/brltty/Contraction/de-basis.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/de-kurzschrift-1998.ctb b/brltty/Contraction/de-kurzschrift-1998.ctb new file mode 100644 index 0000000..4f16409 --- /dev/null +++ b/brltty/Contraction/de-kurzschrift-1998.ctb @@ -0,0 +1,1521 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# BRLTTY Contraction Table - German (contracted - 1998 standard) +# Created by Mario Lang . + +include de-vollschrift.ctb + +class e e +class g g +class h h +class m m +class n n +class r r +class hilmnrsu hilmnrsu +class l l +class lnr lnr +class st st +class konsonant bcdfghjklmnpqrstvwxyz + +# Ausnahmen für Vokalgruppen aus de-vollschrift.ctb +before e always arteri 356-2345-12456-24 +always barrier 12-356-1235-24-12456 shouldn't use the ie-contraction +always bankier 12-235-13-24-12456 shouldn't use the ie-contraction +midendword iell 24-15-12345 shouldn't use the ie-contraction +always indien 35-145-24-14 shouldn't use the ie-contraction +always karrier 13-356-1235-24-12456 +always medien 134-15-145-24-14 shouldn't use the ie-contraction +always propriet 12345-1234-1235-24-15-2345 proprietär shouldn't use the ie-contraction +endword serie 234-12456-24-15 +always spezies 234-1234-15-1356-24-123456 shouldn't use the ie-contraction + +include de-kurzschrift-wort.cti + +# Due to their low usage frequency in typical german text the letters +# c, q, x and y are reused for the en-, ll-, ex/mm/nis- and el-contractions. +# Therefore they need a proceding letsign to disambiguate them. +always c 6-14 +always C 6-14 +always q 6-12345 +always Q 6-12345 +always x 6-1346 +always X 6-1346 +always y 6-13456 +always Y 6-13456 + +# Lautgruppenkürzungen +midendword ach 56 +begmidword al 25 +begmidword : 6-25 +begmidword an 235 +begmidword ar 356 +begmidword be 23 +midendword beule 12-126-123-15 +midendword beulen 12-126-123-14 +before g always beu 12-126 +always bell 23-12345 tabelle should use the ll-contraction +midendword ck 46 +midword eh 2356 +always kohle = +always kohlen 13-135-125-123-14 +always kohleintopf 13-135-125-123-1246-2345-135-1234-124 +always kohleintöpf 13-135-125-123-1246-2345-246-1234-124 +before g always kohleinla 13-135-125-123-1246-123-1 +before e always kohleul 13-135-125-123-126-123 ⠨⠅⠕⠓⠇⠣⠇⠉ +always ein 1246 +always einnen 15-35-1345-14 ⠨⠯⠓⠌⠎⠑⠔⠝⠉⠎⠩⠦ ⠨⠯⠓⠌⠎⠑⠔⠝⠉⠞⠷⠏⠻⠁⠞⠥⠗ ⠨⠧⠊⠵⠑⠔⠝⠉⠍⠔⠊⠾⠻ +always lateinisch 123-1-2345-146-1345-24-156 shouldn't use the ein-contraction +always el 13456 +begmidword elineal 15-123-35-15-25 +endword elineal 15-123-35-15-1-123 +always eleist 15-123-146-23456 +always em 12356 +always emach 15-134-56 +before e always emachs 12356-56-234 Systemachse +always en 14 +always denunz 145-15-1345-256-1356 shouldn't use the en-contraction +always er 12456 +always dereferenzier 145-15-1235-15-124-12456-14-1356-346-1235 shouldn't use the er-contraction +always deregulier 145-15-1235-15-1245-136-123-346-1235 shouldn't use the er-contraction +always es 123456 +always ge 12346 +prfword gehe 1245-2356-15 +prfword gehen 1245-2356-14 +prfword gehend 1245-2356-14-145 +prfword gehende 1245-2356-14-145-15 +prfword gehendem 1245-2356-14-145-12356 +prfword gehenden 1245-2356-14-145-14 +prfword gehender 1245-2356-14-145-12456 +prfword gehendes 1245-2356-14-145-123456 +before konsonant always geh 1245-2356 +always umgehung 136-134-1245-2356-136 shouldn't use the ge-contraction +before konsonant always bel 12-13456 Übelkeit shouldn't use the be-contraction +word bel 12-13456 +before konsonant always bem 12-12356 +before konsonant always ben 12-14 +before konsonant always ber 12-12456 +before konsonant always gel 1245-13456 klingelton shouldn't use the ge-contraction +before konsonant always gen 1245-14 +begword lungen 123-256-1245-14 shouldn't use the ge-contraction +begword magen 134-1-1245-14 shouldn't use the ge-contraction +before konsonant always ten 2345-14 +always elefant 13456-15-124-235-2345 +before konsonant always ter 2345-12456 +always güter 1245-1256-2345-12456 should use the er-contraction +always güteregel 1245-1256-236-1235-15-1245-13456 +always gütericht 1245-1256-236-2-3456 +midendword ich 3456 +midendword ig 45 +always in 35 + +midendword lich 456 +always lichtbogen 123-3456-2345-12-135-1245-14 shouldn't use the lich-contraction +always lichtnahr 123-3456-2345-1345-1-125-1235 shouldn't use the lich-contraction +always lichtsch 123-3456-2345-156 +always bodenlicht 12-135-145-14-123-3456-2345 shouldn't use the lich-contraction +begword see = +begword neusee 1345-126-234-15-15 +#before konsonant always seen 234-15-14 +word seele 234-15-13456-15 +sufword seelen 234-15-13456-14 +always seelisch 234-15-13456-24-156 +word teer 2345-15-12456 +sufword teerartig 2345-15-12456-356-2345-45 +before konsonant begword teer 2345-15-12456 +word teere 2345-15-12456-15 +word teeren 2345-15-12456-14 +word teerend 2345-15-12456-14-145 +word teerende 2345-15-12456-14-145-15 +word teerendem 2345-15-12456-14-145-12356 +word teerenden 2345-15-12456-14-145-14 +word teerender 2345-15-12456-14-145-12456 +word teerendes 2345-15-12456-14-145-123456 +word teerung 2345-15-12456-136 +word teerungen 2345-15-12456-136-14 +always teelich 2345-15-15-456 shouldn't use the el-contraction +always teelöffel 2345-15-15-123-246-124-124-13456 shouldn't use the el-contraction +always teemaschin 2345-15-15-134-156 shouldn't use the em-contraction +always teesieb 2345-15-15-234-346-12 shouldn't use the es-contraction +midendword ll 12345 +always holland 125-135-123-123-235-145 shouldn't use the ll-contraction +always holländer 125-135-123-123-345-1345-145-12456 shouldn't use the ll-contraction +always hollaender 125-135-123-123-345-1345-145-12456 shouldn't use the ll-contraction +midendword mm 1346 +always wurm = wurmmittel shouldn't use the mm-contraction +begmidword or 26 + +always schaos 234-1456-1-135-234 +after konsonant midword ss = +after konsonant midendword ssatz 234-234-1356 +after konsonant midendword ssätz 234-5-234-1356 +after konsonant midendword ssaetz 234-5-234-1356 +after konsonant midword ssch 234-156 +always sschicht 234-156-3456-2345 +always sschlag 234-156-1245 +always sschläg 234-5-156-1245 +always sschlaeg 234-5-156-1245 +always sschließ 234-156-2346 +always sschmuck 234-156-134-136-46 +always sschnur 234-156-1345-136-1235 shouldn't use the nur-contraction +always sschool 234-234-1456-135-135-123 foreign word, sch-contraction not allowed +always sschreib 234-156-12 +always sschrieb 234-2-156 +always sschrift 234-156-2345 +always sschwierig 234-156-45 +always sselbst 234-234-23456 +always sselbständ 234-234-13456-12-5-23456 shouldn't use the selbst-contraction +always sselbstaend 234-234-13456-12-5-23456 shouldn't use the selbst-contraction +after konsonant always ssetz 234-2-15 +after konsonant midendword ssesam 234-234-123456-1-134 shouldn't use the sam-contraction +always ssicher 234-234-3456-12456 +after konsonant always ssitz 234-2-24 +always ssolch 234-234-1456 +after konsonant midendword ssoll 234-2-234 +always ssondern 234-234-1345 +always ssozial 234-234-123 +always espiel 15-2-346 +always sspiel 234-2-346 +always esprach 15-234-1234 +always ssprach 234-234-1234 +always sspräch 234-5-234-1234 +always sspraech 234-5-234-1234 +always esprech 15-2-2346 +always ssprech 234-2-2346 +after konsonant midendword sst 234-23456 +always sstaat 234-23456-2345 +after konsonant midendword sstand 234-2-23456 +after konsonant midendword sständ 234-5-23456 +after konsonant midendword sstaend 234-5-23456 +after konsonant midendword sstell 234-2-13456 +always ssteiger 234-23456-146-1245-12456 +before e always sstund 234-23456-256-145 shouldn't use the und-contraction +midendword ss 2346 + +midendword te 236 +sufword atem 1-2345-12356 shouldn't use the te-contraction +always un 256 + +midendword tei 2345-146 + +always all 1-12345 +always ell 15-12345 +always emm 15-1346 +always esch 15-156 +always ess 15-2346 +always est 15-23456 + +endword tel 2345-13456 +always scheitel 156-146-2345-13456 shouldn't use the te-contraction +begword bettel 12-15-2345-2345-13456 shouldn't use the te-contraction +endword teln 2345-13456-1345 +endword tels 2345-13456-234 +endword tem 2345-12356 +endword tene 2345-14-15 +always tten 2345-2345-14 shouldn't use the te-contraction +always tter 2345-2345-12456 shouldn't use the te-contraction +always daten 145-1-2345-14 +always karten 13-356-2345-14 +midendword maten 134-1-2345-14 shouldn't use the te-contraction +endword tenem 2345-14-12356 +endword tenen 2345-14-14 +endword tener 2345-14-12456 +endword benes 12-14-123456 +endword tenes 2345-14-123456 +endword tens 2345-14-234 +endword ter 2345-12456 +endword tere 2345-12456-15 +endword terem 2345-12456-12356 +endword teren 2345-12456-14 +endword teres 2345-12456-123456 +endword ters 2345-12456-234 +always liter 123-24-2345-12456 +endword tern 2345-12456-1345 +endword tes 2345-123456 + +endword bel 12-13456 shouldn't use the be-contraction +endword beln 12-13456-1345 shouldn't use the be-contraction +endword belns 12-13456-1345-234 shouldn't use the be-contraction +endword bels 12-13456-234 shouldn't use the be-contraction +midword belläng 12-13456-5-123-1245 kabellänge shouldn't use the ll-contraction +midword bellaeng 12-13456-5-123-1245 +midendword belung 12-13456-136 +before st midendword belungs 12-13456-136-234 +always belveder 12-13456-1236-15-145-12456 shouldn't use the be-contraction +always wirbel 2456-24-1235-12-13456 shouldn't use the be-contraction +endword ben 12-14 shouldn't use the be-contraction +endword bend 12-14-145 shouldn't use the be-contraction +endword bende 12-14-145-15 shouldn't use the be-contraction +endword bendem 12-14-145-12356 shouldn't use the be-contraction +endword benden 12-14-145-14 shouldn't use the be-contraction +endword bender 12-14-145-12456 shouldn't use the be-contraction +endword bendes 12-14-145-123456 shouldn't use the be-contraction +endword benem 12-14-12356 shouldn't use the be-contraction +endword benen 12-14-14 shouldn't use the be-contraction +endword bens 12-14-234 shouldn't use the be-contraction +endword ber 12-12456 shouldn't use the be-contraction +endword berei 12-12456-146 shouldn't use the be-contraction +endword bereien 12-12456-146-14 shouldn't use the be-contraction +endword berin 12-12456-35 shouldn't use the be-contraction +endword berinnen 12-12456-35-1345-14 shouldn't use the be-contraction +endword bern 12-12456-1345 shouldn't use the be-contraction +endword bers 12-12456-234 shouldn't use the be-contraction +always ober 135-12-12456 shouldn't use the be-contraction +endword bes 12-123456 shouldn't use the be-contraction + +always begeh 23-1245-2356 shouldn't use the ge-contraction +always getriebegehäus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction +always getriebegehaeus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction +always umgeht 136-134-1245-2356-2345 shouldn't use the ge-contraction +always geig 1245-146-1245 should use the ei-contraction +always geisel 1245-146-234-13456 shouldn't use the ge-contraction +always geist 1245-146-23456 +prfword gel 1245-13456 shouldn't use the ge-contraction +midendword gelhaft 1245-13456-125-124 +midword gelläng 1245-13456-5-123-1245 +midword gellaeng 1245-13456-5-123-1245 +prfword geln 1245-13456-1345 +prfword gelns 1245-13456-1345-234 +prfword gels 1245-13456-234 +midendword gelung 1245-13456-136 +before st midendword gelungs 1245-13456-136-234 +prfword gen 1245-14 shouldn't use the ge-contraction +midendword gend 1245-14-145 shouldn't use the ge-contraction +endword gens 1245-14-234 shouldn't use the ge-contraction +midendword ger 1245-12456 should use er-contraction if not part of a word intro +before r begword abge 1-12-12346 +before r begword ange 235-12346 +word anger 235-1245-12456 +word angern 235-1245-12456-1345 +word angers 235-1245-12456-234 +begword unange 256-235-12346 +begmidword aufger 2-16-12346-1235 +begmidword ausger 34-12346-1235 +before r begmidword einge 1246-12346 +begword unger 256-12346-1235 +sufword ungerecht 256-12346-1235-2345 +always gerieben 12346-1235-346-12-14 should use the ge-contraction +sufword zuge 2-1356-12346 +endword ges 1245-123456 shouldn't use the ge-contraction +always sieges 234-346-1245-123456 +always tageslicht 2345-1-1245-123456-123-3456-2345 shoudln't use the ge- nor lich-contraction +always euthanasie 126-2345-125-235-1-234-346 +always antasie 235-2345-1-234-346 +endword antasien 235-2345-1-234-24-14 +midendword ien 24-14 shouldn't use the ie-contraction +always erschien 12456-156-346-1345 +prfword industrien 35-145-136-23456-1235-24-14 +before n always industrie 35-145-136-23456-1235-346 industrienation shouldn't use the en-contraction +begmidword anomal 235-135-134-25 shouldn't use the mal-contraction +endword anomal 235-135-134-1-123 shouldn't use the mal-contraction +midendword iene 346-1345-15 should use the ie-contraction +midendword ienen 346-1345-14 should use the ie-contraction +endword tel 2345-13456 should use the el-contraction +endword ten 2345-14 should use the en-contraction +endword ter 2345-12456 should use the er-contraction +endword tes 2345-123456 should use the es-contraction +always trigraph = shouldn't use the ig-contraction + +# Vorsilbenkürzungen +begword aus 34 +begword ent 2346 +word enter 14-2345-12456 shouldn't use the ent-contraction +begword ex 1346 +begword pro 12345 +begword ver 36 +word verb 1236-12456-12 +word vers 1236-12456-234 + +begword auspiz 16-234-1234-24-1356 shouldn't use the aus-contraction +word ente 14-236 shouldn't use the ent-contraction +sufword enten 14-2345-14 shouldn't use the ent-contraction +word entchen 14-2345-1456-14 +begword veranda 1236-12456-236-145-1 shouldn't use the ver-contraction +begword vertikal 1236-12456-2345-24-13-25 shouldn't use the ver-contraction +word vertikal 1236-12456-2345-24-13-1-123 shouldn't use the ver-contraction + +# Nachsilbenkürzungen +endword falls 124 +midendword heit 125 +before s midword heits 125-234 +midendword keit 13 +before s midword keits 13-234 +midendword mal 134 +sufword gemal 12346-134-25 gemalt shouldn't use the mal-contraction +midendword nis 1346 +always nisier 1345-24-234-346-1235 technisierung shouldn't use -nis +midendword sam 2346 +sufword bisam = +always bischofsamt 12-24-156-135-124-234-1-134-2345 shouldn't use the sam-contraction +midendword schaft 156 +midendword ung 136 +always dschungel 6-145-156-256-1245-13456 shouldn't use the ung-contraction +midendword terung 2345-12456-136 +before cst midword ungs 136-234 Bindungscharakter, Regierungschef +midendword wärts 2456 + +midendword ation 5-1345 +always industrienation 35-145-136-23456-1235-346-1345-5-1345 +before s midword ations 5-1345-234 +midendword ativ 5-1236 +after st always ion 245 +always religion 1235-13456-45-245 +after st before st always ions 245-234 +always action 1-6-14-2345-245 +midword ionstricht 245-234-2345-1235-3456-2345 +endword ismus 5-24 +midendword istisch 5-156 +endword nismus 1345-5-24 shouldn't use the nis-contraction +midendword nistisch 1345-5-156 +midendword ität 5-345 +midendword itaet 5-345 +before s midword itäts 5-345-234 +before s midword itaets 5-345-234 +midendword mität 134-5-345 shouldn't use the mit-contraction + +sufword anis 235-24-234 shouldn't use the nis-contraction +before st midword ations 5-1345-234 +sufword barschaft 12-356-156-1-124-2345 shouldn't use the shaft-contraction +always blumensamen 12-123-136-134-14-234-1-134-14 shouldn't use the sam-contraction +prfword dezimal = if we use the mal-contraction here, we get a new word dezim +begmidword dezimal 145-15-1356-24-134-25 +sufword small 234-134-1-12345 shouldn't use the mal-contraction +word beaufort 12-15-16-124-26-2345 shouldn't use the auf-contraction +sufword erheiter 12456-125-146-2345-12456 shouldn't use the heit-contraction +prfword formal 124-26-134-1-123 shouldn't use the mal-contraction +begword formal 124-26-134-25 shouldn't use the mal-contraction +word firnis = shouldn't use the nis-contraction +begword gesam 12346-234-1-134 shouldn't use the sam-contraction +always herrschaft 1235-1235-156-1-124-2345 can not use the shaft-contraction +always hoheit 125-135-125-146-2345 shouldn't use the heit-contraction +always kuhdung 13-136-125-145-256-1245 shouldn't use the ung-contraction +always hunger 125-256-1245-12456 shouldn't use the ung-contraction +before g begword lun 123-256 shouldn't use the ung-contraction +prfword maximal = shouldn't use the mal-contraction +begmidword maximal 134-1-6-1346-24-134-25 shouldn't use the mal-contraction +always tennis 2345-14-1345-24-234 shouldn't use the nis-contraction +midendword ungscharakter 136-234-1456-13 +before st midendword ungs 136-234 shouldn't use the ss/st-contraction +midendword zung 1356-136 auseinandersetzung shouldn't use the zu-contraction +begword zung 1356-256-1245 shouldn't use the ung-contraction + +# Einformige Kürzungen, nur alleinstehend +word als 146 +word auch 34 +word eu = +word das 145 +word dass 2346 +word den 15 +word der 1235 +word des 3 +word die 346 +word ihm 236 +word im 36 not allowed when used in hyphenated words like Hans-im-Glück-Gefühl +after letter literal -im- +word ist 23456 +word kann 13 +word lässt 123 +word laesst 123 +word man 134 +word oder 135 +word schon 156 +word sich 14 +word sie 234 +word was 2456 + +# Einformige Kürzungen, alleinstehend oder in Wortverbindungen +word aber 1 +always aber 2-1 +always aberdeen 1-12-12456-145-15-15-1345 +midword aberech 1-23-1235-15-1456 +midendword abereich 1-23-1235-146-1456 +midendword abericht 1-23-2-3456 +begmidword aberkann 1-12-12456-13-235-1345 +always aberkenn 1-12-12456-13-14-1345 +begmidword abernt 1-12-12456-1345-2345 +prfword abernte 1-12-12456-1345-236 +prfword aberntest 1-12-12456-1345-236-23456 +prfword aberntet 1-12-12456-1345-236-2345 +prfword aberntete 1-12-12456-1345-236-236 +prfword abernteten 1-12-12456-1345-236-2345-14 +prfword aberntetest 1-12-12456-1345-236-236-23456 +prfword aberntetet 1-12-12456-1345-236-236-2345 +always aberrans 1-12-12456-1235-235-234 +always aberratio 1-12-12456-1235-1-2345-24-135 +always aberration 1-12-12456-1235-5-1345 +always aberrier 1-12-12456-1235-346-1235 +always aberzieh 1-12-12456-1356-346-125 +always aaberg 1-1-12-12456-1245 +always cabernet 6-14-1-12-12456-1345-15-2345 +sufword faber 124-1-12-12456 +midword gaber 1245-1-23-1235 +always gaberecht 1245-1-23-1235-2345 +always gaberegel 1245-1-23-1235-15-1245-13456 +sufword haber 125-1-12-12456 +always pharmaberat 1234-125-356-134-1-23-1235-1-2345 +always schaber 156-1-12-12456 +always eisschaber 146-234-156-1-12-12456 +always makaber 134-1-13-1-12-12456 +always kandelaber 13-235-145-13456-1-12-12456 +always laber 123-1-12-12456 +always annaberg 235-1345-1-12-12456-1245 +always araber 356-1-12-12456 +always graber 1245-1235-1-12-12456 +always traber 2345-1235-1-12-12456 +begmidword tabern 2345-1-12-12456-1345 +always waber 2456-1-12-12456 +always bergzabern 12-12456-1245-1356-1-12-12456-1345 + +word auf 16 +always auf 2-16 +before g always aufwie 2-16-2456-346 aufwiegeln/aufwiegler/aufwiegst shouldn't use the wie-contraction +before s always aufwie 2-16-2456-346 +begword aufzuck 2-16-1356-136-46 +before konsonant always aufzug 2-16-1356-136-1245 +always aufzugsturm 2-16-1356-136-1245-234-2345-136-1235-134 shouldn't use zu-contraction and st-contraction +before m always aufzugstür 2-16-1356-136-1245-234-2345-1256-1235 shouldn't use zu-contraction and st-contraction +always aufzugstür 2-16-1356-136-1245-234-2345-1256-1235 shouldn't use zu-contraction and st-contraction +prfword lauf 123-16-124 +prfword laufe 123-16-124-15 +prfword laufen 123-16-124-14 +prfword laufend 123-16-124-14-145 +prfword laufende 123-16-124-14-145-15 +prfword laufendem 123-16-124-14-145-12356 +prfword laufenden 123-16-124-14-145-14 +prfword laufender 123-16-124-14-145-12456 +prfword laufendes 123-16-124-14-145-123456 +prfword laufens 123-16-124-14-234 +prfword laufes 123-16-124-123456 +prfword laufs 123-16-124-234 +prfword laufst 123-16-124-23456 +prfword lauft 123-16-124-2345 +always schlauf 156-123-16-124 shouldn't use the auf-contraction +always abgelauf 1-12-12346-123-16-124 +always akkulauf 1-13-13-136-123-16-124 +always auflauf 2-16-123-16-124 +always durchlauf 2-1456-123-16-124 +begword verlauf 36-123-16-124 shouldn't use the auf-contraction +midendword verlauf 1236-12456-123-16-124 shouldn't use the auf-contraction + +word bei 12 +always bei 2-12 +always beizung 12-146-1356-136 shouldn't use the bei-contraction +always beiß 12-146-6-2346 shouldn't use the bei-contraction +endword bein 12-1246 shouldn't use the bei-contraction +endword beine 12-1246-15 shouldn't use the bei-contraction +endword beinen 12-1246-14 shouldn't use the bei-contraction +endword beines 12-1246-123456 shouldn't use the bei-contraction +endword beins 12-1246-234 shouldn't use the bei-contraction +before t always beinhal 23-35-125-25 shouldn't use the bei-contraction +always beinhalter 12-1246-125-25-2345-12456 should use the ei-contraction +always darmbein 145-356-134-12-1246 +always gabeinvent 1245-1-23-35-1236-14-2345 Übergabeinventar shouldn't use the bei-contraction +always kreuzbein 13-1235-126-1356-12-1246 +always schienbein 156-346-1345-12-1246 +always schlüsselbein 156-123-1256-2346-13456-12-1246 shouldn't use the bei-contraction + +word dem 12356 +always dem 2-12356 +endword dem 145-12356 shouldn't use the dem-contraction +always außerdem 16-6-2346-12456-2-12356 +always demask = demaskiert shouldn't use the dem-contraction +always demilit = shouldn't use the dem-contraction +always demonstr 145-12356-135-1345-23456-1235 shouldn't use the dem-contraction +word demo 145-12356-135 shouldn't use the dem-contraction +word demos 145-12356-135-234 shouldn't use the dem-contraction + +word durch 1456 +always durch 2-1456 +sufword durchzuck 2-1456-1356-136-46 shouldn't use the zu-contraction +word durchzug 2-1456-1356-136-1245 shouldn't use the zu-contraction +word durchzuges 2-1456-1356-136-1245-123456 shouldn't use the zu-contraction +sufword durchzugs 2-1456-1356-136-1245-234 shouldn't use the zu-contraction +#begword durcheinandergerat 1456-2-1246-12346-1235-1-2345 +always zugerat 2-1356-12346-1235-1-2345 shouldn't use the er-contraction + +word für 124 +always für 2-124 +always fürst 124-1256-1235-23456 shouldn't use the für-contraction + +word gegen 1245 +always gegen 2-1245 +prfword gegenzug 2-1245-1356-136-1245 +prfword gegenzuge 2-1245-1356-136-12346 +prfword gegenzuges 2-1245-1356-136-1245-123456 +prfword gegenzugs 2-1245-1356-136-1245-234 +before g sufword gegenzun 2-1245-1356-256 + +word gewesen 12346 +always gewesen 2-12346 +always fürsorgewesen 2-124-234-26-12346-2456-123456-14 shouldn't use the gewesen-contraction + +word immer 1346 +always immer 2-1346 +always immersion 24-1346-12456-234-245 shouldn't use the immer-contraction +always immersiv 24-1346-12456-234-24-1236 +always flimmer 124-123-24-1346-12456 +always wimmer 2456-24-1346-12456 shouldn't use the immer-contraction +always zimmer 1356-24-1346-12456 shouldn't use the immer-contraction + +word jetzt 245 +always jetzt 2-245 + +word mehr 2356 +always mehr 2-2356 + +word mit 2345 +always mit 2-2345 + +word nicht 1345 +word n 6-1345 +always nicht 2-1345 +always nichtzughör 2-1345-1356-136-1245-125-246-1235 +always nichtzuck 2-1345-1356-136-46 + +word so 1234 +always so 2-1234 +endword son = +always cursor = shouldn't use the so-contraction +begword absol = +begword absorb = +begword absorp = +always adsorbier 1-145-234-26-12-346-1235 +always aerosol 1-12456-135-234-135-123 +always amtsober 1-134-2345-234-135-12-12456 +always anthroposo 235-2345-125-1235-135-1234-135-234-135 +always chromosom 1456-1235-135-134-135-234-135-134 shouldn't use the so-contraction +always iso = +always konson = +begmidword sensor 234-14-234-26 +endword sensor 234-14-234-135-1235 +endword sensor 234-14-234-135-1235 +always sockel 234-135-46-13456 +word soda = +always soffizier 234-135-124-124-24-1356-346-1235 +always soft = +always soldat = +endword solo = +always sommer 234-135-1346-12456 +before konsonant always son = +always sonogra = +always sonn = +always sonst 234-135-1345-23456 +always sorientier 234-26-24-14-2345-346-1235 +before konsonant always sor 234-26 +always source = +sufword south = +always sowjet = +always soziolo = +midword ungsopt 136-234-135-1234-2345 Abendgestaltungsoption shouldn't use the so-contraction + +word über 1256 +word ueber 1256 +always über 2-1256 +always überzucht 2-1256-1356-136-1456-2345 +always überzuck 2-1256-1356-136-46 +prfword überzug 2-1256-1356-136-1245 +prfword überzuges 2-1256-1356-136-1245-123456 +before konsonant always überzug 2-1256-1356-136-1245 +always überlauf 2-1256-123-16-124 + +word und 136 +always und 2-136 +sufword gesund 12346-234-256-145 +prfword hund 125-256-145 shouldn't use the und-contraction +always hunde 125-256-145-15 shouldn't use the und-contraction +always hundert 125-256-145-12456-2345 shouldn't use the und-contraction +prfword hunderte 125-256-145-12456-236 shouldn't use the und-contraction +prfword hunden 125-256-145-14 shouldn't use the und-contraction +prfword hundes 125-256-145-123456 shouldn't use the und-contraction +always kund 13-256-145 shouldn't use the und-contraction +always mund 134-256-145 shouldn't use the und-contraction +always rundfunk 1235-256-145-124-256-13 shouldn't use the und-contraction +sufword schrund 156-1235-256-145 +always wund 2456-256-145 shouldn't use the und-contraction + +word unter 256 +always unter 2-256 +sufword kunter 13-256-2345-12456 shouldn't use the unter-contraction +sufword kunterbunter 13-256-2345-12456-12-256-2345-12456 +sufword munter 134-256-2345-12456 shouldn't use the unter-contraction +sufword untereinander 256-2-1246 +always virus = + +word voll 12345 +always voll 2-12345 +prfword vollzug 2-12345-1356-136-1245 +prfword vollzuge 2-12345-1356-136-12346 +prfword vollzuges 2-12345-1356-136-1245-123456 +always vollzugs 2-12345-1356-136-1245-234 + +word von 1236 +always von 2-1236 + +word vor 26 +always vor 2-26 +always vorzugs 2-26-1356-136-1245-234 +always vorzugstimmen 2-26-1356-136-1245-23456-24-1346-14 +always favorit 124-1-1236-26-24-2345 shouldn't use the vor-contraction + +word wie 126 +always wie 2-126 +always zwiebel 1356-2456-346-12-13456 shouldn't use the wie-contraction + +word zu 1356 +always zu 2-1356 +always zugentlast 1356-136-1245-14-2345-123-1-23456 shouldn't use the zu- nor ge-contraction +word indem 35-2-12356 +word trotzdem 2345-1356-2-12356 +word zudem 1356-2-12356 +always zucht 1356-136-1456-2345 shouldn't use the zu-contraction +always zuck 1356-136-46 shouldn't use the zu-contraction +before g always zug = +endword zug = +endword zuges 1356-136-1245-123456 + +# Einformige Kürzungen, alleinstehend oder am Wortanfang +sufword ihr 24 +sufword sein 246 +word war 356 +word waren 356-14 +word warst 356-23456 +word wart 356-2345 +word war's 356-6-234 +word wär 5-356 +word wäre 5-356-15 +word wären 5-356-14 +word wärest 5-356-15-23456 +word wäret 5-356-15-2345 +word wärst 5-356-23456 +word wärt 5-356-2345 +word wär's 5-356-6-234 + +# Einformige Kürzungen, alleinstehend, mit Endungen oder in Wortverbindungen +always hatt 125 +always hätt 345 +always haett 345 +always welch 13456 + +word adonis = shouldn't use the nis-contraction +always aktuell 1-13-2345-136-15-12345 should use the ll-contraction +always all 1-12345 +sufword alle 1-15 +always allegor 1-12345-15-1245-26 Allegorie shouldn't use the ae-contraction +always allein 1-1246 +word allem 1-12356 +always allen 1-14 +always aller 1-12456 +always allerg 1-12345-12456-1245 Allergiker +word alles 1-123456 +always allesamt 1-12345-15-234-1-134-2345 shouldn't use the es-contraction +always alphabet 25-1234-125-1-12-15-2345 shouldn't use the hab-contraction +word also 1-135 +always ander 2-12456 +always wander 2456-235-145-12456 wandern shouldn't use the ander-contraction +sufword zander 1356-235-145-12456 +always änder 5-12456 +always abänder 1-12-5-12456 +always bänder 12-345-1345-145-12456 shouldn't use the änder-contraction +always aender 5-12456 +always arbeit 356-12 +before s always arbeits 356-12-234 +always arben 356-12-14 +always kauf 13-16-124 +begword aussprech 16-2-2346 +midendword aussprech 16-234-2-2346 +midendword ausstell 16-234-2-13456 +always australi 16-23456-1235-25-24 shouldn't use the aus-contraction +always austria 16-23456-1235-24-1 shouldn't use the aus-contraction +#begword äuß 5-34 FIXME: how to deal with äußerst? + +always ähnlich 345-456 +always aehnlich 345-456 + +word balsam 12-25-234-1-134 +word been 12-15-15-1345 english word shouldn't use be- or en-contraction +always beere 12-15-15-1235-15 +always beeren 12-15-15-1235-14 +always behr 12-2356-1235 entbehren +begword beid 12-145 beiderseits +always berg 12-12456-1245 shouldn't use the be-contraction +always berge 12-12456-12346 shouldn't use the be-contraction +always bergen 12-12456-1245-14 shouldn't use the be-contraction +always berger 12-12456-1245-12456 shouldn't use the be-contraction +always berges 12-12456-1245-123456 shouldn't use the be-contraction +always besonder 23 +always besser 234-234 +contraction ss +word beim 12-134 +contraction bm +word bis 12-234 +sufword bisher 12-234-125-12456 +sufword bislang 12-2345-123-1245 +sufword bisweil 12-234-2456-146-123 +always bison = + +always bist 12-23456 +always bistum 12-24-23456-136-134 shouldn't use the bist-contraction +always bleib 12-12 +contraction bb +always blind 12-123 +contraction bl +always brauch 2-34 +always bräuch 5-34 +always braeuch 5-34 +always brief 12-124 +contraction bf +always bring 12-1245 +contraction bg + +always charakter 1456-13 +sufword chor 1456-135-1235 shouldn't use the or-contraction +always comput 6-14-135-134-1234-136-2345 computer should use the er-contraction + +always dabei 145-12 +contraction db +always dadurch 145-145 +contraction dd +always dafür 145-124 +contraction df +always dagegen 145-1245 +contraction dg +always daher 145-125 +contraction dh +always damit 145-134 +contraction dm +always dank 145-13 +contraction dk +always davon 145-1236 +contraction dv +always dazu 145-1356 +contraction dz +always dazubleib 145-1-2-1356-12-12 shouldn't use the dazu-contraction +always dazumal 145-1-2-1356-134 +always deuten 145-126-2345-14 shouldn't use the te-contraction +always deal = dealer +word dei = Agnus Dei +always demokrat 145-2345 +contraction dt +word denen 15-14 +word dnister 145-1345-24-234-2345-12456 shouldn't use the nis-contraction +word denn 145-1345 +word dennschon 145-1345-156-135-1345 +always dessen 145-2346 +always deutsch 145-156 +word diem 145-24-12356 we shouldn't use the ie-contraction here +word diese 346-15 +word diesen 346-14 +word dieser 346-12456 +word dieses 346-123456 +sufword diesmal 346-134 +word dir 145-1235 +word doch 145-1456 +always druck 145-46 +always drück 5-145-46 +always dürf 2-145 + +always eben 15-12-14 +word ebenso 15-135 +contraction eo +sufword ehemal 15-125-15-134 +word ei 6-146 +always eigen 146-1245-14 Eigennutz shouldn't use the ge-contraction +always einander 2-1246 +word en 15-1345 en passant +always enig 14-45 +always erkenn 12456-13-14-1345 +sufword etwa 15-1 +contraction ea +word etwas 2345-2456 +contraction tw + +always fahr 2-1235 +always fahrtsst 2-1235-2345-234-23456 shouldn't use the ss-contraction +always fahrtsstell 2-1235-2345-234-2-13456 +always fähr 5-1235 +always faehr 5-1235 +always fall 124-12345 +always fäll 5-124-12345 +always faell 5-124-12345 +always fertig 124-45 +always fest 124-15-23456 should use the st-contraction +always film = +always folgen 124-135-123-1245-14 shouldn't use the ge-contraction +always frag 124-1235 +contraction fr +always fragil = +always fragment 124-1235-1-1245-134-14-2345 +always freund 124-145 +contraction fd +always führ 124-125 +contraction fh +always fürcht 124-1256-1235-1456-2345 shouldn't use the für-contraction + +always ganz 1245-1356 +contraction gz +always gänz 5-1245-1356 +always gaenz 5-1245-1356 +always garnison 1245-356-1345-24-234-135-1345 shouldn't use the nis-contraction +word gegend 12346-1245-14-145 shouldn't use the gegen-contraction +always gegenüber 1245-1256 +contraction gü +always gegenwart 1245-2456 +contraction gw +always gegenwärt 5-1245-2456 +always gegenwaert 5-1245-2456 +always gelb 1245-13456-12 should use the el-contraction +always geld 1245-13456-145 should use the el-contraction +always gelegen 1245-1245 +contraction gg +begword gelt 1245-13456-2345 gelten shouldn't use the ge-contraction +prfword gene 1245-14-15 +prfword genem 1245-14-12356 +prfword genen 1245-14-14 +prfword gener 1245-14-12456 +prfword genes 1245-14-123456 +always geogra = Geographie shouldn't use the ge-contraction +prfword gern 1245-12456-1345 +midendword gerlich 1245-12456-456 bürgerlich shouldn't use the ge-contraction +always gern 1245-12456-1345 we shouldn't use the ge-contraction here +always geschäft 1245-124 +always geschaeft 1245-124 +contraction gf +always gesellschaft 1245-156 +always geworden 12346-2456 +always gibt 1245-12 +contraction gb +always gleich 1245-1456 +always glück 1245-46 +always groß 1245-2346 +contraction gß +always größ 5-1245-2346 +always grund 1245-145 +contraction gd +always gründ 5-1245-145 +always gründonners 1245-1235-1256-1345-145-135-1345-1345-12456-234 gründonnerstag shouldn't use the gründ-contraction +always hab 2-125 +always haft 125-124 +contraction hf +always häft 5-125-124 +always haeft 5-125-124 +word hain = +always hamburger 125-1-134-12-136-1235-1245-12456 shouldn't use the ge-contraction +always hand 125-145 +always händ 5-125-145 +always haend 5-125-145 +always halten 125-25-2345-14 shouldn't use the te-contraction +always hast 125-23456 +always hat 125-2345 +contraction ht +word hattest 125-15-23456 shouldn't use the es-contraction +word hattrick 125-1-2345-2345-24-46 shouldn't use the hatt-contraction +always haupt 125-1234 +contraction hp +always häupt 5-125-1234 +always herr 1235-1235 +contraction rr +always hier 125-1235 +contraction hr +always hierar 125-24-12456-356 hierarchie +always hoff 124-124 +contraction ff + +word ich 3456 +sufword ihn 24-125 +always inter 35-2345-12456 +always interess 2-35 +always irgend 24-1245 irgendetwas +contraction ig + +always jahr 245-1235 +contraction jr +always jähr 5-245-1235 +always jaehr 5-245-1235 +always jahrhundert 245-125 +contraction jh +always jahrtausend 245-2345 +contraction jt +always jahrzehnt 245-1356 +contraction jz +sufword jed 245-145 +word jedoch 245-1456 +sufword jetzig 245-45 +always johannisberg 245-135-125-235-1345-24-234-12-12456-1245 shouldn't use the nis-contraction +always jung 245-256-1245 shouldn't use the ung-contraction + +word kannst 13-23456 +always kapital 13-1234 +contraction kp +always kapitäl 5-13-1234 +always kapitael 5-13-1234 +always klemm 13-123-15-1346 eingeklemmt shouldn't use the em-contraction +always knoch 13-1345-135-1456 Knochen shouldn't use the noch-contraction +always komm 13-1346 +contraction kx +always akkommod 1-13-13-135-1346-135-145 shouldn't use the komm-contraction +always kömm 5-13-1346 +always konnt 13-2345 +contraction kt +always könn 2-13 + +always kraft 13-124 +contraction kf +always kräft 5-13-124 +always kraeft 5-13-124 + +always kulturell 13-136-123-2345-136-1235-15-12345 should use the ll-contraction + +always kurz 13-1356 +contraction kz +always kürz 5-13-1356 + +always lang 123-1245 +contraction lg +before g sufword schlan 156-123-235 shouldn't use the lang-contraction +sufword schlangen 156-123-235-1245-14 +before g always warteschlan 2456-356-236-156-123-235 +always läng 5-123-1245 +always laeng 5-123-1245 +always jahrelang 245-1235-15-123-1245 shouldn't use the el-contraction +always jahrhundertelang 245-125-15-123-1245 shouldn't use the el-contraction +always jahrzehntelang 245-1356-15-123-1245 shouldn't use the el-contraction +always jahrtausendelang 245-2345-15-123-1245 shouldn't use the el-contraction +before s always jahres 245-1235-123456 +before g always jahresta 245-1235-123456-2345-1 +always langobard 123-235-1245-135-12-356-145 shouldn't use the lang-contraction +always lass 2-123 +always läss 5-123 +always laess 5-123 +sufword blass 12-123-1-2346 +sufword blasst 12-123-1-234-23456 +always class = shouldn't use the lass-contraction +before s always glas = +sufword klass 13-123-1-2346 shouldn't use the lass-contraction +always lassist 123-1-2346-24-23456 +always laich 123-1-24-1456 shouldn't use the ich-contraction +always lasagne = shouldn't use the sag-contraction +always lasso 123-1-2346-135 shouldn't use the lass-contraction +always länd = +always laend = +always leb 123-12 +contraction lb +always klebeband 13-123-15-23-12-235-145 shouldn't use the leb-contraction +always klebebänder 13-123-15-23-12-345-1345-145-12456 shouldn't use the leb- nor änder-contraction +always leicht 123-1456 +always letzt 123-2345 +contraction lt +always lieb 123-346-12 + +always mann 134-1345 +contraction mn +always männ 5-134-1345 +always maenn 5-134-1345 +word manna = shouldn't use the mann-contraction +always mannequin 134-235-1345-15-6-12345-35 shouldn't use the mann-contraction +always maschin 134-156 +always material 134-123 +contraction ml +always materiell 134-12345 +word mir 134-1235 +always mittel 134-2345 +contraction mt +always moldawien 134-135-123-145-1-2456-24-14 shouldn't use the wie-contraction +sufword moor = shouldn't use the or-contraction +always möchte 1456-15 +word möchten 1456-14 +always mög 2-246 +always möglich 134-456 +always musik 134-13 +contraction mk +always muss 134-2346 +always müss 2-134 + +word nachdem 1345-145 +always nahm 1345-134 Annahme +contraction nm +always natur 1345-2345 +contraction nt +always natürlich 1345-456 +always nächst 1345-23456 +always naechst 1345-23456 +always nehm 1345-125 +contraction nh +endword nisch 1345-24-156 shouldn't use the nis-contraction +endword nische 1345-24-156-15 shouldn't use the nis-contraction +endword nischen 1345-24-156-14 shouldn't use the nis-contraction +endword nischer 1345-24-156-12456 shouldn't use the nis-contraction +endword nisches 1345-24-156-123456 shouldn't use the nis-contraction +always nichtig 1345-45 +always nichts 1345-234 +contraction ns +always nichtsehend 2-1345-234-2356-14-145 shouldn't use the nichts-contraction +always nichtschwimm 2-1345-156-2456-24-1346 shouldn't use the nichts-contraction +always noch 1345-1456 +always nommen 1345-1346 +contraction nx +always genommen 12346-1345-1346 +midendword augenommen 16-12346-1345-1346 +always eigenommen 146-12346-1345-1346 +always notwendig 1345-2456 +contraction nw +begmidword normal 1345-26-134-25 shouldn't use the mal-contraction +prfword normal 1345-26-134-1-123 shouldn't use the mal-contraction +always anim 235-24-134 animal shouldn't use the mal-contraction +always nur 1345-1235 +contraction nr +always nutz 1345-1356 +contraction nz +always nütz 5-1345-1356 + +sufword ohne 135-15 +contraction oe + +always öffentlich 246-456 + +always paar = shouldn't use the ar-contraction +always paragraph 1234-1245 +contraction pg +always person 1234-1345 +contraction pn +always philosoph 1234-125 +contraction ph +always platz 1234-1356 +always plätz 5-1234-1356 +always plaetz 5-1234-1356 +always plötzlich 1234-456 +always ploetzlich 1234-456 +always politik 1234-13 +contraction pk +always politisch 1234-156 +always punkt 1234-2345 +contraction pt + +always recht 1235-2345 +contraction rt +before s always rechts 1235-2345-234 +always regier 1235-1245 +contraction rg +before s always regierungs 1235-1245-136-234 +always rehabilit 1235-125 +contraction rh +always republik 1235-13 +contraction rk +sufword rest 1235-15-23456 should use the st-contraction +always richt 2-3456 +always rück 1235-46 +always rueck 1235-46 + +always sag 234-1245 +contraction sg +always saal = shouldn't use the al-contraction +word samen 234-1-134-14 shouldn't use the sam-contraction +always satz 234-1356 +contraction sz +always sätz 5-234-1356 +always saetz 5-234-1356 +always schnur 156-1345-136-1235 shouldn't use the nur-contraction +always school 234-1456-135-135-123 foreign word, sch-contraction not allowed +always schlag 156-1245 +always schläg 5-156-1245 +always schlaeg 5-156-1245 +always schließ 156-2346 +always schreib 156-12 +always schrift 156-2345 +always schrieb 2-156 +always schwierig 156-45 +always schwillt 156-2456-24-12345-2345 shouldn't use the will-contraction +always schwoll 156-2456-135-12345 geschwollen shouldn't use the woll-contraction +word sehr 234-1235 +sufword versehr 36-234-1235 +sufword unversehr 256-1236-12456-234-1235 +always selbst 234-23456 +always selbständig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction +always selbstaendig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction +always setz 2-15 +sufword sesam 234-123456-1-134 shouldn't use the sam-contraction +word sind 234-145 +contraction sd +always gesinde 12346-234-35-145-15 +always gesindel 12346-234-35-145-13456 +always gesindes 12346-234-35-145-123456 +always gesindest 12346-234-35-145-15-23456 + +always sitz 2-24 +always sitzbein 2-24-12-1246 shouldn't use the bei-contraction +always solch 234-1456 +always soll 2-234 +always sondern 234-1345 +contraction sn +always sozial 234-123 +contraction sl +always spiel 2-346 +always sprach 234-1234 +contraction sp +always spräch 5-234-1234 +always spraech 5-234-1234 +always sprech 2-2346 +always staat 23456-2345 +always stand 2-23456 +always standard 23456-235-145-356-145 shouldn't use the stand-contraction +always ständ 5-23456 +always staend 5-23456 +always stell 2-13456 +always sstell 234-2-13456 shouldn't use the ss-contraction +word stets 23456-234 +always strahier 23456-1235-1-125-346-1235 abstrahieren + +word taiga = shouldn't use the ig-contraction +always täter 2345-345-2345-12456 shouldn't use the er-contraction +always technik 2345-13 +contraction tk +always stechnik 234-2345-13 +always technisch 2345-156 +always stechnisch 234-2345-156 +sufword test 2345-15-23456 shouldn't use the es-contraction +sufword töricht 2345-246-1235-3456-2345 shouldn't use the richt-contraction +sufword toericht 2345-246-1235-3456-2345 shouldn't use the richt-contraction +always trag 2345-1245 +contraction tg +always träg 5-2345-1245 +always train = training shouldn't use the first possible in-contraction +always treff 2345-124 +contraction tf +always trinitro = shouldn't use the in-contraction +always trotz 2345-1356 +contraction tz +always trüb = trüber shouldn't use the über-contraction + +always unbeirr 256-23-24-1235-1235 unbeirrt shouldn't use the bei-contraction +sufword under 256-145-12456 shouldn't use the und-contraction + +word überhaupt 1256-125 +word ueberhaupt 1256-125 +always übrig 1256-45 + +always verhältnis 1236-125 +contraction vh +always verhaeltnis 1236-125 +always viel 1236-123 +contraction vl +word vielleicht 1236-2345 +always volk 1236-13 +contraction vk +always völk 5-1236-13 +word vom 1236-134 +contraction vm + +always wahr 2456-125 +contraction wh +always währ 5-2456-125 +always während 345-145 +contraction äd +always waehrend 345-145 +sufword warm 2456-356-134 shouldn't use the war-contraction +always weg 2456-1245 +contraction wg +always weis 2-146 Anweisung +always zweischicht 1356-2456-146-156-3456-2345 shouldn't use the weis-contraction +always weit 2456-2345 +before konsonant begword zweit 1356-2456-146-2345 shouldn't use the weit-contraction +always wenig 2456-45 +sufword wenn 2456-1345 +contraction wn +always werd 2-2456 +always wesentlich 2456-456 +always wiegend 2456-346-1245-14-145 shouldn't use the wie-contraction +always wieder 346-145 +always wien 2456-346-1345 shouldn't use the wie-contraction +always will 2456-12345 +always william 2456-24-12345-24-1-134 +word wir 2456-1235 +word wird 2456-145 +always wirk 2456-13 +contraction wk +word wirst 2456-23456 +always wirtschaft 2456-156 +always wiss 2456-2346 +contraction wß +word swiss 234-2456-24-2346 shouldn't use the wiss-contraction +always wohl 2456-123 +contraction wl +always woll 2-135 +word Wolle 2456-135-12345-15 shouldn't use the woll-contraction +always wollfad 2456-135-12345-124-1-145 shouldn't use the woll-contraction +always baumwoll 12-16-134-2456-135-12345 shouldn't use the woll-contraction +word worden 135-14 +sufword wurd 136 +sufword würd 1256 + +always young 6-13456-135-136-1345-1245 shouldn't use the u-contraction + +always zahl 1356-123 +contraction zl +always zähl 5-1356-123 +always zeit 1356-2345 +contraction zt +before st midendword zug = +word zum 1356-134 +word zunächst 1356-1345 +word zunaechst 1356-1345 +word zur 1356-1235 +sufword zurschau 1356-1235-156-16 +sufword zurück 1356-46 +sufword zurueck 1356-46 +always zusammen 1356-234 +always zwischen 1356-2456 +contraction zw + +# exceptions +always aachen 1-1-1456-14 shouldn't use the ach-contraction +always abbauf 1-12-12-16-124 Abbaufortschritt, Abbaufront +sufword abend 1-12-14-145 +always abenteuer 1-12-14-2345-126-12456 +always abenteurer 1-12-14-2345-126-1235-12456 +always aberkann 1-12-12456-13-235-1345 shouldn't use the aber-contraction +always aberkenn 1-12-12456-13-14-1345 shouldn't use the aber-contraction +begword abernt 1-12-12456-1345-2345 shouldn't use the aber-contraction +always abgaben 1-12-1245-1-12-14 shouldn't use the be-contraction +begword ausgaben 34-1245-1-12-14 shouldn't use the be-contraction +sufword ablageraum 1-12-123-1-12346-1235-16-134 +always ablageräum 1-12-123-1-12346-1235-34-134 +always ablageraeum 1-12-123-1-12346-1235-34-134 +always ablauf 1-12-123-16-124 shouldn't use the auf-contraction +always ablösesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction +always abloesesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction +always abnormität 1-12-1345-26-134-5-345 shouldn't use the mit-contraction +always abnormitaet 1-12-1345-26-134-5-345 shouldn't use the mit-contraction +always abrund 1-12-1235-256-145 shouldn't use the und-contraction +begword abschieds 1-12-156-346-145-234 Abschiedsschmerz +always achteck 1-1456-2345-15-46 shouldn't use the te-contraction +always asocia 1-234-135-6-14-24-1 asociación shouldn't use the so-contraction +always afrikarefer 1-124-1235-24-13-1-1235-15-124-12456 shouldn't use the ar-contraction +sufword agent 1-1245-14-2345 shouldn't use the ge-contraction +always akadem 1-13-1-145-12356 shouldn't use the dem-contraction +sufword akten 1-13-2345-14 shouldn't use the te-contraction +always akteur 1-13-2345-126-1235 shouldn't use the te-contraction +always ingenieur 35-1245-14-24-126-1235 +always interieur 35-2345-12456-24-126-1235 +always porteur 1234-26-2345-126-1235 +always alarm 25-356-134 Alarmmeldung shouldn't use the mm-contraction +always albern 25-12-12456-1345 shouldn't use the be-contraction +always albert 25-12-12456-2345 shouldn't use the be-contraction +always alexander 25-15-6-1346-235-145-12456 shouldn't use the ander-contraction +always algerier 25-1245-12456-24-12456 shouldn't use the ie-contraction +sufword allee 1-12345-15-15 shouldn't use the alle-contraction +prfword alleen 1-12345-15-14 shouldn't use the alle-contraction +always baumallee 12-16-134-1-12345-15-15 shouldn't use the mal-contraction and alle-contraction +always baumalleen 12-16-134-1-12345-15-14 shouldn't use the mal-contraction and alle-contraction +before st always alltags 1-12345-2345-1-1245-234 +begword alm 25-134 +begword alter 25-2345-12456 +always amateur 1-134-1-2345-126-1235 should use the eu-contraction +before r always amerika 1-134-12456-24-13-1 +always amtschines 1-134-2345-234-1456-35-123456 shouldn't use the sch-contraction +always amtsstub 1-134-2345-234-23456-136-12 shouldn't use the ss-contraction +always andalusier 235-145-25-136-234-24-12456 shouldn't use the ie-contraction +midendword anebel 1-1345-15-12-13456 Andromedanebel shouldn't use the an-contraction +before st always anfangs 235-124-235-1245-234 +before st always angriffs 235-1245-1235-24-124-124-234 +always anklage 235-13-123-1-12346 Anklagerede shouldn't use the er-contraction +always anklang 235-13-123-235-1245 shouldn't use the lang-contraction +always ankläng 235-13-123-345-1345-1245 shouldn't use the läng-contraction +begword anlagen 235-123-1-1245-14 +always anlauf 235-123-16-124 shouldn't use the auf-contraction +before m always anleihe 235-123-146-125-15 Anleihemarkt shouldn't use the em-contraction +before m always film = +class egn egn +before egn begword anti 235-2345-24 +always antichrist 235-2345-24-1456-1235-24-23456 shouldn't use the ich-contraction +always anästh 235-345-234-2345-125 Anästhesie +begword armee 356-134-15-15 +word armeen 356-134-15-14 + +always augen 16-1245-14 shouldn't use the ge-contraction +midendword austausch 16-234-2345-16-156 shouldn't use the st-contraction +always beilstein 12-146-123-23456-1246 shouldn't use the bei-contraction +word bein 12-1246 shouldn't use the bei-contraction +word beine 12-1246-15 shouldn't use the bei-contraction +word beinen 12-1246-14 shouldn't use the bei-contraction +word beines 12-1246-123456 shouldn't use the bei-contraction +always bauform 12-16-124-26-134 shouldn't use the auf-contraction +always beteuer 23-2345-126-12456 shouldn't use the te-contraction +always beute 12-126-236 should use the eu-contraction +always beutel 12-126-2345-13456 should use the eu-contraction +always bssy 12-234-234-6-13456 shouldn't use the ss-contraction +always bundes 12-256-145-123456 shouldn't use the und-contraction +prfword chemikalie 1456-12356-24-13-25-24-15 +always donnerstag 145-135-1345-1345-12456-234-2345-1-1245 shouldn't use the st-contraction +before g always samstag = +endword stag = shouldn't use the st-contraction +endword stage 234-2345-1-12346 +endword stages 234-2345-1-1245-123456 +sufword eheinstitut 15-125-15-35-23456-24-2345-136-2345 +begword eheleu 15-125-15-123-126 +before g begword eherin 15-125-15-1235-35 Ehering(e) shouldn't use the er-contraction +midword ehilfs = Analysehilfsmittel shouldn't use the eh-contraction +always einter 15-35-2345-12456 shouldn't use the ein-contraction +midendword emethod = Analysemethode shouldn't use the eh-contraction +midendword enorm 15-1345-26-134 Aussprachenorm shouldn't use the en-contraction +always emuskel 15-134-136-234-13-13456 shouldn't use the em-contraction +always eschatolog 123456-1456-1-2345-135-123-135-1245 shouldn't use the sch-contraction +always esther 123456-2345-125-12456 shouldn't use the st-contraction +always ästhe 345-234-2345-125-15 ästhetisch +midendword erecht 15-1235-2345 +midendword ericht 15-2-3456 +always erepublik 15-1235-13 +midendword emann 15-134-1345 +midendword emädchen 15-134-345-145-1456-14 +midendword emaedchen 15-134-345-145-1456-14 +midendword emänn 15-5-134-1345 +midendword emaenn 15-5-134-1345 +midendword estand 15-2-23456 +midword estell 15-2-13456 +always found 124-135-256-145 Foundation shouldn't use the und-contraction +begword gänse = +word gänsen 1245-345-1345-234-14 +sufword gänserich 1245-345-1345-234-12456-3456 +always geben 12346-12-14 +always gebunden 12346-12-256-145-14 shouldn't use the und-contraction +always geier 1245-146-12456 should use the ei-contraction +always geil 1245-146-123 shouldn't use the ge-contraction +midendword geingang 1245-1246-1245-235-1245 +midendword geingän 1245-1246-1245-345-1345 +always gelungen 12346-123-256-1245-14 +always generat 1245-14-12456-1-2345 +always generier 1245-14-12456-346-1235 +always gerät 12346-1235-345-2345 should use the ge-contraction +always geraet 12346-1235-345-2345 should use the ge-contraction +always geräusch 12346-1235-34-156 should use the ge-contraction +always geraeusch 12346-1235-34-156 should use the ge-contraction +always gerecht 12346-1235-2345 +always gericht 12346-2-3456 +begword german 1245-12456-134-235 shouldn't use the ge-contraction +always gewiesen 12346-2456-346-234-14 shouldn't use the wie-contraction +prfword hallen 125-1-12345-14 shouldn't use the allen-contraction +always hauf 125-16-124 shouldn't use the auf-contraction +always hotel 125-135-2345-13456 shouldn't use the te-contraction +always installer 35-23456-1-12345-12456 shouldn't use the aller-contraction +always internet 35-2345-12456-1345-15-2345 shouldn't use the te-contraction +always interview 35-2345-12456-1236-24-15-2456 shouldn't use the ie-contraction +after st always ionstrieb 245-234-2345-1235-346-12 +after st always ionstrupp 245-234-2345-1235-136-1234-1234 +always jubel 245-136-12-13456 shouldn't use the be-contraction +always kaffee = +endword kaffees 13-1-124-124-15-123456 +always komponist 13-135-134-1234-135-1345-24-23456 shouldn't use the nis-contraction +always leselamp 123-123456-15-123-1-134-1234 shouldn't use the el-contraction +always liechtenstein 123-346-1456-2345-14-23456-1246 shouldn't use the te-contraction +prfword linie 123-35-24-15 shouldn't use the ie-contraction +always richtlini 2-3456-123-35-24 +prfword materie 134-1-2345-12456-24-15 shouldn't use the ie-contraction +always metallen 134-15-2345-1-12345-14 shouldn't use the allen-contraction +always regel 1235-15-1245-13456 +always release = shouldn't use the el-contraction +always roboter 1235-135-12-135-2345-12456 shouldn't use the te-contraction +always round 1235-135-256-145 shouldn't use the und-contraction +sufword rund 1235-256-145 shouldn't use the und-contraction +word räson = shouldn't use the so-contraction +always döschen 145-246-234-1456-14 shouldn't use the sch-contraction +always füsschen 124-1256-2346-1456-14 +always häschen 125-345-234-1456-14 shouldn't use the sch-contraction +always höschen 125-246-234-1456-14 should use the ch-contraction +always wollhöschen 2456-135-12345-125-246-234-1456-14 shouldn't use the woll-contraction +always küsschen 13-1256-2346-1456-14 shouldn't use the sch-contraction +always möschen 134-246-234-1456-14 should use the ch-contraction +word röschen 1235-246-234-1456-14 should use the ch-contraction +begword rosaro = shouldn't use the ar-contraction +midendword sammel 234-1-1346-13456 shouldn't use the sam-contraction +midendword samml 234-1-1346-123 shouldn't use the sam-contraction +endword schef 234-1456-15-124 +endword schefin 234-1456-15-124-35 +endword schefins 234-1456-15-124-35-234 +endword schefinnen 234-1456-15-124-35-1345-14 +endword schefs 234-1456-15-124-234 +endword eschef 123456-1456-15-124 +endword eschefin 123456-1456-15-124-35 +endword eschefins 123456-1456-15-124-35-234 +endword eschefinnen 123456-1456-15-124-35-1345-14 +endword eschefs 123456-1456-15-124-234 +always schueler 156-1256-123-12456 should use the ue-symbol +always schwung 156-2456-256-1245 shouldn't use the ung-contraction +always september 234-15-1234-2345-12356-12-12456 should use the em-contraction +always dezember 145-15-1356-12356-12-12456 shouldn't use the be-contraction +before s always sichts 234-3456-2345-234 Ansichtssache shouldn't use the ss-contraction +always silber 234-24-123-12-12456 shouldn't use the be-contraction +always sprung 234-1234-1235-256-1245 shouldn't use the ung-contraction +always ssitz 234-2-24 shouldn't use the ss-contraction +always ssonntag = +always sspiel 234-2-346 +always ssprach 234-234-1234 +always sstand 234-2-23456 +midendword stitel 234-2345-24-2345-13456 +always studien 23456-136-145-24-14 shouldn't use the ie-contraction +always stunde 23456-256-145-15 shouldn't use the und-contraction +always stunden 23456-256-145-14 +always esystem 15-234-6-13456-23456-12356 shouldn't use the es-contraction +always sturz 23456-136-1235-1356 Absturzursache shouldn't use the zu-contraction +always tagesstät 2345-1-1245-123456-23456-345-2345 shouldn't use the ss-contraction +always tagesstaet 2345-1-1245-123456-23456-345-2345 shouldn't use the ss-contraction +always team = shouldn't use the te-contraction +midendword termin 2345-12456-134-35 shouldn't use the te-contraction +always wagen 2456-1-1245-14 shouldn't use the ge-contraction +always weiber 2456-146-12-12456 shouldn't use the be-contraction +sufword verbund 36-12-256-145 shouldn't use the und-contraction +midendword verbund 1236-12456-12-256-145 shouldn't use the und-contraction +midword versamm 1236-12456-234-1-1346 shouldn't use the sam-contraction +always viertel 1236-346-1235-2345-13456 shouldn't use the te-contraction +before g always zeitsta 1356-2345-234-2345-1 +begword zion = zionist shouldn't use the nis-contraction +always zugantenn 1356-136-1245-235-2345-14-1345 +always zweiseit 1356-2456-146-234-146-2345 +always zweistaat 1356-2456-146-23456-2345 shouldn't use the weis-contraction + +midendword heitstätig 125-234-2345-345-2345-45 gelegenheitstätigkeit shouldn't use the st-contraction +begmidword admiral 1-145-134-24-1235-25 +begmidword astral 1-23456-1235-25 +before m sufword atom = +begmidword bifokal 12-24-124-135-13-25 +#begmidword brachial 12-1235-56-24-25 +begmidword bronchial 12-1235-135-1345-1456-24-25 bronchiallymphknoten shouldn't use the ll-contraction +begword general 1245-14-12456-25 +begmidword kolonial 13-135-123-135-1345-24-25 +begmidword zentral 1356-14-2345-1235-25 zentrallager +always schall 156-1-12345 schallen shouldn't use the allen-contraction +always herzultra 125-12456-1356-136-123-2345-1235-1 shouldn't use the zu-contraction +always mittagessen 134-24-2345-2345-1-1245-15-2346-14 +always snakeskin 234-1345-1-13-15-234-13-35 + +# countries +always dänemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction +always daenemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction + +# names +word angela 235-1245-13456-1 shouldn't use the ge-contraction +word angeles 235-1245-13456-123456 shouldn't use the ge-contraction +word angelika 235-1245-13456-24-13-1 shouldn't use the ge-contraction +word angelina 235-1245-13456-35-1 shouldn't use the ge-contraction +word angelo 235-1245-13456-135 shouldn't use the ge-contraction +always daniel 145-235-24-13456 shouldn't use the ie-contraction +always gerlind 1245-12456-123-35-145 should use the er-contraction +always solveig 234-135-123-1235-146-1245 shouldn't use the so-contraction + +# TODO: +# 8-Punkte-Plan + +# inline contraction of emoji descriptions +cldr de diff --git a/brltty/Contraction/de-kurzschrift-2015.ctb b/brltty/Contraction/de-kurzschrift-2015.ctb new file mode 100644 index 0000000..c1becb8 --- /dev/null +++ b/brltty/Contraction/de-kurzschrift-2015.ctb @@ -0,0 +1,1529 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# BRLTTY Contraction Table - German (contracted - 2015 standard) +# Created by Mario Lang . + +include de-vollschrift.ctb + +class e e +class g g +class h h +class i i +class m m +class n n +class r r +class hilmnrsu hilmnrsu +class l l +class lnr lnr +class st st +class konsonant bcdfghjklmnpqrstvwxyz + +include de-kurzschrift-wort.cti +before e always auslöse 16-234-123-246-234-15 +before e always ausreise 16-234-1235-146-234-15 +before hilmnrsu always ausnahme 16-234-1345-134-15 +prfword ausnahmen 16-234-1345-134-14 +before hilmnrsu always aussage 16-234-234-1245-15 +prfword aussagen 16-234-234-1245-14 +before konsonant always aussagen 16-234-234-1245-14 +prfword aussagend 16-234-234-1245-14-145 +prfword aussagende 16-234-234-1245-14-145-15 +prfword aussagendem 16-234-234-1245-14-145-12356 +prfword aussagenden 16-234-234-1245-14-145-14 +prfword aussagender 16-234-234-1245-14-145-12456 +prfword aussagendes 16-234-234-1245-14-145-123456 +always aussagenklass 16-234-234-1245-14-13-123-1-2346 +before g always aussagenklän 16-234-234-1245-14-13-123-345-1345 + + +before s always aus 16-234 + +# Ausnahmen für Vokalgruppen aus de-vollschrift.ctb +before e always arteri 356-2345-12456-24 +always barrier 12-356-1235-24-12456 shouldn't use the ie-contraction +always bankier 12-235-13-24-12456 shouldn't use the ie-contraction +midendword iell 24-15-12345 shouldn't use the ie-contraction +always indien 35-145-24-14 shouldn't use the ie-contraction +always karrier 13-356-1235-24-12456 +always medien 134-15-145-24-14 shouldn't use the ie-contraction +always propriet 12345-1234-1235-24-15-2345 proprietär shouldn't use the ie-contraction +endword serie 234-12456-24-15 +always spezies 234-1234-15-1356-24-123456 shouldn't use the ie-contraction +always tragödie = +always tragödien 2345-1235-1-1245-246-145-24-14 + +# Due to their low usage frequency in typical german text the letters +# c, q, x and y are reused for the en-, ll-, ex/mm/nis- and el-contractions. +# Therefore they need a proceding letsign to disambiguate them. +always c 6-14 +always C 6-14 +always q 6-12345 +always Q 6-12345 +always x 6-1346 +always X 6-1346 +always y 6-13456 +always Y 6-13456 + +# Lautgruppenkürzungen +midendword ach 56 +begmidword al 25 +begmidword : 6-25 +begmidword an 235 +begmidword ar 356 +begmidword be 23 +midendword beule 12-126-123-15 +midendword beulen 12-126-123-14 +before g always beu 12-126 +always bell 23-12345 tabelle should use the ll-contraction +midendword ck 46 +midword eh 2356 +always kohle = +always kohlen 13-135-125-123-14 +always kohleintopf 13-135-125-123-1246-2345-135-1234-124 +always kohleintöpf 13-135-125-123-1246-2345-246-1234-124 +before g always kohleinla 13-135-125-123-1246-123-1 +before e always kohleul 13-135-125-123-126-123 ⠨⠅⠕⠓⠇⠣⠇⠉ +always ein 1246 +always einnen 15-35-1345-14 ⠨⠯⠓⠌⠎⠑⠔⠝⠉⠎⠩⠦ ⠨⠯⠓⠌⠎⠑⠔⠝⠉⠞⠷⠏⠻⠁⠞⠥⠗ ⠨⠧⠊⠵⠑⠔⠝⠉⠍⠔⠊⠾⠻ +always lateinisch 123-1-2345-146-1345-24-156 shouldn't use the ein-contraction +always el 13456 +begmidword elineal 15-123-35-15-25 +endword elineal 15-123-35-15-1-123 +always eleist 15-123-146-23456 +always em 12356 +always emach 15-134-56 +before e always emachs 12356-56-234 Systemachse +always en 14 +always denunz 145-15-1345-256-1356 shouldn't use the en-contraction +always er 12456 +always dereferenzier 145-15-1235-15-124-12456-14-1356-346-1235 shouldn't use the er-contraction +always deregulier 145-15-1235-15-1245-136-123-346-1235 shouldn't use the er-contraction +always es 123456 +always ge 12346 +prfword gehe 1245-2356-15 +prfword gehen 1245-2356-14 +prfword gehend 1245-2356-14-145 +prfword gehende 1245-2356-14-145-15 +prfword gehendem 1245-2356-14-145-12356 +prfword gehenden 1245-2356-14-145-14 +prfword gehender 1245-2356-14-145-12456 +prfword gehendes 1245-2356-14-145-123456 +before konsonant always geh 1245-2356 +always umgehung 136-134-1245-2356-136 shouldn't use the ge-contraction +before konsonant always bel 12-13456 Übelkeit shouldn't use the be-contraction +word bel 12-13456 +before konsonant always bem 12-12356 +before konsonant always ben 12-14 +before konsonant always ber 12-12456 +before konsonant always gel 1245-13456 klingelton shouldn't use the ge-contraction +before konsonant always gen 1245-14 +begword lungen 123-256-1245-14 shouldn't use the ge-contraction +begword magen 134-1-1245-14 shouldn't use the ge-contraction +before konsonant always ten 2345-14 +always elefant 13456-15-124-235-2345 +before konsonant always ter 2345-12456 +always güter 1245-1256-2345-12456 should use the er-contraction +always güteregel 1245-1256-236-1235-15-1245-13456 +always gütericht 1245-1256-236-2-3456 +midendword ich 3456 +midendword ig 45 +always in 35 + +midendword lich 456 +always lichtbogen 123-3456-2345-12-135-1245-14 shouldn't use the lich-contraction +always lichtnahr 123-3456-2345-1345-1-125-1235 shouldn't use the lich-contraction +always lichtsch 123-3456-2345-156 +always bodenlicht 12-135-145-14-123-3456-2345 shouldn't use the lich-contraction +begword see = +begword neusee 1345-126-234-15-15 +#before konsonant always seen 234-15-14 +word seele 234-15-13456-15 +sufword seelen 234-15-13456-14 +always seelisch 234-15-13456-24-156 +word teer 2345-15-12456 +sufword teerartig 2345-15-12456-356-2345-45 +before konsonant begword teer 2345-15-12456 +word teere 2345-15-12456-15 +word teeren 2345-15-12456-14 +word teerend 2345-15-12456-14-145 +word teerende 2345-15-12456-14-145-15 +word teerendem 2345-15-12456-14-145-12356 +word teerenden 2345-15-12456-14-145-14 +word teerender 2345-15-12456-14-145-12456 +word teerendes 2345-15-12456-14-145-123456 +word teerung 2345-15-12456-136 +word teerungen 2345-15-12456-136-14 +always teelich 2345-15-15-456 shouldn't use the el-contraction +always teelöffel 2345-15-15-123-246-124-124-13456 shouldn't use the el-contraction +always teemaschin 2345-15-15-134-156 shouldn't use the em-contraction +always teesieb 2345-15-15-234-346-12 shouldn't use the es-contraction +midendword ll 12345 +always holland 125-135-123-123-235-145 shouldn't use the ll-contraction +always holländer 125-135-123-123-345-1345-145-12456 shouldn't use the ll-contraction +always hollaender 125-135-123-123-345-1345-145-12456 shouldn't use the ll-contraction +midendword mm 1346 +always wurm = wurmmittel shouldn't use the mm-contraction +begmidword or 26 + +always schaos 234-1456-1-135-234 +after konsonant midword ss = +after konsonant midendword ssatz 234-234-1356 +after konsonant midendword ssätz 234-5-234-1356 +after konsonant midendword ssaetz 234-5-234-1356 +after konsonant midword ssch 234-156 +always sschicht 234-156-3456-2345 +always sschlag 234-156-1245 +always sschläg 234-5-156-1245 +always sschlaeg 234-5-156-1245 +always sschließ 234-156-2346 +always sschmuck 234-156-134-136-46 +always sschnur 234-156-1345-136-1235 shouldn't use the nur-contraction +always sschool 234-234-1456-135-135-123 foreign word, sch-contraction not allowed +always sschreib 234-156-12 +always sschrieb 234-2-156 +always sschrift 234-156-2345 +always sschwierig 234-156-45 +always sselbst 234-234-23456 +always sselbständ 234-234-13456-12-5-23456 shouldn't use the selbst-contraction +always sselbstaend 234-234-13456-12-5-23456 shouldn't use the selbst-contraction +after konsonant always ssetz 234-2-15 +after konsonant midendword ssesam 234-234-123456-1-134 shouldn't use the sam-contraction +always ssicher 234-234-3456-12456 +after konsonant always ssitz 234-2-24 +always ssolch 234-234-1456 +after konsonant midendword ssoll 234-2-234 +always ssondern 234-234-1345 +always ssozial 234-234-123 +always espiel 15-2-346 +always sspiel 234-2-346 +always esprach 15-234-1234 +always ssprach 234-234-1234 +always sspräch 234-5-234-1234 +always sspraech 234-5-234-1234 +always esprech 15-2-2346 +always ssprech 234-2-2346 +after konsonant midendword sst 234-23456 +always sstaat 234-23456-2345 +after konsonant midendword sstand 234-2-23456 +after konsonant midendword sständ 234-5-23456 +after konsonant midendword sstaend 234-5-23456 +after konsonant midendword sstell 234-2-13456 +always ssteiger 234-23456-146-1245-12456 +before e always sstund 234-23456-256-145 shouldn't use the und-contraction +midendword ss 2346 + +midendword te 236 +sufword atem 1-2345-12356 shouldn't use the te-contraction +always un 256 + +midendword tei 2345-146 + +always all 1-12345 +always ell 15-12345 +always emm 15-1346 +always esch 15-156 +always ess 15-2346 +always est 15-23456 + +endword tel 2345-13456 +always scheitel 156-146-2345-13456 shouldn't use the te-contraction +begword bettel 12-15-2345-2345-13456 shouldn't use the te-contraction +endword teln 2345-13456-1345 +endword tels 2345-13456-234 +endword tem 2345-12356 +endword tene 2345-14-15 +always tten 2345-2345-14 shouldn't use the te-contraction +always tter 2345-2345-12456 shouldn't use the te-contraction +always daten 145-1-2345-14 +always karten 13-356-2345-14 +midendword maten 134-1-2345-14 shouldn't use the te-contraction +endword tenem 2345-14-12356 +endword tenen 2345-14-14 +endword tener 2345-14-12456 +endword benes 12-14-123456 +endword tenes 2345-14-123456 +endword tens 2345-14-234 +endword ter 2345-12456 +endword tere 2345-12456-15 +endword terem 2345-12456-12356 +endword teren 2345-12456-14 +endword teres 2345-12456-123456 +endword ters 2345-12456-234 +always liter 123-24-2345-12456 +endword tern 2345-12456-1345 +endword tes 2345-123456 + +endword bel 12-13456 shouldn't use the be-contraction +endword beln 12-13456-1345 shouldn't use the be-contraction +endword belns 12-13456-1345-234 shouldn't use the be-contraction +endword bels 12-13456-234 shouldn't use the be-contraction +midword belläng 12-13456-5-123-1245 kabellänge shouldn't use the ll-contraction +midword bellaeng 12-13456-5-123-1245 +midendword belung 12-13456-136 +before st midendword belungs 12-13456-136-234 +always belveder 12-13456-1236-15-145-12456 shouldn't use the be-contraction +always wirbel 2456-24-1235-12-13456 shouldn't use the be-contraction +endword ben 12-14 shouldn't use the be-contraction +endword bend 12-14-145 shouldn't use the be-contraction +endword bende 12-14-145-15 shouldn't use the be-contraction +endword bendem 12-14-145-12356 shouldn't use the be-contraction +endword benden 12-14-145-14 shouldn't use the be-contraction +endword bender 12-14-145-12456 shouldn't use the be-contraction +endword bendes 12-14-145-123456 shouldn't use the be-contraction +endword benem 12-14-12356 shouldn't use the be-contraction +endword benen 12-14-14 shouldn't use the be-contraction +endword bens 12-14-234 shouldn't use the be-contraction +endword ber 12-12456 shouldn't use the be-contraction +endword berei 12-12456-146 shouldn't use the be-contraction +endword bereien 12-12456-146-14 shouldn't use the be-contraction +endword berin 12-12456-35 shouldn't use the be-contraction +endword berinnen 12-12456-35-1345-14 shouldn't use the be-contraction +endword bern 12-12456-1345 shouldn't use the be-contraction +endword bers 12-12456-234 shouldn't use the be-contraction +always ober 135-12-12456 shouldn't use the be-contraction +endword bes 12-123456 shouldn't use the be-contraction + +always begeh 23-1245-2356 shouldn't use the ge-contraction +always getriebegehäus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction +always getriebegehaeus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction +always umgeht 136-134-1245-2356-2345 shouldn't use the ge-contraction +always geig 1245-146-1245 should use the ei-contraction +always geisel 1245-146-234-13456 shouldn't use the ge-contraction +always geist 1245-146-23456 +prfword gel 1245-13456 shouldn't use the ge-contraction +midendword gelhaft 1245-13456-125-124 +midword gelläng 1245-13456-5-123-1245 +midword gellaeng 1245-13456-5-123-1245 +prfword geln 1245-13456-1345 +prfword gelns 1245-13456-1345-234 +prfword gels 1245-13456-234 +midendword gelung 1245-13456-136 +before st midendword gelungs 1245-13456-136-234 +prfword gen 1245-14 shouldn't use the ge-contraction +midendword gend 1245-14-145 shouldn't use the ge-contraction +endword gens 1245-14-234 shouldn't use the ge-contraction +midendword ger 1245-12456 should use er-contraction if not part of a word intro +before r begword abge 1-12-12346 +before r begword ange 235-12346 +word anger 235-1245-12456 +word angern 235-1245-12456-1345 +word angers 235-1245-12456-234 +begword unange 256-235-12346 +begmidword aufger 2-16-12346-1235 +begmidword ausger 16-234-12346-1235 +before r begmidword einge 1246-12346 +begword unger 256-12346-1235 +sufword ungerecht 256-12346-1235-2345 +always gerieben 12346-1235-346-12-14 should use the ge-contraction +sufword zuge 2-1356-12346 +endword ges 1245-123456 shouldn't use the ge-contraction +always sieges 234-346-1245-123456 +always tageslicht 2345-1-1245-123456-123-3456-2345 shoudln't use the ge- nor lich-contraction +always euthanasie 126-2345-125-235-1-234-346 +always antasie 235-2345-1-234-346 +endword antasien 235-2345-1-234-24-14 +midendword ien 24-14 shouldn't use the ie-contraction +always erschien 12456-156-346-1345 +prfword industrien 35-145-136-23456-1235-24-14 +before n always industrie 35-145-136-23456-1235-346 industrienation shouldn't use the en-contraction +begmidword anomal 235-135-134-25 shouldn't use the mal-contraction +endword anomal 235-135-134-1-123 shouldn't use the mal-contraction +midendword iene 346-1345-15 should use the ie-contraction +midendword ienen 346-1345-14 should use the ie-contraction +endword tel 2345-13456 should use the el-contraction +endword ten 2345-14 should use the en-contraction +endword ter 2345-12456 should use the er-contraction +endword tes 2345-123456 should use the es-contraction +always trigraph = shouldn't use the ig-contraction + +# Vorsilbenkürzungen +begword ent 2346 +word enter 14-2345-12456 shouldn't use the ent-contraction +begword ex 1346 +begword pro 12345 +begword ver 36 +word verb 1236-12456-12 +word vers 1236-12456-234 + +#begword auspiz 16-234-1234-24-1356 shouldn't use the aus-contraction +word ente 14-236 shouldn't use the ent-contraction +sufword enten 14-2345-14 shouldn't use the ent-contraction +word entchen 14-2345-1456-14 +begword veranda 1236-12456-236-145-1 shouldn't use the ver-contraction +begword vertikal 1236-12456-2345-24-13-25 shouldn't use the ver-contraction +word vertikal 1236-12456-2345-24-13-1-123 shouldn't use the ver-contraction + +# Nachsilbenkürzungen +endword falls 124 +midendword heit 125 +before s midword heits 125-234 +midendword keit 13 +before s midword keits 13-234 +endword mal 134 +sufword gemal 12346-134-25 gemalt shouldn't use the mal-contraction +midendword nis 1346 +always nisier 1345-24-234-346-1235 technisierung shouldn't use -nis +midendword sam 2346 +sufword bisam = +always bischofsamt 12-24-156-135-124-234-1-134-2345 shouldn't use the sam-contraction +midendword schaft 156 +midendword ung 136 +always dschungel 6-145-156-256-1245-13456 shouldn't use the ung-contraction +midendword terung 2345-12456-136 +before cst midword ungs 136-234 Bindungscharakter, Regierungschef + +endword wärts 2456 + +midendword ation 5-1345 +always industrienation 35-145-136-23456-1235-346-1345-5-1345 +before s midword ations 5-1345-234 +midendword ativ 5-1236 +#always religion 1235-13456-45-245 +endword ismus 5-24 +midendword istisch 5-156 +endword nismus 1345-5-24 shouldn't use the nis-contraction +midendword nistisch 1345-5-156 +midendword ität 5-345 +midendword itaet 5-345 +before s midword itäts 5-345-234 +before s midword itaets 5-345-234 +midendword mität 134-5-345 shouldn't use the mit-contraction + +sufword anis 235-24-234 shouldn't use the nis-contraction +before st midword ations 5-1345-234 +sufword barschaft 12-356-156-1-124-2345 shouldn't use the shaft-contraction +always blumensamen 12-123-136-134-14-234-1-134-14 shouldn't use the sam-contraction +prfword dezimal = if we use the mal-contraction here, we get a new word dezim +begmidword dezimal 145-15-1356-24-134-25 +sufword small 234-134-1-12345 shouldn't use the mal-contraction +word beaufort 12-15-16-124-26-2345 shouldn't use the auf-contraction +sufword erheiter 12456-125-146-2345-12456 shouldn't use the heit-contraction +prfword formal 124-26-134-1-123 shouldn't use the mal-contraction +begword formal 124-26-134-25 shouldn't use the mal-contraction +word firnis = shouldn't use the nis-contraction +begword gesam 12346-234-1-134 shouldn't use the sam-contraction +always herrschaft 1235-1235-156-1-124-2345 can not use the shaft-contraction +always hoheit 125-135-125-146-2345 shouldn't use the heit-contraction +always kuhdung 13-136-125-145-256-1245 shouldn't use the ung-contraction +always hunger 125-256-1245-12456 shouldn't use the ung-contraction +before g begword lun 123-256 shouldn't use the ung-contraction +prfword maximal = shouldn't use the mal-contraction +begmidword maximal 134-1-6-1346-24-134-25 shouldn't use the mal-contraction +always tennis 2345-14-1345-24-234 shouldn't use the nis-contraction +midendword ungscharakter 136-234-1456-13 +before st midendword ungs 136-234 shouldn't use the ss/st-contraction +midendword zung 1356-136 auseinandersetzung shouldn't use the zu-contraction +begword zung 1356-256-1245 shouldn't use the ung-contraction + +# Einformige Kürzungen, nur alleinstehend +word als 146 +word auch 34 +word eu = +word das 145 +word dass 2346 +word den 15 +word der 1235 +word des 3 +word die 346 +word ihm 236 +word im 36 not allowed when used in hyphenated words like Hans-im-Glück-Gefühl +after letter literal -im- +word ist 23456 +word kann 13 +word lässt 123 +word laesst 123 +word man 134 +word oder 135 +word schon 156 +word sich 14 +word sie 234 +word was 2456 + +# Einformige Kürzungen, alleinstehend oder in Wortverbindungen +word aber 1 +always aber 2-1 +always aberdeen 1-12-12456-145-15-15-1345 +midword aberech 1-23-1235-15-1456 +midendword abereich 1-23-1235-146-1456 +midendword abericht 1-23-2-3456 +begmidword aberkann 1-12-12456-13-235-1345 +always aberkenn 1-12-12456-13-14-1345 +begmidword abernt 1-12-12456-1345-2345 +prfword abernte 1-12-12456-1345-236 +prfword aberntest 1-12-12456-1345-236-23456 +prfword aberntet 1-12-12456-1345-236-2345 +prfword aberntete 1-12-12456-1345-236-236 +prfword abernteten 1-12-12456-1345-236-2345-14 +prfword aberntetest 1-12-12456-1345-236-236-23456 +prfword aberntetet 1-12-12456-1345-236-236-2345 +always aberrans 1-12-12456-1235-235-234 +always aberratio 1-12-12456-1235-1-2345-24-135 +always aberration 1-12-12456-1235-5-1345 +always aberrier 1-12-12456-1235-346-1235 +always aberzieh 1-12-12456-1356-346-125 +always aaberg 1-1-12-12456-1245 +always cabernet 6-14-1-12-12456-1345-15-2345 +sufword faber 124-1-12-12456 +midword gaber 1245-1-23-1235 +always gaberecht 1245-1-23-1235-2345 +always gaberegel 1245-1-23-1235-15-1245-13456 +sufword haber 125-1-12-12456 +always pharmaberat 1234-125-356-134-1-23-1235-1-2345 +always schaber 156-1-12-12456 +always eisschaber 146-234-156-1-12-12456 +always makaber 134-1-13-1-12-12456 +always kandelaber 13-235-145-13456-1-12-12456 +always laber 123-1-12-12456 +always annaberg 235-1345-1-12-12456-1245 +always araber 356-1-12-12456 +always graber 1245-1235-1-12-12456 +always traber 2345-1235-1-12-12456 +begmidword tabern 2345-1-12-12456-1345 +always waber 2456-1-12-12456 +always bergzabern 12-12456-1245-1356-1-12-12456-1345 + +word auf 16 +always auf 2-16 +before g always aufwie 2-16-2456-346 aufwiegeln/aufwiegler/aufwiegst shouldn't use the wie-contraction +before s always aufwie 2-16-2456-346 +begword aufzuck 2-16-1356-136-46 +before konsonant always aufzug 2-16-1356-136-1245 +always aufzugsturm 2-16-1356-136-1245-234-2345-136-1235-134 shouldn't use zu-contraction and st-contraction +before m always aufzugstür 2-16-1356-136-1245-234-2345-1256-1235 shouldn't use zu-contraction and st-contraction +always aufzugstür 2-16-1356-136-1245-234-2345-1256-1235 shouldn't use zu-contraction and st-contraction +prfword lauf 123-16-124 +prfword laufe 123-16-124-15 +prfword laufen 123-16-124-14 +prfword laufend 123-16-124-14-145 +prfword laufende 123-16-124-14-145-15 +prfword laufendem 123-16-124-14-145-12356 +prfword laufenden 123-16-124-14-145-14 +prfword laufender 123-16-124-14-145-12456 +prfword laufendes 123-16-124-14-145-123456 +prfword laufens 123-16-124-14-234 +prfword laufes 123-16-124-123456 +prfword laufs 123-16-124-234 +prfword laufst 123-16-124-23456 +prfword lauft 123-16-124-2345 +always schlauf 156-123-16-124 shouldn't use the auf-contraction +always abfragerate 1-12-124-1235-1-12346-1235-1-236 shouldn't use the er-contraction +always abfrageraten 1-12-124-1235-1-12346-1235-1-2345-14 +always abgelauf 1-12-12346-123-16-124 +always akkulauf 1-13-13-136-123-16-124 +always auflauf 2-16-123-16-124 +always durchlauf 2-1456-123-16-124 +begword verlauf 36-123-16-124 shouldn't use the auf-contraction +midendword verlauf 1236-12456-123-16-124 shouldn't use the auf-contraction + +word bei 12 +always bei 2-12 +always beizung 12-146-1356-136 shouldn't use the bei-contraction +always beiß 12-146-6-2346 shouldn't use the bei-contraction +endword bein 12-1246 shouldn't use the bei-contraction +endword beine 12-1246-15 shouldn't use the bei-contraction +endword beinen 12-1246-14 shouldn't use the bei-contraction +endword beines 12-1246-123456 shouldn't use the bei-contraction +endword beins 12-1246-234 shouldn't use the bei-contraction +before t always beinhal 23-35-125-25 shouldn't use the bei-contraction +always beinhalter 12-1246-125-25-2345-12456 should use the ei-contraction +always darmbein 145-356-134-12-1246 +always gabeinvent 1245-1-23-35-1236-14-2345 Übergabeinventar shouldn't use the bei-contraction +always kreuzbein 13-1235-126-1356-12-1246 +always schienbein 156-346-1345-12-1246 +always schlüsselbein 156-123-1256-2346-13456-12-1246 shouldn't use the bei-contraction + +word dem 12356 +always dem 2-12356 +endword dem 145-12356 shouldn't use the dem-contraction +always außerdem 16-6-2346-12456-2-12356 +always demask = demaskiert shouldn't use the dem-contraction +always demilit = shouldn't use the dem-contraction +always demonstr 145-12356-135-1345-23456-1235 shouldn't use the dem-contraction +word demo 145-12356-135 shouldn't use the dem-contraction +word demos 145-12356-135-234 shouldn't use the dem-contraction + +word durch 1456 +always durch 2-1456 +sufword durchzuck 2-1456-1356-136-46 shouldn't use the zu-contraction +word durchzug 2-1456-1356-136-1245 shouldn't use the zu-contraction +word durchzuges 2-1456-1356-136-1245-123456 shouldn't use the zu-contraction +sufword durchzugs 2-1456-1356-136-1245-234 shouldn't use the zu-contraction +#begword durcheinandergerat 1456-2-1246-12346-1235-1-2345 +always zugerat 2-1356-12346-1235-1-2345 shouldn't use the er-contraction + +word für 124 +always für 2-124 +always fürst 124-1256-1235-23456 shouldn't use the für-contraction + +word gegen 1245 +always gegen 2-1245 +prfword gegenzug 2-1245-1356-136-1245 +prfword gegenzuge 2-1245-1356-136-12346 +prfword gegenzuges 2-1245-1356-136-1245-123456 +prfword gegenzugs 2-1245-1356-136-1245-234 +before g sufword gegenzun 2-1245-1356-256 + +word gewesen 12346 +always gewesen 2-12346 +always fürsorgewesen 2-124-234-26-12346-2456-123456-14 shouldn't use the gewesen-contraction + +word immer 1346 +always immer 2-1346 +always immersion 24-1346-12456-234-24-135-1345 shouldn't use the immer-contraction +always immersiv 24-1346-12456-234-24-1236 +always flimmer 124-123-24-1346-12456 +always wimmer 2456-24-1346-12456 shouldn't use the immer-contraction +always zimmer 1356-24-1346-12456 shouldn't use the immer-contraction + +word jetzt 245 +always jetzt 2-245 + +word mehr 2356 +always mehr 2-2356 + +word mit 2345 +always mit 2-2345 + +word nicht 1345 +word n 6-1345 +always nicht 2-1345 +always nichtzughör 2-1345-1356-136-1245-125-246-1235 +always nichtzuck 2-1345-1356-136-46 + +word so 1234 +always so 2-1234 +endword son = +always cursor = shouldn't use the so-contraction +begword absol = +begword absorb = +begword absorp = +always adsorbier 1-145-234-26-12-346-1235 +always aerosol 1-12456-135-234-135-123 +always amtsober 1-134-2345-234-135-12-12456 +always anthroposo 235-2345-125-1235-135-1234-135-234-135 +always chromosom 1456-1235-135-134-135-234-135-134 shouldn't use the so-contraction +always iso = +always konson = +begmidword sensor 234-14-234-26 +endword sensor 234-14-234-135-1235 +endword sensor 234-14-234-135-1235 +always sockel 234-135-46-13456 +word soda = +always soffizier 234-135-124-124-24-1356-346-1235 +always soft = +always soldat = +endword solo = +always sommer 234-135-1346-12456 +before konsonant always son = +always sonogra = +always sonn = +always sonst 234-135-1345-23456 +always sorientier 234-26-24-14-2345-346-1235 +before konsonant always sor 234-26 +always source = +sufword south = +always sowjet = +always soziolo = +midword ungsopt 136-234-135-1234-2345 Abendgestaltungsoption shouldn't use the so-contraction + +word über 1256 +word ueber 1256 +always über 2-1256 +always überzucht 2-1256-1356-136-1456-2345 +always überzuck 2-1256-1356-136-46 +prfword überzug 2-1256-1356-136-1245 +prfword überzuges 2-1256-1356-136-1245-123456 +before konsonant always überzug 2-1256-1356-136-1245 +always überlauf 2-1256-123-16-124 + +word und 136 +always und 2-136 +sufword gesund 12346-234-256-145 +prfword hund 125-256-145 shouldn't use the und-contraction +always hunde 125-256-145-15 shouldn't use the und-contraction +always hundert 125-256-145-12456-2345 shouldn't use the und-contraction +prfword hunderte 125-256-145-12456-236 shouldn't use the und-contraction +prfword hunden 125-256-145-14 shouldn't use the und-contraction +prfword hundes 125-256-145-123456 shouldn't use the und-contraction +always kund 13-256-145 shouldn't use the und-contraction +always mund 134-256-145 shouldn't use the und-contraction +always rundfunk 1235-256-145-124-256-13 shouldn't use the und-contraction +sufword schrund 156-1235-256-145 +always wund 2456-256-145 shouldn't use the und-contraction + +word unter 256 +always unter 2-256 +sufword kunter 13-256-2345-12456 shouldn't use the unter-contraction +sufword kunterbunter 13-256-2345-12456-12-256-2345-12456 +sufword munter 134-256-2345-12456 shouldn't use the unter-contraction +always virus = + +word voll 12345 +always voll 2-12345 +prfword vollzug 2-12345-1356-136-1245 +prfword vollzuge 2-12345-1356-136-12346 +prfword vollzuges 2-12345-1356-136-1245-123456 +always vollzugs 2-12345-1356-136-1245-234 + +word von 1236 +always von 2-1236 + +word vor 26 +always vor 2-26 +always vorzugs 2-26-1356-136-1245-234 +always vorzugstimme 2-26-1356-136-1245-23456-24-1346-15 +always vorzugstimmen 2-26-1356-136-1245-23456-24-1346-14 +always favorit 124-1-1236-26-24-2345 shouldn't use the vor-contraction + +word wie 126 +always wie 2-126 +always zwiebel 1356-2456-346-12-13456 shouldn't use the wie-contraction + +word zu 1356 +always zu 2-1356 +always zugentlast 1356-136-1245-14-2345-123-1-23456 shouldn't use the zu- nor ge-contraction +word indem 35-2-12356 +word trotzdem 2345-1356-2-12356 +word zudem 1356-2-12356 +always zucht 1356-136-1456-2345 shouldn't use the zu-contraction +always zuck 1356-136-46 shouldn't use the zu-contraction +before g always zug = +endword zug = +endword zuges 1356-136-1245-123456 + +# Einformige Kürzungen, alleinstehend oder am Wortanfang +before e sufword ihr 24 +before i sufword ihr 24 +before e sufword sein 246 +before i sufword sein 246 +word war 356 +word waren 356-14 +word warst 356-23456 +word wart 356-2345 +word war's 356-6-234 +word wär 5-356 +word wäre 5-356-15 +word wären 5-356-14 +word wärest 5-356-15-23456 +word wäret 5-356-15-2345 +word wärst 5-356-23456 +word wärt 5-356-2345 +word wär's 5-356-6-234 + +# Einformige Kürzungen, alleinstehend, mit Endungen oder in Wortverbindungen +always hatt 125 +always hätt 345 +always haett 345 +always welch 13456 + +word adonis = shouldn't use the nis-contraction +always aktuell 1-13-2345-136-15-12345 should use the ll-contraction +always all 1-12345 +sufword alle 1-15 +always allegor 1-12345-15-1245-26 Allegorie shouldn't use the ae-contraction +always allein 1-1246 +word allem 1-12356 +always allen 1-14 +always aller 1-12456 +always allerg 1-12345-12456-1245 Allergiker +word alles 1-123456 +always allesamt 1-12345-15-234-1-134-2345 shouldn't use the es-contraction +always alphabet 25-1234-125-1-12-15-2345 shouldn't use the hab-contraction +word also 1-135 +always ander 2-12456 +always wander 2456-235-145-12456 wandern shouldn't use the ander-contraction +sufword zander 1356-235-145-12456 +always änder 5-12456 +always abänder 1-12-5-12456 +always bänder 12-345-1345-145-12456 shouldn't use the änder-contraction +always aender 5-12456 +always arbeit 356-12 +before s always arbeits 356-12-234 +always arben 356-12-14 +always kauf 13-16-124 +always ausst 16-234-23456 shouldn't use the ss-contraction +always ausstell 16-234-2-13456 +always ausstand 16-234-2-23456 +always ausständ 16-234-5-23456 + +always australi 16-23456-1235-25-24 australier shouldn't use the ie-contraction +always lotaustralin 123-135-2345-16-23456-1235-25-35 + +always ähnlich 345-456 +always aehnlich 345-456 + +word balsam 12-25-234-1-134 +word been 12-15-15-1345 english word shouldn't use be- or en-contraction +always beere 12-15-15-1235-15 +always beeren 12-15-15-1235-14 +always behr 12-2356-1235 entbehren +begword beid 12-145 beiderseits +always berg 12-12456-1245 shouldn't use the be-contraction +always berge 12-12456-12346 shouldn't use the be-contraction +always bergen 12-12456-1245-14 shouldn't use the be-contraction +always berger 12-12456-1245-12456 shouldn't use the be-contraction +always berges 12-12456-1245-123456 shouldn't use the be-contraction +always besonder 23 +always besser 234-234 +contraction ss +word beim 12-134 +contraction bm +word bis 12-234 +sufword bisher 12-234-125-12456 +sufword bislang 12-2345-123-1245 +sufword bisweil 12-234-2456-146-123 +always bison = + +always bist 12-23456 +always bistum 12-24-23456-136-134 shouldn't use the bist-contraction +always bleib 12-12 +contraction bb +always brauch 2-34 +always bräuch 5-34 +always braeuch 5-34 +always brief 12-124 +contraction bf +always bring 12-1245 +contraction bg + +always charakter 1456-13 +sufword chor 1456-135-1235 shouldn't use the or-contraction +always comput 6-14-135-134-1234-136-2345 computer should use the er-contraction + +always dabei 145-12 +contraction db +always dadurch 145-145 +contraction dd +always dafür 145-124 +contraction df +always dagegen 145-1245 +contraction dg +always daher 145-125 +contraction dh +always damit 145-134 +contraction dm +always dank 145-13 +contraction dk +always davon 145-1236 +contraction dv +always dazu 145-1356 +contraction dz +always dazubleib 145-1-2-1356-12-12 shouldn't use the dazu-contraction +always dazumal 145-1-2-1356-134 +always deuten 145-126-2345-14 shouldn't use the te-contraction +always deal = dealer +word dei = Agnus Dei +always demokrat 145-2345 +contraction dt +word denen 15-14 +word dnister 145-1345-24-234-2345-12456 shouldn't use the nis-contraction +word denn 145-1345 +word dennschon 145-1345-156-135-1345 +always dessen 145-2346 +always deutsch 145-156 +word diem 145-24-12356 we shouldn't use the ie-contraction here +word diese 346-15 +word diesen 346-14 +word dieser 346-12456 +word dieses 346-123456 +sufword diesmal 346-134 +word dir 145-1235 +word doch 145-1456 +always druck 145-46 +always drück 5-145-46 +always dürf 2-145 + +always eben 15-12-14 +word ebenso 15-135 +contraction eo +sufword ehemal 15-125-15-134 +word ei 6-146 +always eigen 146-1245-14 Eigennutz shouldn't use the ge-contraction +always einander 2-1246 +word en 15-1345 en passant +always enig 14-45 +always erkenn 12456-13-14-1345 +sufword etwa 15-1 +contraction ea +word etwas 2345-2456 +contraction tw + +always fahr 2-1235 +always fahrtsst 2-1235-2345-234-23456 shouldn't use the ss-contraction +always fahrtsstell 2-1235-2345-234-2-13456 +always fähr 5-1235 +always faehr 5-1235 +always fall 124-12345 +always fäll 5-124-12345 +always faell 5-124-12345 +always fertig 124-45 +always fest 124-15-23456 should use the st-contraction +always film = +always folgen 124-135-123-1245-14 shouldn't use the ge-contraction +always fragil = +always fragment 124-1235-1-1245-134-14-2345 +always freund 124-145 +contraction fd +always führ 124-125 +contraction fh +always fürcht 124-1256-1235-1456-2345 shouldn't use the für-contraction + +always ganz 1245-1356 +contraction gz +always gänz 5-1245-1356 +always gaenz 5-1245-1356 +always garnison 1245-356-1345-24-234-135-1345 shouldn't use the nis-contraction +word gegend 12346-1245-14-145 shouldn't use the gegen-contraction +always gegenüber 1245-1256 +contraction gü +always gegenwart 1245-2456 +contraction gw +always gegenwärt 5-1245-2456 +always gegenwaert 5-1245-2456 +always gelb 1245-13456-12 should use the el-contraction +always geld 1245-13456-145 should use the el-contraction +always gelegen 1245-1245 +contraction gg +begword gelt 1245-13456-2345 gelten shouldn't use the ge-contraction +prfword gene 1245-14-15 +prfword genem 1245-14-12356 +prfword genen 1245-14-14 +prfword gener 1245-14-12456 +prfword genes 1245-14-123456 +always geogra = Geographie shouldn't use the ge-contraction +prfword gern 1245-12456-1345 +midendword gerlich 1245-12456-456 bürgerlich shouldn't use the ge-contraction +always gern 1245-12456-1345 we shouldn't use the ge-contraction here +always geschäft 1245-124 +always geschaeft 1245-124 +contraction gf +always gesellschaft 1245-156 +always geworden 12346-2456 +always gibt 1245-12 +contraction gb +always gleich 1245-1456 +always glück 1245-46 +always groß 1245-2346 +contraction gß +always größ 5-1245-2346 +always grund 1245-145 +contraction gd +always gründ 5-1245-145 +always gründonners 1245-1235-1256-1345-145-135-1345-1345-12456-234 gründonnerstag shouldn't use the gründ-contraction +always hab 2-125 +always haft 125-124 +contraction hf +always häft 5-125-124 +always haeft 5-125-124 +word hain = +always hamburger 125-1-134-12-136-1235-1245-12456 shouldn't use the ge-contraction +always hand 125-145 +always händ 5-125-145 +always haend 5-125-145 +always halten 125-25-2345-14 shouldn't use the te-contraction +always hast 125-23456 +always hat 125-2345 +contraction ht +word hattest 125-15-23456 shouldn't use the es-contraction +word hattrick 125-1-2345-2345-24-46 shouldn't use the hatt-contraction +always haupt 125-1234 +contraction hp +always häupt 5-125-1234 +always herr 1235-1235 +contraction rr +always hier 125-1235 +contraction hr +always hierar 125-24-12456-356 hierarchie +always hoff 124-124 +contraction ff + +word ich 3456 +sufword ihn 24-125 +always inter 35-2345-12456 +always interess 2-35 +always irgend 24-1245 irgendetwas +contraction ig + +always jahr 245-1235 +contraction jr +always jähr 5-245-1235 +always jaehr 5-245-1235 +always jahrhundert 245-125 +contraction jh +always jahrtausend 245-2345 +contraction jt +always jahrzehnt 245-1356 +contraction jz +sufword jed 245-145 +word jedoch 245-1456 +sufword jetzig 245-45 +always johannisberg 245-135-125-235-1345-24-234-12-12456-1245 shouldn't use the nis-contraction +always jung 245-256-1245 shouldn't use the ung-contraction + +word kannst 13-23456 +always kapital 13-1234 +contraction kp +always klemm 13-123-15-1346 eingeklemmt shouldn't use the em-contraction +always knoch 13-1345-135-1456 Knochen shouldn't use the noch-contraction +always komm 13-1346 +contraction kx +always akkommod 1-13-13-135-1346-135-145 shouldn't use the komm-contraction +always kömm 5-13-1346 +always konnt 13-2345 +contraction kt +always könn 2-13 + +always kraft 13-124 +contraction kf +always kräft 5-13-124 +always kraeft 5-13-124 + +always kulturell 13-136-123-2345-136-1235-15-12345 should use the ll-contraction + +always kurz 13-1356 +contraction kz +always kürz 5-13-1356 + +always lang 123-1245 +contraction lg +before g sufword schlan 156-123-235 shouldn't use the lang-contraction +sufword schlangen 156-123-235-1245-14 +before g always warteschlan 2456-356-236-156-123-235 +always läng 5-123-1245 +always laeng 5-123-1245 +always jahrelang 245-1235-15-123-1245 shouldn't use the el-contraction +always jahrhundertelang 245-125-15-123-1245 shouldn't use the el-contraction +always jahrzehntelang 245-1356-15-123-1245 shouldn't use the el-contraction +always jahrtausendelang 245-2345-15-123-1245 shouldn't use the el-contraction +before s always jahres 245-1235-123456 +before g always jahresta 245-1235-123456-2345-1 +always langobard 123-235-1245-135-12-356-145 shouldn't use the lang-contraction +always lass 2-123 +always läss 5-123 +always laess 5-123 +sufword blass 12-123-1-2346 +sufword blasst 12-123-1-234-23456 +always class = shouldn't use the lass-contraction +before s always glas = +sufword klass 13-123-1-2346 shouldn't use the lass-contraction +always lassist 123-1-2346-24-23456 +always laich 123-1-24-1456 shouldn't use the ich-contraction +always lasagne = shouldn't use the sag-contraction +always lasso 123-1-2346-135 shouldn't use the lass-contraction +always länd = +always laend = +always leb 123-12 +contraction lb +always klebeband 13-123-15-23-12-235-145 shouldn't use the leb-contraction +always klebebänder 13-123-15-23-12-345-1345-145-12456 shouldn't use the leb- nor änder-contraction +always leicht 123-1456 +always letzt 123-2345 +contraction lt +always lieb 123-346-12 + +always männ 5-134-1345 +always maenn 5-134-1345 +#word manna = shouldn't use the mann-contraction +#always mannequin 134-235-1345-15-6-12345-35 shouldn't use the mann-contraction +always maschin 134-156 +always material 134-123 +contraction ml +always materiell 134-12345 +word mir 134-1235 +always mittel 134-2345 +contraction mt +always moldawien 134-135-123-145-1-2456-24-14 shouldn't use the wie-contraction +sufword moor = shouldn't use the or-contraction +always möchte 1456-15 +word möchten 1456-14 +always mög 2-246 +always möglich 134-456 +always musik 134-13 +contraction mk +always muss 134-2346 +always müss 2-134 + +word nachdem 1345-145 +always nahm 1345-134 Annahme +contraction nm +always natur 1345-2345 +contraction nt +always natürlich 1345-456 +always nächst 1345-23456 +always naechst 1345-23456 +always nehm 1345-125 +contraction nh +endword nisch 1345-24-156 shouldn't use the nis-contraction +endword nische 1345-24-156-15 shouldn't use the nis-contraction +endword nischen 1345-24-156-14 shouldn't use the nis-contraction +endword nischer 1345-24-156-12456 shouldn't use the nis-contraction +endword nisches 1345-24-156-123456 shouldn't use the nis-contraction +always nichts 1345-234 +contraction ns +always nichtsehend 2-1345-234-2356-14-145 shouldn't use the nichts-contraction +always nichtschwimm 2-1345-156-2456-24-1346 shouldn't use the nichts-contraction +always noch 1345-1456 +always nommen 1345-1346 +contraction nx +always genommen 12346-1345-1346 +midendword augenommen 16-12346-1345-1346 +always eigenommen 146-12346-1345-1346 +always notwendig 1345-2456 +contraction nw +begmidword normal 1345-26-134-25 shouldn't use the mal-contraction +prfword normal 1345-26-134-1-123 shouldn't use the mal-contraction +always anim 235-24-134 animal shouldn't use the mal-contraction +always nur 1345-1235 +contraction nr +always nutz 1345-1356 +contraction nz +always nütz 5-1345-1356 + +sufword ohne 135-15 +contraction oe + +always öffentlich 246-456 + +always paar = shouldn't use the ar-contraction +always paragraf 1234-1245 +contraction pg +always person 1234-1345 +contraction pn +always platz 1234-1356 +always plätz 5-1234-1356 +always plaetz 5-1234-1356 +always plötzlich 1234-456 +always ploetzlich 1234-456 +always politik 1234-13 +contraction pk +always politisch 1234-156 +always punkt 1234-2345 +contraction pt + +always recht 1235-2345 +contraction rt +before s always rechts 1235-2345-234 +always regier 1235-1245 +contraction rg +before s always regierungs 1235-1245-136-234 +always rehabilit 1235-125 +contraction rh +always republik 1235-13 +contraction rk +sufword rest 1235-15-23456 should use the st-contraction +always richt 2-3456 +always rück 1235-46 +always rueck 1235-46 + +always sag 234-1245 +contraction sg +always saal = shouldn't use the al-contraction +word samen 234-1-134-14 shouldn't use the sam-contraction +always satz 234-1356 +contraction sz +always sätz 5-234-1356 +always saetz 5-234-1356 +always schnur 156-1345-136-1235 shouldn't use the nur-contraction +always school 234-1456-135-135-123 foreign word, sch-contraction not allowed +always schlag 156-1245 +always schläg 5-156-1245 +always schlaeg 5-156-1245 +always schließ 156-2346 +always schreib 156-12 +always schrift 156-2345 +always schrieb 2-156 +always schwierig 156-45 +always schwillt 156-2456-24-12345-2345 shouldn't use the will-contraction +always schwoll 156-2456-135-12345 geschwollen shouldn't use the woll-contraction +word sehr 234-1235 +sufword versehr 36-234-1235 +sufword unversehr 256-1236-12456-234-1235 +always selbst 234-23456 +always selbständig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction +always selbstaendig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction +always setz 2-15 +sufword sesam 234-123456-1-134 shouldn't use the sam-contraction +word sind 234-145 +contraction sd +always gesinde 12346-234-35-145-15 +always gesindel 12346-234-35-145-13456 +always gesindes 12346-234-35-145-123456 +always gesindest 12346-234-35-145-15-23456 + +always sitz 2-24 +always sitzbein 2-24-12-1246 shouldn't use the bei-contraction +always solch 234-1456 +always soll 2-234 +always sondern 234-1345 +contraction sn +always sozial 234-123 +contraction sl +always spiel 2-346 +always spräch 5-234-1234 +always spraech 5-234-1234 +always sprech 2-2346 +always staat 23456-2345 +always stand 2-23456 +always standard 23456-235-145-356-145 shouldn't use the stand-contraction +always ständ 5-23456 +always staend 5-23456 +always stell 2-13456 +always sstell 234-2-13456 shouldn't use the ss-contraction +word stets 23456-234 +always strahier 23456-1235-1-125-346-1235 abstrahieren + +word taiga = shouldn't use the ig-contraction +always täter 2345-345-2345-12456 shouldn't use the er-contraction +always technik 2345-13 +contraction tk +always stechnik 234-2345-13 +always technisch 2345-156 +always stechnisch 234-2345-156 +sufword test 2345-15-23456 shouldn't use the es-contraction +sufword töricht 2345-246-1235-3456-2345 shouldn't use the richt-contraction +sufword toericht 2345-246-1235-3456-2345 shouldn't use the richt-contraction +always trag 2345-1245 +contraction tg +always träg 5-2345-1245 +always train = training shouldn't use the first possible in-contraction +always treff 2345-124 +contraction tf +always trinitro = shouldn't use the in-contraction +always trotz 2345-1356 +contraction tz +always trüb = trüber shouldn't use the über-contraction + +always unbeirr 256-23-24-1235-1235 unbeirrt shouldn't use the bei-contraction +sufword under 256-145-12456 shouldn't use the und-contraction + +word überhaupt 1256-125 +word ueberhaupt 1256-125 +always übrig 1256-45 + +always verhältnis 1236-125 +contraction vh +always verhaeltnis 1236-125 +always viel 1236-123 +contraction vl +word vielleicht 1236-2345 +always volk 1236-13 +contraction vk +always völk 5-1236-13 +word vom 1236-134 +contraction vm + +always wahr 2456-125 +contraction wh +always währ 5-2456-125 +always während 345-145 +contraction äd +always waehrend 345-145 +sufword warm 2456-356-134 shouldn't use the war-contraction +always weg 2456-1245 +contraction wg +always weis 2-146 Anweisung +always zweischicht 1356-2456-146-156-3456-2345 shouldn't use the weis-contraction +always weit 2456-2345 +before konsonant begword zweit 1356-2456-146-2345 shouldn't use the weit-contraction +always wenig 2456-45 +sufword wenn 2456-1345 +contraction wn +always werd 2-2456 +always wesentlich 2456-456 +always wiegend 2456-346-1245-14-145 shouldn't use the wie-contraction +always wieder 346-145 +always wien 2456-346-1345 shouldn't use the wie-contraction +always will 2456-12345 +always william 2456-24-12345-24-1-134 +word wir 2456-1235 +word wird 2456-145 +always wirk 2456-13 +contraction wk +word wirst 2456-23456 +always wirtschaft 2456-156 +always wiss 2456-2346 +contraction wß +word swiss 234-2456-24-2346 shouldn't use the wiss-contraction +always wohl 2456-123 +contraction wl +always woll 2-135 +word Wolle 2456-135-12345-15 shouldn't use the woll-contraction +always wollfad 2456-135-12345-124-1-145 shouldn't use the woll-contraction +always baumwoll 12-16-134-2456-135-12345 shouldn't use the woll-contraction +word worden 135-14 +sufword wurd 136 +sufword würd 1256 + +always young 6-13456-135-136-1345-1245 shouldn't use the u-contraction + +always zahl 1356-123 +contraction zl +always zähl 5-1356-123 +always zeit 1356-2345 +contraction zt +before st midendword zug = +word zum 1356-134 +word zunächst 1356-1345 +word zunaechst 1356-1345 +word zur 1356-1235 +sufword zurschau 1356-1235-156-16 +sufword zurück 1356-46 +sufword zurueck 1356-46 +always zusammen 1356-234 +always zwischen 1356-2456 +contraction zw + +# exceptions +always aachen 1-1-1456-14 shouldn't use the ach-contraction +always abbauf 1-12-12-16-124 Abbaufortschritt, Abbaufront +sufword abend 1-12-14-145 +always abenteuer 1-12-14-2345-126-12456 +always abenteurer 1-12-14-2345-126-1235-12456 +always aberkann 1-12-12456-13-235-1345 shouldn't use the aber-contraction +always aberkenn 1-12-12456-13-14-1345 shouldn't use the aber-contraction +begword abernt 1-12-12456-1345-2345 shouldn't use the aber-contraction +always abgaben 1-12-1245-1-12-14 shouldn't use the be-contraction +always ausgaben 16-234-1245-1-12-14 shouldn't use the be-contraction +sufword ablageraum 1-12-123-1-12346-1235-16-134 +always ablageräum 1-12-123-1-12346-1235-34-134 +always ablageraeum 1-12-123-1-12346-1235-34-134 +always ablauf 1-12-123-16-124 shouldn't use the auf-contraction +always ablösesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction +always abloesesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction +always abnormität 1-12-1345-26-134-5-345 shouldn't use the mit-contraction +always abnormitaet 1-12-1345-26-134-5-345 shouldn't use the mit-contraction +always abrund 1-12-1235-256-145 shouldn't use the und-contraction +begword abschieds 1-12-156-346-145-234 Abschiedsschmerz +always achteck 1-1456-2345-15-46 shouldn't use the te-contraction +always asocia 1-234-135-6-14-24-1 asociación shouldn't use the so-contraction +always afrikarefer 1-124-1235-24-13-1-1235-15-124-12456 shouldn't use the ar-contraction +sufword agent 1-1245-14-2345 shouldn't use the ge-contraction +always akadem 1-13-1-145-12356 shouldn't use the dem-contraction +sufword akten 1-13-2345-14 shouldn't use the te-contraction +always akteur 1-13-2345-126-1235 shouldn't use the te-contraction +always ingenieur 35-1245-14-24-126-1235 +always interieur 35-2345-12456-24-126-1235 +always porteur 1234-26-2345-126-1235 +always alarm 25-356-134 Alarmmeldung shouldn't use the mm-contraction +always albern 25-12-12456-1345 shouldn't use the be-contraction +always albert 25-12-12456-2345 shouldn't use the be-contraction +always alexander 25-15-6-1346-235-145-12456 shouldn't use the ander-contraction +always algerier 25-1245-12456-24-12456 shouldn't use the ie-contraction +sufword allee 1-12345-15-15 shouldn't use the alle-contraction +prfword alleen 1-12345-15-14 shouldn't use the alle-contraction +always baumallee 12-16-134-1-12345-15-15 shouldn't use the mal-contraction and alle-contraction +always baumalleen 12-16-134-1-12345-15-14 shouldn't use the mal-contraction and alle-contraction +before st always alltags 1-12345-2345-1-1245-234 +begword alm 25-134 +begword alter 25-2345-12456 +always amateur 1-134-1-2345-126-1235 should use the eu-contraction +before r always amerika 1-134-12456-24-13-1 +always amtschines 1-134-2345-234-1456-35-123456 shouldn't use the sch-contraction +always amtsstub 1-134-2345-234-23456-136-12 shouldn't use the ss-contraction +always andalusier 235-145-25-136-234-24-12456 shouldn't use the ie-contraction +midendword anebel 1-1345-15-12-13456 Andromedanebel shouldn't use the an-contraction +before st always anfangs 235-124-235-1245-234 +before st always angriffs 235-1245-1235-24-124-124-234 +always anklage 235-13-123-1-12346 Anklagerede shouldn't use the er-contraction +always anklang 235-13-123-235-1245 shouldn't use the lang-contraction +always ankläng 235-13-123-345-1345-1245 shouldn't use the läng-contraction +begword anlagen 235-123-1-1245-14 +always anlauf 235-123-16-124 shouldn't use the auf-contraction +before m always anleihe 235-123-146-125-15 Anleihemarkt shouldn't use the em-contraction +before m always film = +class egn egn +before egn begword anti 235-2345-24 +always antichrist 235-2345-24-1456-1235-24-23456 shouldn't use the ich-contraction +always anästh 235-345-234-2345-125 Anästhesie +begword armee 356-134-15-15 +word armeen 356-134-15-14 + +always augen 16-1245-14 shouldn't use the ge-contraction +always austausch 16-234-2345-16-156 shouldn't use the st-contraction +always beilstein 12-146-123-23456-1246 shouldn't use the bei-contraction +word bein 12-1246 shouldn't use the bei-contraction +word beine 12-1246-15 shouldn't use the bei-contraction +word beinen 12-1246-14 shouldn't use the bei-contraction +word beines 12-1246-123456 shouldn't use the bei-contraction +always bauform 12-16-124-26-134 shouldn't use the auf-contraction +always beteuer 23-2345-126-12456 shouldn't use the te-contraction +always beute 12-126-236 should use the eu-contraction +always beutel 12-126-2345-13456 should use the eu-contraction +always bssy 12-234-234-6-13456 shouldn't use the ss-contraction +always bundes 12-256-145-123456 shouldn't use the und-contraction +prfword chemikalie 1456-12356-24-13-25-24-15 +always donnerstag 145-135-1345-1345-12456-234-2345-1-1245 shouldn't use the st-contraction +before g always samstag = +endword stag = shouldn't use the st-contraction +endword stage 234-2345-1-12346 +endword stages 234-2345-1-1245-123456 +sufword eheinstitut 15-125-15-35-23456-24-2345-136-2345 +begword eheleu 15-125-15-123-126 +before g begword eherin 15-125-15-1235-35 Ehering(e) shouldn't use the er-contraction +midword ehilfs = Analysehilfsmittel shouldn't use the eh-contraction +always einter 15-35-2345-12456 shouldn't use the ein-contraction +midendword emethod = Analysemethode shouldn't use the eh-contraction +midendword enorm 15-1345-26-134 Aussprachenorm shouldn't use the en-contraction +always emuskel 15-134-136-234-13-13456 shouldn't use the em-contraction +always eschatolog 123456-1456-1-2345-135-123-135-1245 shouldn't use the sch-contraction +always esther 123456-2345-125-12456 shouldn't use the st-contraction +always ästhe 345-234-2345-125-15 ästhetisch +midendword erecht 15-1235-2345 +midendword ericht 15-2-3456 +always erepublik 15-1235-13 +midendword emädchen 15-134-345-145-1456-14 +midendword emaedchen 15-134-345-145-1456-14 +midendword emänn 15-5-134-1345 +midendword emaenn 15-5-134-1345 +midendword estand 15-2-23456 +midword estell 15-2-13456 +always found 124-135-256-145 Foundation shouldn't use the und-contraction +begword gänse = +word gänsen 1245-345-1345-234-14 +sufword gänserich 1245-345-1345-234-12456-3456 +always geben 12346-12-14 +always gebunden 12346-12-256-145-14 shouldn't use the und-contraction +always geier 1245-146-12456 should use the ei-contraction +always geil 1245-146-123 shouldn't use the ge-contraction +midendword geingang 1245-1246-1245-235-1245 +midendword geingän 1245-1246-1245-345-1345 +always gelungen 12346-123-256-1245-14 +always generat 1245-14-12456-1-2345 +always generier 1245-14-12456-346-1235 +always gerät 12346-1235-345-2345 should use the ge-contraction +always geraet 12346-1235-345-2345 should use the ge-contraction +always geräusch 12346-1235-34-156 should use the ge-contraction +always geraeusch 12346-1235-34-156 should use the ge-contraction +always gerecht 12346-1235-2345 +always gericht 12346-2-3456 +begword german 1245-12456-134-235 shouldn't use the ge-contraction +always gewiesen 12346-2456-346-234-14 shouldn't use the wie-contraction +prfword hallen 125-1-12345-14 shouldn't use the allen-contraction +always hauf 125-16-124 shouldn't use the auf-contraction +always hotel 125-135-2345-13456 shouldn't use the te-contraction +always installer 35-23456-1-12345-12456 shouldn't use the aller-contraction +always internet 35-2345-12456-1345-15-2345 shouldn't use the te-contraction +always interview 35-2345-12456-1236-24-15-2456 shouldn't use the ie-contraction +after st always ionstrieb 245-234-2345-1235-346-12 +after st always ionstrupp 245-234-2345-1235-136-1234-1234 +always jubel 245-136-12-13456 shouldn't use the be-contraction +always kaffee = +endword kaffees 13-1-124-124-15-123456 +always komponist 13-135-134-1234-135-1345-24-23456 shouldn't use the nis-contraction +always leselamp 123-123456-15-123-1-134-1234 shouldn't use the el-contraction +always liechtenstein 123-346-1456-2345-14-23456-1246 shouldn't use the te-contraction +prfword linie 123-35-24-15 shouldn't use the ie-contraction +always richtlini 2-3456-123-35-24 +prfword materie 134-1-2345-12456-24-15 shouldn't use the ie-contraction +always metallen 134-15-2345-1-12345-14 shouldn't use the allen-contraction +always regel 1235-15-1245-13456 +always release = shouldn't use the el-contraction +always roboter 1235-135-12-135-2345-12456 shouldn't use the te-contraction +always round 1235-135-256-145 shouldn't use the und-contraction +sufword rund 1235-256-145 shouldn't use the und-contraction +word räson = shouldn't use the so-contraction +always döschen 145-246-234-1456-14 shouldn't use the sch-contraction +always füsschen 124-1256-2346-1456-14 +always häschen 125-345-234-1456-14 shouldn't use the sch-contraction +always höschen 125-246-234-1456-14 should use the ch-contraction +always wollhöschen 2456-135-12345-125-246-234-1456-14 shouldn't use the woll-contraction +always küsschen 13-1256-2346-1456-14 shouldn't use the sch-contraction +always möschen 134-246-234-1456-14 should use the ch-contraction +word röschen 1235-246-234-1456-14 should use the ch-contraction +begword rosaro = shouldn't use the ar-contraction +midendword sammel 234-1-1346-13456 shouldn't use the sam-contraction +midendword samml 234-1-1346-123 shouldn't use the sam-contraction +endword schef 234-1456-15-124 +endword schefin 234-1456-15-124-35 +endword schefins 234-1456-15-124-35-234 +endword schefinnen 234-1456-15-124-35-1345-14 +endword schefs 234-1456-15-124-234 +endword eschef 123456-1456-15-124 +endword eschefin 123456-1456-15-124-35 +endword eschefins 123456-1456-15-124-35-234 +endword eschefinnen 123456-1456-15-124-35-1345-14 +endword eschefs 123456-1456-15-124-234 +always schueler 156-1256-123-12456 should use the ue-symbol +always schwung 156-2456-256-1245 shouldn't use the ung-contraction +always september 234-15-1234-2345-12356-12-12456 should use the em-contraction +always dezember 145-15-1356-12356-12-12456 shouldn't use the be-contraction +before s always sichts 234-3456-2345-234 Ansichtssache shouldn't use the ss-contraction +always silber 234-24-123-12-12456 shouldn't use the be-contraction +always sprung 234-1234-1235-256-1245 shouldn't use the ung-contraction +always ssitz 234-2-24 shouldn't use the ss-contraction +always ssonntag = +always sspiel 234-2-346 +always ssprach 234-234-1234 +always sstand 234-2-23456 +midendword stitel 234-2345-24-2345-13456 +always studien 23456-136-145-24-14 shouldn't use the ie-contraction +always stunde 23456-256-145-15 shouldn't use the und-contraction +always stunden 23456-256-145-14 +always esystem 15-234-6-13456-23456-12356 shouldn't use the es-contraction +always sturz 23456-136-1235-1356 Absturzursache shouldn't use the zu-contraction +always tagesstät 2345-1-1245-123456-23456-345-2345 shouldn't use the ss-contraction +always tagesstaet 2345-1-1245-123456-23456-345-2345 shouldn't use the ss-contraction +always team = shouldn't use the te-contraction +midendword termin 2345-12456-134-35 shouldn't use the te-contraction +always wagen 2456-1-1245-14 shouldn't use the ge-contraction +always weiber 2456-146-12-12456 shouldn't use the be-contraction +sufword verbund 36-12-256-145 shouldn't use the und-contraction +midendword verbund 1236-12456-12-256-145 shouldn't use the und-contraction +midword versamm 1236-12456-234-1-1346 shouldn't use the sam-contraction +always viertel 1236-346-1235-2345-13456 shouldn't use the te-contraction +before g always zeitsta 1356-2345-234-2345-1 +begword zion = zionist shouldn't use the nis-contraction +always zugantenn 1356-136-1245-235-2345-14-1345 +always zweiseit 1356-2456-146-234-146-2345 +always zweistaat 1356-2456-146-23456-2345 shouldn't use the weis-contraction + +midendword heitstätig 125-234-2345-345-2345-45 gelegenheitstätigkeit shouldn't use the st-contraction +begmidword admiral 1-145-134-24-1235-25 +begmidword astral 1-23456-1235-25 +before m sufword atom = +begmidword bifokal 12-24-124-135-13-25 +#begmidword brachial 12-1235-56-24-25 +begmidword bronchial 12-1235-135-1345-1456-24-25 bronchiallymphknoten shouldn't use the ll-contraction +begword general 1245-14-12456-25 +begmidword kolonial 13-135-123-135-1345-24-25 +begmidword zentral 1356-14-2345-1235-25 zentrallager +always schall 156-1-12345 schallen shouldn't use the allen-contraction +always herzultra 125-12456-1356-136-123-2345-1235-1 shouldn't use the zu-contraction +always mittagessen 134-24-2345-2345-1-1245-15-2346-14 +always snakeskin 234-1345-1-13-15-234-13-35 + +# countries +always dänemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction +always daenemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction + +# names +word angela 235-1245-13456-1 shouldn't use the ge-contraction +word angeles 235-1245-13456-123456 shouldn't use the ge-contraction +word angelika 235-1245-13456-24-13-1 shouldn't use the ge-contraction +word angelina 235-1245-13456-35-1 shouldn't use the ge-contraction +word angelo 235-1245-13456-135 shouldn't use the ge-contraction +always daniel 145-235-24-13456 shouldn't use the ie-contraction +always gerlind 1245-12456-123-35-145 should use the er-contraction +always solveig 234-135-123-1235-146-1245 shouldn't use the so-contraction + +# TODO: +# 8-Punkte-Plan + +# inline contraction of emoji descriptions +cldr de diff --git a/brltty/Contraction/de-kurzschrift-wort.cti b/brltty/Contraction/de-kurzschrift-wort.cti new file mode 100644 index 0000000..ca1eb7f --- /dev/null +++ b/brltty/Contraction/de-kurzschrift-wort.cti @@ -0,0 +1,360 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# BRLTTY Contraction Subtable - German (contracted) + +always aldehyd 25-145-15-125-6-13456-145 +sufword alpha 25-1234-125-1 +always arhythm = + +before hilmnrsu always aufnahme 2-16-1345-134-15 +prfword aufnahmen 2-16-1345-134-14 + +before e always ablöse = +always absolvent 1-12-234-135-123-1236-14-2345 +begmidword anachron 235-1-1456-1235-135-1345 +always analyse 235-25-6-13456-234-15 +prfword analysen 235-25-6-13456-234-14 +always analysenauf 235-25-6-13456-234-14-2-16 +always analysenergeb 235-25-6-13456-234-14-12456-12346-12 +before konsonant always analysen 235-25-6-13456-234-14 +always arthrose 356-2345-125-1235-135-234-15 +prfword arthrosen 356-2345-125-1235-135-234-14 +always ägypten 345-1245-6-13456-1234-2345-14 shouldn't use the te-contraction +always aegypten 345-1245-6-13456-1234-2345-14 +always aufgaben 2-16-1245-1-12-14 +prfword bachelor 12-1-1456-13456-135-1235 +begmidword bachelor 12-1-1456-13456-26 + +word beat = +always beatbox = +always beatmusik 12-15-1-2345-134-13 +always beatnik = +always backbeat 12-1-46-12-15-1-2345 +word offbeat = Sauerstoffbeatmung +always popbeat = +always rockbeat 1235-135-46-12-15-1-2345 + +always befund 23-124-256-145 +always beicht 12-146-1456-2345 +prfword beichte 12-146-1456-236 +prfword beichtest 12-146-1456-236-23456 +prfword beichtet 12-146-1456-236-2345 +prfword beichtete 12-146-1456-236-236 +prfword gebeichtetem 12346-12-146-1456-236-2345-12356 +prfword beichteten 12-146-1456-236-2345-14 +prfword gebeichteter 12346-12-146-1456-236-2345-12456 +prfword gebeichtetes 12346-12-146-1456-236-2345-123456 +prfword beichtetest 12-146-1456-236-236-23456 +prfword beichtetet 12-146-1456-236-236-2345 +endword betrieben 23-2345-1235-346-12-14 +always blaubeer 12-123-16-12-15-15-1235 +always brombeer = +prfword bund 12-256-145 +always burgunder 12-136-1235-1245-256-145-12456 +#always cranberry 6-14-1235-235-23-1235-1235-6-13456 +always dealer 145-15-1-123-12456 +always dehydr = +always diagnose = +prfword diagnosen 145-24-1-1245-1345-135-234-14 +before konsonant always diagnosen 145-24-1-1245-1345-135-234-14 +always diamant 145-24-1-134-235-2345 +before e always einreise 1246-1235-146-234-15 +always eisstau 146-234-23456-16 eisstau eisstaub gleisstaub +always erpresser 12456-1234-1235-15-2346-12456 +always estragon 123456-2345-1235-1-1245-135-1345 # trag? +always europa 126-1235-135-1234-1 +midendword expresses 15-6-1346-1234-1235-15-2346-123456 +word expresses 1346-1234-1235-15-2346-123456 +sufword gamma 1245-1-1346-1 +before hilmnrsu always gebäude 12346-12-34-145-15 +prfword gebäuden 12346-12-34-145-14 +prfword gebäudes 12346-12-34-145-123456 +before hilmnrsu always gebinde 12346-12-35-145-15 +prfword gebinden 12346-12-35-145-14 +prfword gebindes 12346-12-35-145-123456 +sufword gehäuse 12346-125-34-234-15 +prfword gehäusen 12346-125-34-234-14 +prfword gehäuses 12346-125-34-234-123456 +always gesund 12346-234-256-145 +before hilmnrsu always gewinde 12346-2456-35-145-15 +always gewindelt 12346-2456-35-145-13456-2345 +always gewindelte 12346-2456-35-145-13456-236 +always gewindeltem 12346-2456-35-145-13456-2345-12356 +always gewindelten 12346-2456-35-145-13456-2345-14 +always gewindelter 12346-2456-35-145-13456-2345-12456 +always gewindeltes 12346-2456-35-145-13456-2345-123456 +prfword gewinden 12346-2456-35-145-14 +prfword gewindes 12346-2456-35-145-123456 +word Gewindeschaft 12346-2456-35-145-15-156-1-124-2345 +before hilmnrsu always gemeinde 12346-134-1246-145-15 gemeinderat shouldn't use the er-contraction + +before hilmnrsu always gelatine 12346-123-1-2345-35-15 +prfword gelatinen 12346-123-1-2345-35-14 + +prfword gemeinden 12346-134-1246-145-14 +prfword gemeindend 12346-134-1246-145-14-145 +prfword gemeindende 12346-134-1246-145-14-145-15 +prfword gemeindendem 12346-134-1246-145-14-145-12356 +prfword gemeindenden 12346-134-1246-145-14-145-14 +prfword gemeindender 12346-134-1246-145-14-145-12456 +prfword gemeindendes 12346-134-1246-145-14-145-123456 +always gemeindeutsch 12346-134-1246-145-156 +always gemüse 12346-134-1256-234-15 +prfword gemüsen 12346-134-1256-234-14 +prfword gemüses 12346-134-1256-234-123456 +always getreide 12346-2345-1235-146-145-15 +prfword getreiden 12346-2345-1235-146-145-14 +prfword getreides 12346-2345-1235-146-145-123456 +always gorgonzola 1245-26-1245-135-1345-1356-135-123-1 +sufword gottes 1245-135-2345-2345-123456 +always gottesdienst 1245-135-2345-2345-123456-145-346-1345-23456 +always glucose = +always glukose = +before t always habich 125-1-12-3456 +prfword haie = +always haustier 125-16-234-2345-346-1235 +always health = +always heidelbeer 125-146-145-13456-12-15-15-1235 +before t always hilfs = +prfword hilfst 125-24-123-124-23456 +always himbeer = +sufword hirse = +sufword holunder 125-135-123-256-145-12456 +sufword holunderbeer 125-135-123-256-145-12456-12-15-15-1235 +always hypnose = +prfword hypnosen 125-6-13456-1234-1345-135-234-14 +always infanterie 35-124-235-2345-12456-346 +prfword infanterien 35-124-235-2345-12456-24-14 +prfword imitat = +always johannis 245-135-125-235-1345-24-234 +always johannisbeer 245-135-125-235-1345-24-234-12-15-15-1235 +before lnr always kamera 13-1-134-12456-1 +before konsonant always kameral 13-1-134-12456-25 +always kameralia 13-1-134-12456-25-24-1 +always kameralismus 13-1-134-12456-25-5-24 +always kameralist 13-1-134-12456-25-24-23456 +always kameralistisch 13-1-134-12456-25-5-156 +before hilmnrsu always karriere 13-356-1235-24-12456-15 +prfword karrieren 13-356-1235-24-12456-14 +always klasse 13-123-1-2346-15 +always klassen 13-123-1-2346-14 +always koriander 13-135-1235-24-235-145-12456 +always kurzbein 13-1356-12-146-1345 +prfword kurzeit 13-136-1235-1356-146-2345 +prfword kurzeiten 13-136-1235-1356-146-2345-14 +always kurzentren 13-136-1235-1356-14-2345-1235-14 +always kurzentrum 13-136-1235-1356-14-2345-1235-136-134 +prfword kurzelle 13-136-1235-1356-15-12345-15 +prfword kurzellen 13-136-1235-1356-15-12345-14 +always kurzhaar 13-1356-125-1-1-1235 +always laufwerk 123-16-124-2456-12456-13 +always leiterin 123-146-2345-12456-35 +always limit = +always lipizzaner 123-24-1234-24-1356-1356-235-12456 + +always mantel 134-235-2345-13456 + +before hilmnrsu always marine 134-356-35-15 +prfword marinem 134-356-35-12356 +prfword marinen 134-356-35-14 +prfword mariner 134-356-35-12456 +prfword marines 134-356-35-123456 +# people from san-marino +prfword marinese 134-356-35-123456-15 +prfword marinesin 134-356-35-123456-35 +prfword marinesinnen 134-356-35-123456-35-1345-14 +prfword marinesisch 134-356-35-123456-24-156 +prfword marinesische 134-356-35-123456-24-156-15 +prfword marinesischem 134-356-35-123456-24-156-12356 +prfword marinesischen 134-356-35-123456-24-156-14 +prfword marinesischer 134-356-35-123456-24-156-12456 +prfword marinesisches 134-356-35-123456-24-156-123456 + +always matura = +always maturant 134-1-2345-136-1235-235-2345 + +before s always mess 134-15-2346 + +prfword mitte 134-24-2345-236 +prfword mitten 134-24-2345-2345-14 +prfword moore = +prfword mooren 134-135-135-1235-14 +prfword moores 134-135-135-1235-123456 +always nappaleder 1345-1-1234-1234-1-123-15-145-12456 +begword neuro 1345-126-1235-135 +always olympia = + +prfword orgie 26-1245-24-15 +prfword orgien 26-1245-24-14 + +sufword orts 26-2345-234 +always ortschaft 26-2345-156 +always ortstein 26-2345-23456-1246 + +always papagei 1234-1-1234-1-1245-146 +always paprika = +always pestorahm 1234-15-23456-135-1235-1-125-134 +before lnr always pizza = +always preiselbeer 1234-1235-146-234-13456-12-15-15-1235 +before hilmnrsu always presse 1234-1235-15-2346-15 +prfword pressen 1234-1235-15-2346-14 +prfword pressend 1234-1235-15-2346-14-145 +prfword pressende 1234-1235-15-2346-14-145-15 +prfword pressendem 1234-1235-15-2346-14-145-12356 +prfword pressenden 1234-1235-15-2346-14-145-14 +prfword pressender 1234-1235-15-2346-14-145-12456 +prfword pressendes 1234-1235-15-2346-14-145-123456 +always pressendruck 1234-1235-15-2346-14-145-46 +prfword pressens 1234-1235-15-2346-14-234 +always pressentisch 1234-1235-15-2346-14-2345-24-156 +always rastalock 1235-1-23456-1-123-135-46 +before e always reise 1235-146-234-15 +always requiem 1235-15-6-12345-24-12356 + +before hilmnrsu always reserve 1235-123456-12456-1236-15 +prfword reserven 1235-123456-12456-1236-14 + +always rhabarber 1235-125-1-12-1-1235-12-12456 +prfword runde 1235-256-145-15 +prfword runden 1235-256-145-14 +sufword sahne = +always sahnemeer = +always salbei 234-25-12-146 +sufword sauf 234-16-124 + +always sample = +prfword samplen 234-1-134-1234-123-14 +prfword sampler 234-1-134-1234-123-12456 +always samplermodul 234-1-134-1234-123-12456-134-135-145-136-123 +prfword samplern 234-1-134-1234-123-12456-1345 +prfword samplers 234-1-134-1234-123-12456-234 +prfword samples 234-1-134-1234-123-123456 + +midendword samt = +before l always sauna 234-16-1345-1 +prfword solos = +prfword soli = +before l always schul 156-136-123 +always schulter 156-136-123-2345-12456 shouldn't use the te-contraction +always schultragödie 156-136-123-2345-1235-1-1245-246-145-24-15 +always schultragödien 156-136-123-2345-1235-1-1245-246-145-24-14 +always schultrans 156-136-123-2345-1235-235-234 schultransport +before hilmnrsu always see = +sufword solar 234-135-123-356 +prfword soße = +prfword soßen 234-135-6-2346-14 +always sound = +always soundso 2-1234-2-136-2-1234 +before e always speise 234-1234-146-234-15 +always tabasco = +always teacher 2345-15-1-1456-12456 +always teaching 2345-15-1-1456-35-1245 +before l always teil 2345-146-123 +before hilmnrsu always teilnahme 2345-146-123-1345-134-15 +prfword teilnahmen 2345-146-123-1345-134-14 +always temperatur 2345-12356-1234-12456-1-2345-136-1235 prefer em-contraction over te-contraction +always tempo 2345-12356-1234-135 +prfword temporal 2345-12356-1234-26-1-123 +begmidword temporal 2345-12356-1234-26-25 +always temporär 2345-12356-1234-26-345-1235 +word tempore 2345-12356-1234-26-15 +always theater 2345-125-15-1-2345-12456 shouldn't use the te-contraction +always tuberkulose 2345-136-12-12456-13-136-123-135-234-15 +prfword tuberkulosen 2345-136-12-12456-13-136-123-135-234-14 +before lnr always tundra 2345-256-145-1235-1 +sufword ultra = +always vegetarier 1236-15-12346-2345-356-24-12456 +before l always vokal 1236-135-13-25 +always völkerkunde 5-1236-13-12456-13-256-145-15 +always wachstum 2456-56-234-2345-136-134 +always wachstums 2456-56-234-2345-136-134-234 + +before lnr always yoga = +always ziegel 1356-346-1245-13456 shouldn't use the ge-contraction +always zugbegleiter 1356-136-1245-23-1245-123-146-2345-12456 +always zugkraft 1356-136-1245-13-124 +always zugkräft 1356-136-1245-5-13-124 +word zugmitte 1356-136-1245-134-24-2345-236 +always zugtempo 1356-136-1245-2345-12356-1234-135 +always zwilling 1356-2456-24-12345-35-1245 +prfword zwillinge 1356-2456-24-12345-35-12346 +before konsonant always zwillings 1356-2456-24-12345-35-1245-234 +always zypressen 1356-6-13456-1234-1235-15-2346-14 + +# Doppelvokale +always erdbeer 12456-145-12-15-15-1235 +always waldbeer 2456-25-145-12-15-15-1235 +always zwergerdbeer 1356-2456-12456-1245-12456-145-12-15-15-1235 +always frisbee 124-1235-24-234-12-15-15 +always kaffee = +always coffee 6-14-135-124-124-15-15 +always toffee 2345-135-124-124-15-15 +always dragee = +always bungee 12-256-1245-15-15 +always dorothee 145-26-135-2345-125-15-15 +always cheese 1456-15-15-234-15 +always pappmaschee 1234-1-1234-1234-134-1-156-15-15 +always klischee 13-123-24-156-15-15 +always yankee 6-13456-235-13-15-15 +sufword teenie 2345-15-15-1345-346 +sufword teenager 2345-15-15-1345-1-1245-12456 +always gelee 1245-13456-15-15 +prfword geleerte 12346-123-15-15-1235-236 +always geleert 12346-123-15-15-1235-2345 + +always soufflee = +always defilee 145-15-124-24-123-15-15 +always klee = +begword tee = +always renommee 1235-14-135-1346-15-15 +always armee 356-134-15-15 +always resümee 1235-123456-1256-134-15-15 +always schnee 156-1345-15-15 +always trainee 2345-1235-1-24-1345-15-15 +always pralinee 1234-1235-1-123-35-15-15 +always portmonee 1234-26-2345-134-135-1345-15-15 +always kanapee 13-235-1-1234-15-15 +always portepee 1234-26-236-1234-15-15 +always separee 234-15-1234-356-15-15 +always referee 1235-15-124-12456-15-15 +always schikoree 156-24-13-26-15-15 +always spree 234-1234-1235-15-15 +always karree 13-356-1235-15-15 +always porree 1234-26-1235-15-15 +always püree 1234-1256-1235-15-15 +always frikassee 124-1235-24-13-1-2346-15-15 +always plissee 1234-123-24-2346-15-15 +always varietee 1236-356-24-15-2345-15-15 +always komitee = +always trustee 2345-1235-136-23456-15-15 +always frottee 124-1235-135-2345-2345-15-15 +always queen = +always halloween 125-1-12345-135-2456-15-15-1345 + +always hawaii = +always ascii = + +always boom = +always voodoo = +always yahoo = +always waterloo 2456-1-2345-12456-123-135-135 +always shampoo = +always tattoo = +always daewoo = +always zoo = diff --git a/brltty/Contraction/de-kurzschrift.ctb b/brltty/Contraction/de-kurzschrift.ctb index e9bf2e4..aa91704 100644 --- a/brltty/Contraction/de-kurzschrift.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,1472 +11,12 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### -# BRLTTY Contraction Table - German (contracted - 1998 standard) -# Created by Mario Lang . +# BRLTTY Contraction Table - German (contracted) -include de-vollschrift.ctb +include de-kurzschrift-1998.ctb -# Ausnahmen für Vokalgruppen aus de-vollschrift.ctb -always barrier 12-356-1235-24-12456 shouldn't use the ie-contraction -always bankier 12-235-13-24-12456 shouldn't use the ie-contraction -midendword iell 24-15-12345 shouldn't use the ie-contraction -always indien 35-145-24-14 shouldn't use the ie-contraction -always medien 134-15-145-24-14 shouldn't use the ie-contraction -always propriet 12345-1234-1235-24-15-2345 proprietär shouldn't use the ie-contraction - -class e e -class g g -class h h -class m m -class n n -class r r -class st st -class konsonant bcdfghjklmnpqrstvwxyz - -# Due to their low usage frequency in typical german text the letters -# c, q, x and y are reused for the en-, ll-, ex/mm/nis- and el-contractions. -# Therefore they need a proceding letsign to disambiguate them. -always c 6-14 -always C 6-14 -always q 6-12345 -always Q 6-12345 -always x 6-1346 -always X 6-1346 -always y 6-13456 -always Y 6-13456 - -# Lautgruppenkürzungen -midendword ach 56 -begmidword al 25 -begmidword : 6-25 -begmidword an 235 -begmidword ar 356 -begmidword be 23 -before g always beu 12-126 -always bell 23-12345 tabelle should use the ll-contraction -midendword ck 46 -midword eh 2356 -before h always kohle = -before m always kohle = -always ein 1246 -always lateinisch 123-1-2345-1246-1345-24-156 -always el 13456 -begmidword elineal 15-123-35-15-25 -endword elineal 15-123-35-15-1-123 -always eleist 15-123-146-23456 -always em 12356 -always emach 15-134-56 -before e always emachs 12356-56-234 Systemachse -always en 14 -always denunz 145-15-1345-256-1356 shouldn't use the en-contraction -always er 12456 -always dereferenzier 145-15-1235-15-124-12456-14-1356-346-1235 shouldn't use the er-contraction -always deregulier 145-15-1235-15-1245-136-123-346-1235 shouldn't use the er-contraction -always es 123456 -always ge 12346 -prfword gehe 1245-2356-15 -prfword gehen 1245-2356-14 -prfword gehend 1245-2356-14-145 -prfword gehende 1245-2356-14-145-15 -prfword gehendem 1245-2356-14-145-12356 -prfword gehenden 1245-2356-14-145-14 -prfword gehender 1245-2356-14-145-12456 -prfword gehendes 1245-2356-14-145-123456 -before konsonant always geh 1245-2356 -before konsonant always bel 12-13456 Übelkeit shouldn't use the be-contraction -word bel 12-13456 -before konsonant always bem 12-12356 -before konsonant always ben 12-14 -before konsonant always ber 12-12456 -before konsonant always gel 1245-13456 klingelton shouldn't use the ge-contraction -before konsonant always gen 1245-14 -before konsonant always ten 2345-14 -before konsonant always ter 2345-12456 -midendword ich 3456 -midendword ig 45 -always in 35 -midendword lich 456 -begword see = -begword neusee 1345-126-234-15-15 -before konsonant always seen 234-15-14 -word seele 234-15-13456-15 -sufword seelen 234-15-13456-14 -always seelisch 234-15-13456-24-156 -begword tee = -word teer 2345-15-12456 -sufword teerartig 2345-15-12456-356-2345-45 -before konsonant begword teer 2345-15-12456 -word teere 2345-15-12456-15 -word teeren 2345-15-12456-14 -word teerend 2345-15-12456-14-145 -word teerende 2345-15-12456-14-145-15 -word teerendem 2345-15-12456-14-145-12356 -word teerenden 2345-15-12456-14-145-14 -word teerender 2345-15-12456-14-145-12456 -word teerendes 2345-15-12456-14-145-123456 -word teerung 2345-15-12456-136 -word teerungen 2345-15-12456-136-14 -sufword teenager 2345-15-14-1-1245-12456 -sufword teenie 2345-15-14-346 -always teelich 2345-15-15-456 shouldn't use the el-contraction -always teelöffel 2345-15-15-123-246-124-124-13456 shouldn't use the el-contraction -always teemaschin 2345-15-15-134-156 shouldn't use the em-contraction -always teesieb 2345-15-15-234-346-12 shouldn't use the es-contraction -midendword ll 12345 -always holland 125-135-123-123-235-145 shouldn't use the ll-contraction -always holländer 125-135-123-123-345-1345-145-12456 shouldn't use the ll-contraction -always hollaender 125-135-123-123-345-1345-145-12456 shouldn't use the ll-contraction -midendword mm 1346 -always wurm = wurmmittel shouldn't use the mm-contraction -begmidword or 26 - -always schaos 234-1456-1-135-234 -after konsonant midword ss = -after konsonant midendword ssatz 234-234-1356 -after konsonant midendword ssätz 234-5-234-1356 -after konsonant midendword ssaetz 234-5-234-1356 -after konsonant midword ssch 234-156 -always sschicht 234-156-3456-2345 -always sschlag 234-156-1245 -always sschläg 234-5-156-1245 -always sschlaeg 234-5-156-1245 -always sschließ 234-156-2346 -always sschmuck 234-156-134-136-46 -always sschnur 234-156-1345-136-1235 shouldn't use the nur-contraction -always sschool 234-234-1456-135-135-123 foreign word, sch-contraction not allowed -always sschreib 234-156-12 -always sschrieb 234-2-156 -always sschrift 234-156-2345 -always sschwierig 234-156-45 -always sselbst 234-234-23456 -always sselbständ 234-234-13456-12-5-23456 shouldn't use the selbst-contraction -always sselbstaend 234-234-13456-12-5-23456 shouldn't use the selbst-contraction -after konsonant always ssetz 234-2-15 -after konsonant midendword ssesam 234-234-123456-1-134 shouldn't use the sam-contraction -after konsonant always ssitz 234-2-24 -always ssolch 234-234-1456 -after konsonant midendword ssoll 234-2-234 -always ssondern 234-234-1345 -always ssozial 234-234-123 -always espiel 15-2-346 -always sspiel 234-2-346 -always esprach 15-234-1234 -always ssprach 234-234-1234 -always sspräch 234-5-234-1234 -always sspraech 234-5-234-1234 -always esprech 15-2-2346 -always ssprech 234-2-2346 -after konsonant midendword sst 234-23456 -always sstaat 234-23456-2345 -after konsonant midendword sstand 234-2-23456 -after konsonant midendword sständ 234-5-23456 -after konsonant midendword sstaend 234-5-23456 -after konsonant midendword sstell 234-2-13456 -always ssteiger 234-23456-146-1245-12456 -before e always sstund 234-23456-256-145 shouldn't use the und-contraction -midendword ss 2346 - -midendword te 236 -sufword atem 1-2345-12356 shouldn't use the te-contraction -always un 256 - -midendword tei 2345-146 - -always all 1-12345 -always ell 15-12345 -always emm 15-1346 -always esch 15-156 -always ess 15-2346 -always est 15-23456 - -endword tel 2345-13456 -endword teln 2345-13456-1345 -endword tels 2345-13456-234 -endword tem 2345-12356 -endword tene 2345-14-15 -always tten 2345-2345-14 shouldn't use the te-contraction -always tter 2345-2345-12456 shouldn't use the te-contraction -always daten 145-1-2345-14 -always karten 13-356-2345-14 -endword tenem 2345-14-12356 -endword tenen 2345-14-14 -endword tener 2345-14-12456 -endword tenes 2345-14-123456 -endword tens 2345-14-234 -endword ter 2345-12456 -endword tere 2345-12456-15 -endword terem 2345-12456-12356 -endword teren 2345-12456-14 -endword teres 2345-12456-123456 -endword ters 2345-12456-234 -always liter 123-24-2345-12456 -endword tern 2345-12456-1345 -endword tes 2345-123456 - -endword bel 12-13456 shouldn't use the be-contraction -endword beln 12-13456-1345 shouldn't use the be-contraction -endword belns 12-13456-1345-234 shouldn't use the be-contraction -endword bels 12-13456-234 shouldn't use the be-contraction -midword belläng 12-13456-5-123-1245 kabellänge shouldn't use the ll-contraction -midword bellaeng 12-13456-5-123-1245 -midendword belung 12-13456-136 -before st midendword belungs 12-13456-136-234 -always belveder 12-13456-1236-15-145-12456 shouldn't use the be-contraction -always wirbel 2456-24-1235-12-13456 shouldn't use the be-contraction -endword ben 12-14 shouldn't use the be-contraction -endword bend 12-14-145 shouldn't use the be-contraction -endword bende 12-14-145-15 shouldn't use the be-contraction -endword bendem 12-14-145-12356 shouldn't use the be-contraction -endword benden 12-14-145-14 shouldn't use the be-contraction -endword bender 12-14-145-12456 shouldn't use the be-contraction -endword bendes 12-14-145-123456 shouldn't use the be-contraction -endword benem 12-14-12356 shouldn't use the be-contraction -endword benen 12-14-14 shouldn't use the be-contraction -endword bens 12-14-234 shouldn't use the be-contraction -endword ber 12-12456 shouldn't use the be-contraction -endword berei 12-12456-146 shouldn't use the be-contraction -endword bereien 12-12456-146-14 shouldn't use the be-contraction -endword berin 12-12456-35 shouldn't use the be-contraction -endword berinnen 12-12456-35-1345-14 shouldn't use the be-contraction -endword bern 12-12456-1345 shouldn't use the be-contraction -endword bers 12-12456-234 shouldn't use the be-contraction -always ober 135-12-12456 shouldn't use the be-contraction -endword bes 12-123456 shouldn't use the be-contraction - -always begeh 23-1245-2356 shouldn't use the ge-contraction -always getriebegehäus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction -always getriebegehaeus 12346-2345-1235-346-23-12346-125-34-234 shouldn't use the eh-contraction -always umgeht 136-134-1245-2356-2345 shouldn't use the ge-contraction -always geig 1245-146-1245 should use the ei-contraction -always geisel 1245-146-234-13456 shouldn't use the ge-contraction -always geist 1245-146-23456 -prfword gel 1245-13456 shouldn't use the ge-contraction -midendword gelhaft 1245-13456-125-124 -midword gelläng 1245-13456-5-123-1245 -midword gellaeng 1245-13456-5-123-1245 -prfword geln 1245-13456-1345 -prfword gelns 1245-13456-1345-234 -prfword gels 1245-13456-234 -midendword gelung 1245-13456-136 -before st midendword gelungs 1245-13456-136-234 -prfword gen 1245-14 shouldn't use the ge-contraction -midendword gend 1245-14-145 shouldn't use the ge-contraction -endword gens 1245-14-234 shouldn't use the ge-contraction -midendword ger 1245-12456 should use er-contraction if not part of a word intro -before r begword abge 1-12-12346 -before r begword ange 235-12346 -word anger 235-1245-12456 -word angern 235-1245-12456-1345 -word angers 235-1245-12456-234 -begword unange 256-235-12346 -begmidword aufger 2-16-12346-1235 -begmidword ausger 34-12346-1235 -before r begmidword einge 1246-12346 -begword unger 256-12346-1235 -sufword ungerecht 256-12346-1235-2345 -sufword zuge 2-1356-12346 -endword ges 1245-123456 shouldn't use the ge-contraction -midendword ien 24-14 shouldn't use the ie-contraction -always erschien 12456-156-346-1345 -prfword industrien 35-145-136-23456-1235-15-14 -before n always industrie 35-145-136-23456-1235-346 industrienation shouldn't use the en-contraction -begmidword anomal 235-135-134-25 shouldn't use the mal-contraction -endword anomal 235-135-134-1-123 shouldn't use the mal-contraction -midendword iene 346-1345-15 should use the ie-contraction -midendword ienen 346-1345-14 should use the ie-contraction -endword tel 2345-13456 should use the el-contraction -endword ten 2345-14 should use the en-contraction -endword ter 2345-12456 should use the er-contraction -endword tes 2345-123456 should use the es-contraction -always trigraph = shouldn't use the ig-contraction - -# Vorsilbenkürzungen -begword aus 34 -begword ent 2346 -word enter 14-2345-12456 shouldn't use the ent-contraction -begword ex 1346 -begword pro 12345 -begword ver 36 -word verb 1236-12456-12 -word vers 1236-12456-234 - -begword auspiz 16-234-1234-24-1356 shouldn't use the aus-contraction -word ente 14-236 shouldn't use the ent-contraction -sufword enten 14-2345-14 shouldn't use the ent-contraction -word entchen 14-2345-1456-14 -begword veranda 1236-12456-236-145-1 shouldn't use the ver-contraction -begword vertikal 1236-12456-2345-24-13-25 shouldn't use the ver-contraction -word vertikal 1236-12456-2345-24-13-1-123 shouldn't use the ver-contraction - -# Nachsilbenkürzungen -endword falls 124 -midendword heit 125 -before s midword heits 125-234 -midendword keit 13 -before s midword keits 13-234 -midendword mal 134 -sufword gemal 12346-134-25 gemalt shouldn't use the mal-contraction -midendword nis 1346 -always nisier 1345-24-234-346-1235 technisierung shouldn't use -nis -midendword sam 2346 -sufword bisam = -always bischofsamt 12-24-156-135-124-234-1-134-2345 shouldn't use the sam-contraction -midendword schaft 156 -midendword ung 136 -always dschungel 6-145-156-256-1245-13456 shouldn't use the ung-contraction -midendword terung 2345-12456-136 -before cst midword ungs 136-234 Bindungscharakter, Regierungschef -midendword wärts 2456 - -midendword ation 5-1345 -always industrienation 35-145-136-23456-1235-346-1345-5-1345 -before s midword ations 5-1345-234 -midendword ativ 5-1236 -after st always ion 245 -always religion 1235-13456-45-245 -after st before s always ions 245-234 -endword ismus 5-24 -midendword istisch 5-156 -endword nismus 1345-5-24 shouldn't use the nis-contraction -midendword nistisch 1345-5-156 -midendword ität 5-345 -midendword itaet 5-345 -before s midword itäts 5-345-234 -before s midword itaets 5-345-234 -midendword mität 134-5-345 shouldn't use the mit-contraction - -sufword anis 235-24-234 shouldn't use the nis-contraction -before st midword ations 5-1345-234 -sufword barschaft 12-356-156-1-124-2345 shouldn't use the shaft-contraction -always blumensamen 12-123-136-134-14-234-1-134-14 shouldn't use the sam-contraction -prfword dezimal = if we use the mal-contraction here, we get a new word dezim -begmidword dezimal 145-15-1356-24-134-25 -sufword small 234-134-1-12345 shouldn't use the mal-contraction -word beaufort 12-15-16-124-26-2345 shouldn't use the auf-contraction -sufword erheiter 12456-125-146-2345-12456 shouldn't use the heit-contraction -prfword formal 124-26-134-1-123 shouldn't use the mal-contraction -begword formal 124-26-134-25 shouldn't use the mal-contraction -word firnis = shouldn't use the nis-contraction -begword gesam 12346-234-1-134 shouldn't use the sam-contraction -always herrschaft 1235-1235-156-1-124-2345 can not use the shaft-contraction -always hoheit 125-135-125-146-2345 shouldn't use the heit-contraction -always kuhdung 13-136-125-145-256-1245 shouldn't use the ung-contraction -always hunger 125-256-1245-12456 shouldn't use the ung-contraction -before g begword lun 123-256 shouldn't use the ung-contraction -prfword maximal = shouldn't use the mal-contraction -begmidword maximal 134-1-6-1346-24-134-25 shouldn't use the mal-contraction -always tennis 2345-14-1345-24-234 shouldn't use the nis-contraction -midendword ungscharakter 136-234-1456-13 -before st midendword ungs 136-234 shouldn't use the ss/st-contraction -midendword zung 1356-136 auseinandersetzung shouldn't use the zu-contraction -begword zung 1356-256-1245 shouldn't use the ung-contraction - -# Einformige Kürzungen, nur alleinstehend -word als 146 -word auch 34 -word eu = -word das 145 -word dass 2346 -word den 15 -word der 1235 -word des 3 -word die 346 -word ihm 236 -word im 36 not allowed when used in hyphenated words like Hans-im-Glück-Gefühl -after letter literal -im- -word ist 23456 -word kann 13 -word lässt 123 -word laesst 123 -word man 134 -word oder 135 -word schon 156 -word sich 14 -word sie 234 -word was 2456 - -# Einformige Kürzungen, alleinstehend oder in Wortverbindungen -word aber 1 -begword aber 2-1 -word auf 16 -always auf 2-16 -sufword aufbrauch 16-2-34 -sufword aufeinander 16-2-1246 -sufword auffahr 16-2-1235 -sufword aufhab 16-2-125 -sufword auflass 16-2-123 -sufword aufricht 16-2-3456 -sufword aufschrieb 16-2-156 -sufword aufsetz 16-2-15 -sufword aufsitz 16-2-24 -sufword aufspiel 16-2-346 -sufword aufstand 16-2-23456 -sufword aufständ 16-5-23456 -sufword aufstell 16-2-13456 -sufword aufweis 16-2-146 -before g always aufwie 2-16-2456-346 aufwiegeln/aufwiegler/aufwiegst shouldn't use the wie-contraction -before s always aufwie 2-16-2456-346 -sufword aufzu 16-2-1356 -begword aufzuck 2-16-1356-136-46 -before konsonant always aufzug 2-16-1356-136-1245 -always aufzugsturm 2-16-1356-136-1245-234-2345-136-1235-134 shouldn't use zu-contraction and st-contraction -before m always aufzugstür 2-16-1356-136-1245-234-2345-1256-1235 shouldn't use zu-contraction and st-contraction -always aufzugstür 2-16-1356-136-1245-234-2345-1256-1235 shouldn't use zu-contraction and st-contraction -prfword lauf 123-16-124 -prfword laufe 123-16-124-15 -prfword laufen 123-16-124-14 -prfword laufend 123-16-124-14-145 -prfword laufende 123-16-124-14-145-15 -prfword laufendem 123-16-124-14-145-12356 -prfword laufenden 123-16-124-14-145-14 -prfword laufender 123-16-124-14-145-12456 -prfword laufendes 123-16-124-14-145-123456 -prfword laufens 123-16-124-14-234 -prfword laufes 123-16-124-123456 -prfword laufs 123-16-124-234 -prfword laufst 123-16-124-23456 -prfword lauft 123-16-124-2345 -always schlauf 156-123-16-124 shouldn't use the auf-contraction -always abgelauf 1-12-12346-123-16-124 -always akkulauf 1-13-13-136-123-16-124 -always auflauf 2-16-123-16-124 -always durchlauf 2-1456-123-16-124 -begword verlauf 36-123-16-124 shouldn't use the auf-contraction -midendword verlauf 1236-12456-123-16-124 shouldn't use the auf-contraction - -word bei 12 -always bei 2-12 -sufword beieinander 12-2-1246 -sufword beifahr 12-2-1235 -sufword beisetz 12-2-15 -sufword beisitz 12-2-24 -sufword beispiel 12-2-346 -sufword beistand 12-2-23456 -sufword beiständ 12-5-23456 -sufword beistell 12-2-13456 -sufword beizu 12-2-1356 -always beizung 12-146-1356-136 shouldn't use the bei-contraction -always beiß 12-146-6-2346 shouldn't use the bei-contraction -endword bein 12-146-1345 shouldn't use the bei-contraction -endword beine 12-146-1345-15 shouldn't use the bei-contraction -endword beinen 12-146-1345-14 shouldn't use the bei-contraction -endword beins 12-146-1345-234 shouldn't use the bei-contraction -before t always beinhal 23-35-125-25 shouldn't use the bei-contraction -always beinhalter 12-146-1345-125-25-2345-12456 should use the ei-contraction - -word dem 12356 -always dem 2-12356 -sufword demzu 12356-2-1356 -endword dem 145-12356 shouldn't use the dem-contraction -always außerdem 16-6-2346-12456-2-12356 -always demask = demaskiert shouldn't use the dem-contraction -always demilit = shouldn't use the dem-contraction -always demonstr 145-12356-135-1345-23456-1235 shouldn't use the dem-contraction -word demo 145-12356-135 shouldn't use the dem-contraction -word demos 145-12356-135-234 shouldn't use the dem-contraction - -word durch 1456 -always durch 2-1456 -sufword durcheinander 1456-2-1246 -sufword durchfahr 1456-2-1235 -sufword durchlass 1456-2-123 -sufword durchläss 1456-5-123 -sufword durchsprech 1456-2-2346 -sufword durchsetz 1456-2-15 -sufword durchspiel 1456-2-346 -sufword durchstand 1456-2-23456 -sufword durchstell 1456-2-13456 -sufword durchzu 1456-2-1356 -sufword durchzuck 2-1456-1356-136-46 shouldn't use the zu-contraction -word durchzug 2-1456-1356-136-1245 shouldn't use the zu-contraction -word durchzuges 2-1456-1356-136-1245-123456 shouldn't use the zu-contraction -sufword durchzugs 2-1456-1356-136-1245-234 shouldn't use the zu-contraction -begword durcheinandergerat 1456-2-1246-12346-1235-1-2345 -always zugerat 2-1356-12346-1235-1-2345 shouldn't use the er-contraction -word für 124 -always für 2-124 -sufword füreinander 124-2-1246 -always fürst 124-1256-1235-23456 shouldn't use the für-contraction -word gegen 1245 -always gegen 2-1245 -sufword gegenauf 1245-2-16 -sufword gegeneinander 1245-2-1246 -sufword gegenfahr 1245-2-1235 -sufword gegensetz 1245-2-15 -sufword gegenstand 1245-2-23456 -sufword gegenständ 1245-5-23456 -sufword gegenzu 1245-2-1356 -prfword gegenzug 2-1245-1356-136-1245 -prfword gegenzuge 2-1245-1356-136-12346 -prfword gegenzuges 2-1245-1356-136-1245-123456 -prfword gegenzugs 2-1245-1356-136-1245-234 -before g sufword gegenzun 2-1245-1356-256 -word gewesen 12346 -always gewesen 2-12346 -always fürsorgewesen 2-124-234-26-12346-2456-123456-14 shouldn't use the gewesen-contraction - -word immer 1346 -word immerzu 1346-2-1356 -always immer 2-1346 -always immersion 24-1346-12456-234-245 shouldn't use the immer-contraction -always immersiv 24-1346-12456-234-24-1236 -always flimmer 124-123-24-1346-12456 -always wimmer 2456-24-1346-12456 shouldn't use the immer-contraction -always zimmer 1356-24-1346-12456 shouldn't use the immer-contraction -word jetzt 245 -always jetzt 2-245 -word mehr 2356 -always mehr 2-2356 -sufword mehrstell 2356-2-13456 -word mit 2345 -always mit 2-2345 -sufword mitauf 2345-2-16 -sufword mitdürf 2345-2-145 -sufword miteinander 2345-2-1246 -sufword mitfahr 2345-2-1235 -sufword mithab 2345-2-125 -sufword mitkönn 2345-2-13 -sufword mitmüss 2345-2-134 -sufword mitnicht 2345-2-1345 -sufword mitschrieb 2345-2-156 -sufword mitspiel 2345-2-346 -sufword mitunter 2345-2-256 -sufword mitzu 2345-2-1356 -word nicht 1345 -word n 6-1345 -always nicht 2-1345 -sufword nichtauf 1345-2-16 -sufword nichtzu 1345-2-1356 -always nichtzughör 2-1345-1356-136-1245-125-246-1235 -always nichtzuck 2-1345-1356-136-46 -always nichtzusammen 2-1345-1356-234 -word so 1234 -always so 2-1234 -sufword soundso 1234-2-136-2-1234 -sufword sowie 1234-2-126 -endword son = -begword sozu 1234-2-1356 -always cursor = shouldn't use the so-contraction -begword absol = -begword absorb = -begword absorp = -always adsorbier 1-145-234-26-12-346-1235 -always aerosol 1-12456-135-234-135-123 -always amtsober 1-134-2345-234-135-12-12456 -always anthroposo 235-2345-125-1235-135-1234-135-234-135 -always iso = -always konson = -begmidword sensor 234-14-234-26 -endword sensor 234-14-234-135-1235 -endword sensor 234-14-234-135-1235 -word soda = -always soffizier 234-135-124-124-24-1356-346-1235 -always soft = -always soldat = -endword solo = -always sommer 234-135-1346-12456 -before konsonant always son = -always sonogra = -always sonn = -always sonst 234-135-1345-23456 -always sorientier 234-26-24-14-2345-346-1235 -before konsonant always sor 234-26 -always source = -sufword south = -always sowjet = -always soziolo = -word über 1256 -word ueber 1256 -always über 2-1256 -sufword überdurch 1256-2-1456 -sufword übereinander 1256-2-1246 -sufword überzu 1256-2-1356 -always überzucht 2-1256-1356-136-1456-2345 -always überzuck 2-1256-1356-136-46 -prfword überzug 2-1256-1356-136-1245 -prfword überzuges 2-1256-1356-136-1245-123456 -before konsonant always überzug 2-1256-1356-136-1245 -always überlauf 2-1256-123-16-124 -word und 136 -always und 2-136 -sufword gesund 12346-234-256-145 -prfword hund 125-256-145 shouldn't use the und-contraction -always hunde 125-256-145-15 shouldn't use the und-contraction -always hundert 125-256-145-12456-2345 shouldn't use the und-contraction -prfword hunderte 125-256-145-12456-236 shouldn't use the und-contraction -prfword hunden 125-256-145-14 shouldn't use the und-contraction -prfword hundes 125-256-145-123456 shouldn't use the und-contraction -always kund 13-256-145 shouldn't use the und-contraction -always mund 134-256-145 shouldn't use the und-contraction -sufword schrund 156-1235-256-145 -always wund 2456-256-145 shouldn't use the und-contraction - -word unter 256 -always unter 2-256 -sufword kunter 13-256-2345-12456 shouldn't use the unter-contraction -sufword kunterbunter 13-256-2345-12456-12-256-2345-12456 -sufword munter 134-256-2345-12456 shouldn't use the unter-contraction -sufword untereinander 256-2-1246 -word voll 12345 -always voll 2-12345 -sufword vollständ 12345-5-23456 -sufword vollzu 12345-2-1356 -prfword vollzug 2-12345-1356-136-1245 -prfword vollzuge 2-12345-1356-136-12346 -prfword vollzuges 2-12345-1356-136-1245-123456 -always vollzugs 2-12345-1356-136-1245-234 -word von 1236 -always von 2-1236 -sufword voneinander 1236-2-1246 -word vor 26 -always vor 2-26 -sufword vorbei 26-2-12 -sufword vorspiel 26-2-346 -sufword vorstell 26-2-13456 -sufword vorüber 26-2-1256 -sufword vorzu 26-2-1356 -always vorzugs 2-26-1356-136-1245-234 -always vorzugstimmen 2-26-1356-136-1245-23456-24-1346-14 -always favorit 124-1-1236-26-24-2345 shouldn't use the vor-contraction -word wie 126 -always wie 2-126 -always zwiebel 1356-2456-346-12-13456 shouldn't use the wie-contraction -word zu 1356 -always zu 2-1356 -word indem 35-2-12356 -word trotzdem 2345-1356-2-12356 -word zudem 1356-2-12356 -sufword zueinander 1356-2-1246 -sufword zufahr 1356-2-1235 -sufword zulass 1356-2-123 -sufword zuläss 1356-5-123 -sufword zuspiel 1356-2-346 -sufword zustand 1356-2-23456 -sufword zuständ 1356-5-23456 -sufword zustell 1356-2-13456 -sufword zuzu 1356-2-1356 -always zucht 1356-136-1456-2345 shouldn't use the zu-contraction -always zuck 1356-136-46 shouldn't use the zu-contraction -before g always zug = -endword zug = -endword zuges 1356-136-1245-123456 - -# Einformige Kürzungen, alleinstehend oder am Wortanfang -sufword ihr 24 -sufword sein 246 -word war 356 -word waren 356-14 -word warst 356-23456 -word wart 356-2345 -word war's 356-6-234 -word wär 5-356 -word wäre 5-356-15 -word wären 5-356-14 -word wärest 5-356-15-23456 -word wäret 5-356-15-2345 -word wärst 5-356-23456 -word wärt 5-356-2345 -word wär's 5-356-6-234 - -# Einformige Kürzungen, alleinstehend, mit Endungen oder in Wortverbindungen -always hatt 125 -always hätt 345 -always haett 345 -always welch 13456 - -word adonis = shouldn't use the nis-contraction -always aktuell 1-13-2345-136-15-12345 should use the ll-contraction -always all 1-12345 -sufword alle 1-15 -always allegor 1-12345-15-1245-26 Allegorie shouldn't use the ae-contraction -always allein 1-1246 -word allem 1-12356 -always allen 1-14 -always aller 1-12456 -always allerg 1-12345-12456-1245 Allergiker -word alles 1-123456 -always allesamt 1-12345-15-234-1-134-2345 shouldn't use the es-contraction -always alphabet 25-1234-125-1-12-15-2345 shouldn't use the hab-contraction -word also 1-135 -always ander 2-12456 -always wander 2456-235-145-12456 wandern shouldn't use the ander-contraction -sufword zander 1356-235-145-12456 -always änder 5-12456 -always aender 5-12456 -always arbeit 356-12 -before s always arbeits 356-12-234 -always arben 356-12-14 -always kauf 13-16-124 -begword aussprech 16-2-2346 -midendword aussprech 16-234-2-2346 -midendword ausstell 16-234-2-13456 -always australi 16-23456-1235-25-24 shouldn't use the aus-contraction -always austria 16-23456-1235-24-1 shouldn't use the aus-contraction -#begword äuß 5-34 FIXME: how to deal with äußerst? - -always ähnlich 345-456 -always aehnlich 345-456 - -word balsam 12-25-234-1-134 -word been 12-15-15-1345 english word shouldn't use be- or en-contraction -always beere 12-15-15-1235-15 -always beeren 12-15-15-1235-14 -always behr 12-2356-1235 entbehren -begword beid 12-145 beiderseits -always berg 12-12456-1245 shouldn't use the be-contraction -always berge 12-12456-12346 shouldn't use the be-contraction -always bergen 12-12456-1245-14 shouldn't use the be-contraction -always berger 12-12456-1245-12456 shouldn't use the be-contraction -always berges 12-12456-1245-123456 shouldn't use the be-contraction -always besonder 23 -always besser 234-234 -contraction ss -word beim 12-134 -contraction bm -word bis 12-234 -sufword bisher 12-234-125-12456 -sufword bislang 12-2345-123-1245 -sufword bisweil 12-234-2456-146-123 -always bison = - -always bist 12-23456 -always bistum 12-24-23456-136-134 shouldn't use the bist-contraction -always bleib 12-12 -contraction bb -always blind 12-123 -contraction bl -always brauch 2-34 -always bräuch 5-34 -always braeuch 5-34 -always brief 12-124 -contraction bf -always bring 12-1245 -contraction bg - -always charakter 1456-13 -sufword chor 1456-135-1235 shouldn't use the or-contraction -always comput 6-14-135-134-1234-136-2345 computer should use the er-contraction - -always dabei 145-12 -contraction db -always dadurch 145-145 -contraction dd -always dafür 145-124 -contraction df -always dagegen 145-1245 -contraction dg -always daher 145-125 -contraction dh -always damit 145-134 -contraction dm -always dank 145-13 -contraction dk -always davon 145-1236 -contraction dv -always dazu 145-1356 -contraction dz -always dazubleib 145-1-2-1356-12-12 shouldn't use the dazu-contraction -always dazumal 145-1-2-1356-134 -always deuten 145-126-2345-14 shouldn't use the te-contraction -always deal = dealer -word dei = Agnus Dei -always demokrat 145-2345 -contraction dt -word denen 15-14 -word dnister 145-1345-24-234-2345-12456 shouldn't use the nis-contraction -word denn 145-1345 -word dennschon 145-1345-156-135-1345 -always dessen 145-2346 -always deutsch 145-156 -word diem 145-24-12356 we shouldn't use the ie-contraction here -word diese 346-15 -word diesen 346-14 -word dieser 346-12456 -word dieses 346-123456 -sufword diesmal 346-134 -word dir 145-1235 -word doch 145-1456 -always druck 145-46 -always drück 5-145-46 -always dürf 2-145 - -always eben 15-12-14 -word ebenso 15-135 -contraction eo -sufword ehemal 15-125-15-134 -word ei 6-146 -always eigen 146-1245-14 Eigennutz shouldn't use the ge-contraction -always einander 2-1246 -word en 15-1345 en passant -always enig 14-45 -always erkenn 12456-13-14-1345 -sufword etwa 15-1 -contraction ea -word etwas 2345-2456 -contraction tw - -always fahr 2-1235 -always fahrtsst 2-1235-2345-234-23456 shouldn't use the ss-contraction -always fahrtsstell 2-1235-2345-234-2-13456 -always fähr 5-1235 -always faehr 5-1235 -always fall 124-12345 -always fäll 5-124-12345 -always faell 5-124-12345 -always fertig 124-45 -always fest 124-15-23456 should use the st-contraction -always film = -always folgen 124-135-123-1245-14 shouldn't use the ge-contraction -always frag 124-1235 -contraction fr -always fragil = -always fragment 124-1235-1-1245-134-14-2345 -always freund 124-145 -contraction fd -always führ 124-125 -contraction fh -always fürcht 124-1256-1235-1456-2345 shouldn't use the für-contraction - -always ganz 1245-1356 -contraction gz -always gänz 5-1245-1356 -always gaenz 5-1245-1356 -always garnison 1245-356-1345-24-234-135-1345 shouldn't use the nis-contraction -word gegend 12346-1245-14-145 shouldn't use the gegen-contraction -always gegenüber 1245-1256 -contraction gü -always gegenwart 1245-2456 -contraction gw -always gegenwärt 5-1245-2456 -always gegenwaert 5-1245-2456 -always gelb 1245-13456-12 should use the el-contraction -always geld 1245-13456-145 should use the el-contraction -always gelegen 1245-1245 -contraction gg -begword gelt 1245-13456-2345 gelten shouldn't use the ge-contraction -prfword gene 1245-14-15 -prfword genem 1245-14-12356 -prfword genen 1245-14-14 -prfword gener 1245-14-12456 -prfword genes 1245-14-123456 -always geogra = Geographie shouldn't use the ge-contraction -prfword gern 1245-12456-1345 -midendword gerlich 1245-12456-456 bürgerlich shouldn't use the ge-contraction -always gern 1245-12456-1345 we shouldn't use the ge-contraction here -always geschäft 1245-124 -always geschaeft 1245-124 -contraction gf -always gesellschaft 1245-156 -always geworden 12346-2456 -always gibt 1245-12 -contraction gb -always gleich 1245-1456 -always glück 1245-46 -always groß 1245-2346 -contraction gß -always größ 5-1245-2346 -always grund 1245-145 -contraction gd -always gründ 5-1245-145 -always gründonners 1245-1235-1256-1345-145-135-1345-1345-12456-234 gründonnerstag shouldn't use the gründ-contraction -always hab 2-125 -always haft 125-124 -contraction hf -always häft 5-125-124 -always haeft 5-125-124 -word hain = -always hamburger 125-1-134-12-136-1235-1245-12456 shouldn't use the ge-contraction -always hand 125-145 -always händ 5-125-145 -always haend 5-125-145 -always halten 125-25-2345-14 shouldn't use the te-contraction -always hast 125-23456 -always hat 125-2345 -contraction ht -word hattest 125-15-23456 shouldn't use the es-contraction -word hattrick 125-1-2345-2345-24-46 shouldn't use the hatt-contraction -always haupt 125-1234 -contraction hp -always häupt 5-125-1234 -always herr 1235-1235 -contraction rr -always hier 125-1235 -contraction hr -always hierar 125-24-12456-356 hierarchie -always hoff 124-124 -contraction ff - -word ich 3456 -sufword ihn 24-125 -always inter 35-2345-12456 -always interess 2-35 -always irgend 24-1245 irgendetwas -contraction ig - -always jahr 245-1235 -contraction jr -always jähr 5-245-1235 -always jaehr 5-245-1235 -always jahrhundert 245-125 -contraction jh -always jahrtausend 245-2345 -contraction jt -always jahrzehnt 245-1356 -contraction jz -sufword jed 245-145 -word jedoch 245-1456 -sufword jetzig 245-45 -always johannisberg 245-135-125-235-1345-24-234-12-12456-1245 shouldn't use the nis-contraction -always jung 245-256-1245 shouldn't use the ung-contraction - -word kannst 13-23456 -always kapital 13-1234 -contraction kp -always kapitäl 5-13-1234 -always kapitael 5-13-1234 -always klemm 13-123-15-1346 eingeklemmt shouldn't use the em-contraction -always knoch 13-1345-135-1456 Knochen shouldn't use the noch-contraction -always komm 13-1346 -contraction kx -always akkommod 1-13-13-135-1346-135-145 shouldn't use the komm-contraction -always kömm 5-13-1346 -always konnt 13-2345 -contraction kt -always könn 2-13 -always kräft 5-13-124 -always kraeft 5-13-124 -always kulturell 13-136-123-2345-136-1235-15-12345 should use the ll-contraction -always kürz 5-13-1356 - -always lang 123-1245 -contraction lg -before g sufword schlan 156-123-235 shouldn't use the lang-contraction -sufword schlangen 156-123-235-1245-14 -before g always warteschlan 2456-356-236-156-123-235 -always läng 5-123-1245 -always laeng 5-123-1245 -always jahrelang 245-1235-15-123-1245 shouldn't use the el-contraction -always jahrhundertelang 245-125-15-123-1245 shouldn't use the el-contraction -always jahrzehntelang 245-1356-15-123-1245 shouldn't use the el-contraction -always jahrtausendelang 245-2345-15-123-1245 shouldn't use the el-contraction -before s always jahres 245-1235-123456 -before g always jahresta 245-1235-123456-2345-1 -always langobard 123-235-1245-135-12-356-145 shouldn't use the lang-contraction -always lass 2-123 -always läss 5-123 -always laess 5-123 -sufword blass 12-123-1-2346 -sufword blasst 12-123-1-234-23456 -always class = shouldn't use the lass-contraction -before s always glas = -sufword klass 13-123-1-2346 shouldn't use the lass-contraction -always lassist 123-1-2346-24-23456 -always laich 123-1-24-1456 shouldn't use the ich-contraction -always lasagne = shouldn't use the sag-contraction -always lasso 123-1-2346-135 shouldn't use the lass-contraction -always länd = -always laend = -always leb 123-12 -contraction lb -always leicht 123-1456 -always letzt 123-2345 -contraction lt -always lieb 123-346-12 - -always mann 134-1345 -contraction mn -always männ 5-134-1345 -always maenn 5-134-1345 -word manna = shouldn't use the mann-contraction -always mannequin 134-235-1345-15-6-12345-35 shouldn't use the mann-contraction -always maschin 134-156 -always material 134-123 -contraction ml -always materiell 134-12345 -word mir 134-1235 -always mittel 134-2345 -contraction mt -always moldawien 134-135-123-145-1-2456-24-14 shouldn't use the wie-contraction -sufword moor = shouldn't use the or-contraction -always möchte 1456-15 -word möchten 1456-14 -always mög 2-246 -always möglich 134-456 -always musik 134-13 -contraction mk -always muss 134-2346 -always müss 2-134 - -word nachdem 1345-145 -always nahm 1345-134 Annahme -contraction nm -always natur 1345-2345 -contraction nt -always natürlich 1345-456 -always nächst 1345-23456 -always naechst 1345-23456 -always nehm 1345-125 -contraction nh -endword nisch 1345-24-156 shouldn't use the nis-contraction -endword nische 1345-24-156-15 shouldn't use the nis-contraction -endword nischen 1345-24-156-14 shouldn't use the nis-contraction -endword nischer 1345-24-156-12456 shouldn't use the nis-contraction -endword nisches 1345-24-156-123456 shouldn't use the nis-contraction -always nichtig 1345-45 -always nichts 1345-234 -contraction ns -always nichtsehend 2-1345-234-2356-14-145 shouldn't use the nichts-contraction -always nichtschwimm 2-1345-156-2456-24-1346 shouldn't use the nichts-contraction -always noch 1345-1456 -always nommen 1345-1346 -contraction nx -always genommen 12346-1345-1346 -midendword augenommen 16-12346-1345-1346 -always eigenommen 146-12346-1345-1346 -always notwendig 1345-2456 -contraction nw -begmidword normal 1345-26-134-25 shouldn't use the mal-contraction -prfword normal 1345-26-134-1-123 shouldn't use the mal-contraction -always anim 235-24-134 animal shouldn't use the mal-contraction -always nur 1345-1235 -contraction nr -always nutz 1345-1356 -contraction nz -always nütz 5-1345-1356 - -sufword ohne 135-15 -contraction oe - -always öffentlich 246-456 - -always paar = shouldn't use the ar-contraction -always paragraph 1234-1245 -contraction pg -always person 1234-1345 -contraction pn -always philosoph 1234-125 -contraction ph -always platz 1234-1356 -always plätz 5-1234-1356 -always plaetz 5-1234-1356 -always plötzlich 1234-456 -always ploetzlich 1234-456 -always politik 1234-13 -contraction pk -always politisch 1234-156 -always punkt 1234-2345 -contraction pt - -always recht 1235-2345 -contraction rt -before s always rechts 1235-2345-234 -always regier 1235-1245 -contraction rg -before s always regierungs 1235-1245-136-234 -always rehabilit 1235-125 -contraction rh -always republik 1235-13 -contraction rk -sufword rest 1235-15-23456 should use the st-contraction -always richt 2-3456 -always rück 1235-46 -always rueck 1235-46 - -always sag 234-1245 -contraction sg -always saal = shouldn't use the al-contraction -word samen 234-1-134-14 shouldn't use the sam-contraction -always satz 234-1356 -contraction sz -always sätz 5-234-1356 -always saetz 5-234-1356 -always schnur 156-1345-136-1235 shouldn't use the nur-contraction -always school 234-1456-135-135-123 foreign word, sch-contraction not allowed -always schlag 156-1245 -always schläg 5-156-1245 -always schlaeg 5-156-1245 -always schließ 156-2346 -always schreib 156-12 -always schrift 156-2345 -always schrieb 2-156 -always schwierig 156-45 -always schwillt 156-2456-24-12345-2345 shouldn't use the will-contraction -always schwoll 156-2456-135-12345 geschwollen shouldn't use the woll-contraction -word sehr 234-1235 -sufword versehr 36-234-1235 -sufword unversehr 256-1236-12456-234-1235 -always selbst 234-23456 -always selbständig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction -always selbstaendig 234-13456-12-5-23456-45 shouldn't use the selbst-contraction -always setz 2-15 -sufword sesam 234-123456-1-134 shouldn't use the sam-contraction -always sind 234-145 -contraction sd -always sindex 234-35-145-15-6-1346 -always sindik 234-35-145-24-13 -always sindiz 234-35-145-24-1356 -always sindustr 234-35-145-136-23456-1235 -always sitz 2-24 -always sitzbein 2-24-12-146-1345 shouldn't use the bei-contraction -always solch 234-1456 -always soll 2-234 -always sondern 234-1345 -contraction sn -always sozial 234-123 -contraction sl -always spiel 2-346 -always sprach 234-1234 -contraction sp -always spräch 5-234-1234 -always spraech 5-234-1234 -always sprech 2-2346 -always staat 23456-2345 -always stand 2-23456 -always standard 23456-235-145-356-145 shouldn't use the stand-contraction -always ständ 5-23456 -always staend 5-23456 -always stell 2-13456 -always sstell 234-2-13456 shouldn't use the ss-contraction -word stets 23456-234 -always strahier 23456-1235-1-125-346-1235 abstrahieren - -word taiga = shouldn't use the ig-contraction -always täter 2345-345-2345-12456 shouldn't use the er-contraction -always technik 2345-13 -contraction tk -always stechnik 234-2345-13 -always technisch 2345-156 -always stechnisch 234-2345-156 -sufword test 2345-15-23456 shouldn't use the es-contraction -sufword töricht 2345-246-1235-3456-2345 shouldn't use the richt-contraction -sufword toericht 2345-246-1235-3456-2345 shouldn't use the richt-contraction -always trag 2345-1245 -contraction tg -always träg 5-2345-1245 -always train = training shouldn't use the first possible in-contraction -always treff 2345-124 -contraction tf -always trinitro = shouldn't use the in-contraction -always trotz 2345-1356 -contraction tz -always trüb = trüber shouldn't use the über-contraction - -always unbeirr 256-23-24-1235-1235 unbeirrt shouldn't use the bei-contraction -sufword under 256-145-12456 shouldn't use the und-contraction - -word überhaupt 1256-125 -word ueberhaupt 1256-125 -always übrig 1256-45 - -always verhältnis 1236-125 -contraction vh -always verhaeltnis 1236-125 -always viel 1236-123 -contraction vl -word vielleicht 1236-2345 -always volk 1236-13 -contraction vk -word vom 1236-134 -contraction vm - -always wahr 2456-125 -contraction wh -always währ 5-2456-125 -always während 345-145 -contraction äd -always waehrend 345-145 -sufword warm 2456-356-134 shouldn't use the war-contraction -always weg 2456-1245 -contraction wg -always weis 2-146 Anweisung -always weit 2456-2345 -before konsonant begword zweit 1356-2456-146-2345 shouldn't use the weit-contraction -always wenig 2456-45 -sufword wenn 2456-1345 -contraction wn -always werd 2-2456 -always wesentlich 2456-456 -always wiegend 2456-346-1245-14-145 shouldn't use the wie-contraction -always wieder 346-145 -always wien 2456-346-1345 shouldn't use the wie-contraction -always will 2456-12345 -always william 2456-24-12345-24-1-134 -word wir 2456-1235 -word wird 2456-145 -always wirk 2456-13 -contraction wk -word wirst 2456-23456 -always wirtschaft 2456-156 -always wiss 2456-2346 -contraction wß -word swiss 234-2456-24-2346 shouldn't use the wiss-contraction -always wohl 2456-123 -contraction wl -always woll 2-135 -word Wolle 2456-135-12345-15 shouldn't use the woll-contraction -always wollfad 2456-135-12345-124-1-145 shouldn't use the woll-contraction -always baumwoll 12-16-134-2456-135-12345 shouldn't use the woll-contraction -word worden 135-14 -sufword wurd 136 -sufword würd 1256 - -always young 6-13456-135-136-1345-1245 shouldn't use the u-contraction - -always zahl 1356-123 -contraction zl -always zähl 5-1356-123 -always zeit 1356-2345 -contraction zt -before st midendword zug = -word zum 1356-134 -word zunächst 1356-1345 -word zunaechst 1356-1345 -word zur 1356-1235 -sufword zurschau 1356-1235-156-16 -sufword zurück 1356-46 -sufword zurueck 1356-46 -always zusammen 1356-234 -always zwischen 1356-2456 -contraction zw - -# exceptions -always aachen 1-1-1456-14 shouldn't use the ach-contraction -always abbauf 1-12-12-16-124 Abbaufortschritt, Abbaufront -sufword abend 1-12-14-145 -always abenteuer 1-12-14-2345-126-12456 -always abenteurer 1-12-14-2345-126-1235-12456 -always aberkann 1-12-12456-13-235-1345 shouldn't use the aber-contraction -always aberkenn 1-12-12456-13-14-1345 shouldn't use the aber-contraction -begword abernt 1-12-12456-1345-2345 shouldn't use the aber-contraction -always abgaben 1-12-1245-1-12-14 shouldn't use the be-contraction -begword ausgaben 34-1245-1-12-14 shouldn't use the be-contraction -sufword ablageraum 1-12-123-1-12346-1235-16-134 -always ablageräum 1-12-123-1-12346-1235-34-134 -always ablageraeum 1-12-123-1-12346-1235-34-134 -always ablauf 1-12-123-16-124 shouldn't use the auf-contraction -always ablösesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction -always abloesesumm 1-12-123-246-234-15-234-136-1346 shouldn't use the es-contraction -always abnormität 1-12-1345-26-134-5-345 shouldn't use the mit-contraction -always abnormitaet 1-12-1345-26-134-5-345 shouldn't use the mit-contraction -always abrund 1-12-1235-256-145 shouldn't use the und-contraction -begword abschieds 1-12-156-346-145-234 Abschiedsschmerz -always achteck 1-1456-2345-15-46 shouldn't use the te-contraction -always asocia 1-234-135-6-14-24-1 asociación shouldn't use the so-contraction -always afrikarefer 1-124-1235-24-13-1-1235-15-124-12456 shouldn't use the ar-contraction -sufword agent 1-1245-14-2345 shouldn't use the ge-contraction -always akadem 1-13-1-145-12356 shouldn't use the dem-contraction -sufword akten 1-13-2345-14 shouldn't use the te-contraction -always akteur 1-13-2345-126-1235 shouldn't use the te-contraction -always ingenieur 35-1245-14-24-126-1235 -always interieur 35-2345-12456-24-126-1235 -always porteur 1234-26-2345-126-1235 -always alarm 25-356-134 Alarmmeldung shouldn't use the mm-contraction -always albern 25-12-12456-1345 shouldn't use the be-contraction -always albert 25-12-12456-2345 shouldn't use the be-contraction -always alexander 25-15-6-1346-235-145-12456 shouldn't use the ander-contraction -always algerier 25-1245-12456-24-12456 shouldn't use the ie-contraction -sufword allee 1-12345-15-15 shouldn't use the alle-contraction -prfword alleen 1-12345-15-14 shouldn't use the alle-contraction -always baumallee 12-16-134-1-12345-15-15 shouldn't use the mal-contraction and alle-contraction -always baumalleen 12-16-134-1-12345-15-14 shouldn't use the mal-contraction and alle-contraction -before st always alltags 1-12345-2345-1-1245-234 -begword alm 25-134 -begword alter 25-2345-12456 -always amateur 1-134-1-2345-126-1235 should use the eu-contraction -before r always amerika 1-134-12456-24-13-1 -always amtschines 1-134-2345-234-1456-35-123456 shouldn't use the sch-contraction -always amtsstub 1-134-2345-234-23456-136-12 shouldn't use the ss-contraction -always andalusier 235-145-25-136-234-24-12456 shouldn't use the ie-contraction -midendword anebel 1-1345-15-12-13456 Andromedanebel shouldn't use the an-contraction -before st always anfangs 235-124-235-1245-234 -before st always angriffs 235-1245-1235-24-124-124-234 -always anklage 235-13-123-1-12346 Anklagerede shouldn't use the er-contraction -always anklang 235-13-123-235-1245 shouldn't use the lang-contraction -always ankläng 235-13-123-345-1345-1245 shouldn't use the läng-contraction -begword anlagen 235-123-1-1245-14 -always anlauf 235-123-16-124 shouldn't use the auf-contraction -before m always anleihe 235-123-146-125-15 Anleihemarkt shouldn't use the em-contraction -before m always film = -class egn egn -before egn begword anti 235-2345-24 -always antichrist 235-2345-24-1456-1235-24-23456 shouldn't use the ich-contraction -always anästh 235-345-234-2345-125 Anästhesie -begword armee 356-134-15-15 -word armeen 356-134-15-14 - -always augen 16-1245-14 shouldn't use the ge-contraction -midendword austausch 16-234-2345-16-156 shouldn't use the st-contraction -always beilstein 12-146-123-23456-1246 shouldn't use the bei-contraction -word bein 12-146-1345 shouldn't use the bei-contraction -word beine 12-146-1345-15 shouldn't use the bei-contraction -word beinen 12-146-1345-14 shouldn't use the bei-contraction -word beines 12-146-1345-123456 shouldn't use the bei-contraction -always bauform 12-16-124-26-134 shouldn't use the auf-contraction -always beteuer 23-2345-126-12456 shouldn't use the te-contraction -always beute 12-126-236 should use the eu-contraction -always beutel 12-126-2345-13456 should use the eu-contraction -always bssy 12-234-234-6-13456 shouldn't use the ss-contraction -always bundes 12-256-145-123456 shouldn't use the und-contraction -prfword chemikalie 1456-12356-24-13-25-24-15 -always donnerstag 145-135-1345-1345-12456-234-2345-1-1245 shouldn't use the st-contraction -before g always samstag = -endword stag = shouldn't use the st-contraction -endword stage 234-2345-1-12346 -endword stages 234-2345-1-1245-123456 -sufword eheinstitut 15-125-15-35-23456-24-2345-136-2345 -begword eheleu 15-125-15-123-126 -before g begword eherin 15-125-15-1235-35 Ehering(e) shouldn't use the er-contraction -midword ehilfs = Analysehilfsmittel shouldn't use the eh-contraction -always einter 15-35-2345-12456 shouldn't use the ein-contraction -midendword emethod = Analysemethode shouldn't use the eh-contraction -midendword enorm 15-1345-26-134 Aussprachenorm shouldn't use the en-contraction -always emuskel 15-134-136-234-13-13456 shouldn't use the em-contraction -always eschatolog 123456-1456-1-2345-135-123-135-1245 shouldn't use the sch-contraction -always esther 123456-2345-125-12456 shouldn't use the st-contraction -always ästhe 345-234-2345-125-15 ästhetisch -midendword erecht 15-1235-2345 -midendword ericht 15-2-3456 -always erepublik 15-1235-13 -midendword emann 15-134-1345 -midendword emädchen 15-134-345-145-1456-14 -midendword emaedchen 15-134-345-145-1456-14 -midendword emänn 15-5-134-1345 -midendword emaenn 15-5-134-1345 -midendword estand 15-2-23456 -midword estell 15-2-13456 -always found 124-135-256-145 Foundation shouldn't use the und-contraction -begword gänse = -word gänsen 1245-345-1345-234-14 -sufword gänserich 1245-345-1345-234-12456-3456 -always geben 12346-12-14 -always gebunden 12346-12-256-145-14 shouldn't use the und-contraction -always geier 1245-146-12456 should use the ei-contraction -always geil 1245-146-123 shouldn't use the ge-contraction -midendword geingang 1245-1246-1245-235-1245 -midendword geingän 1245-1246-1245-345-1345 -always gelungen 12346-123-256-1245-14 -always generat 1245-14-12456-1-2345 -always generier 1245-14-12456-346-1235 -always gerät 12346-1235-345-2345 should use the ge-contraction -always geraet 12346-1235-345-2345 should use the ge-contraction -always geräusch 12346-1235-34-156 should use the ge-contraction -always geraeusch 12346-1235-34-156 should use the ge-contraction -always gerecht 12346-1235-2345 -always gericht 12346-2-3456 -begword german 1245-12456-134-235 shouldn't use the ge-contraction -always gewiesen 12346-2456-346-234-14 shouldn't use the wie-contraction -prfword hallen 125-1-12345-14 shouldn't use the allen-contraction -always hauf 125-16-124 shouldn't use the auf-contraction -always hotel 125-135-2345-13456 shouldn't use the te-contraction -always installer 35-23456-1-12345-12456 shouldn't use the aller-contraction -always internet 35-2345-12456-1345-15-2345 shouldn't use the te-contraction -always interview 35-2345-12456-1236-24-15-2456 shouldn't use the ie-contraction -after st always ionstrieb 245-234-2345-1235-346-12 -after st always ionstrupp 245-234-2345-1235-136-1234-1234 -always jubel 245-136-12-13456 shouldn't use the be-contraction -always kaffee = -endword kaffees 13-1-124-124-15-123456 -always komponist 13-135-134-1234-135-1345-24-23456 shouldn't use the nis-contraction -always leselamp 123-123456-15-123-1-134-1234 shouldn't use the el-contraction -always liechtenstein 123-346-1456-2345-14-23456-1246 shouldn't use the te-contraction -prfword linie 123-35-24-15 shouldn't use the ie-contraction -always richtlini 2-3456-123-35-24 -prfword materie 134-1-2345-12456-24-15 shouldn't use the ie-contraction -always metallen 134-15-2345-1-12345-14 shouldn't use the allen-contraction -always regel 1235-15-1245-13456 -always release = shouldn't use the el-contraction -always roboter 1235-135-12-135-2345-12456 shouldn't use the te-contraction -always round 1235-135-256-145 shouldn't use the und-contraction -sufword rund 1235-256-145 shouldn't use the und-contraction -word räson = shouldn't use the so-contraction -always döschen 145-246-234-1456-14 shouldn't use the sch-contraction -always füsschen 124-1256-2346-1456-14 -always häschen 125-345-234-1456-14 shouldn't use the sch-contraction -always höschen 125-246-234-1456-14 should use the ch-contraction -always wollhöschen 2456-135-12345-125-246-234-1456-14 shouldn't use the woll-contraction -always küsschen 13-1256-2346-1456-14 shouldn't use the sch-contraction -always möschen 134-246-234-1456-14 should use the ch-contraction -word röschen 1235-246-234-1456-14 should use the ch-contraction -begword rosaro = shouldn't use the ar-contraction -midendword sammel 234-1-1346-13456 shouldn't use the sam-contraction -midendword samml 234-1-1346-123 shouldn't use the sam-contraction -endword schef 234-1456-15-124 -endword schefin 234-1456-15-124-35 -endword schefins 234-1456-15-124-35-234 -endword schefinnen 234-1456-15-124-35-1345-14 -endword schefs 234-1456-15-124-234 -endword eschef 123456-1456-15-124 -endword eschefin 123456-1456-15-124-35 -endword eschefins 123456-1456-15-124-35-234 -endword eschefinnen 123456-1456-15-124-35-1345-14 -endword eschefs 123456-1456-15-124-234 -always schueler 156-1256-123-12456 should use the ue-symbol -always schwung 156-2456-256-1245 shouldn't use the ung-contraction -always september 234-15-1234-2345-12356-12-12456 should use the em-contraction -always dezember 145-15-1356-12356-12-12456 shouldn't use the be-contraction -before s always sichts 234-3456-2345-234 Ansichtssache shouldn't use the ss-contraction -always silber 234-24-123-12-12456 shouldn't use the be-contraction -always sprung 234-1234-1235-256-1245 shouldn't use the ung-contraction -always ssitz 234-2-24 shouldn't use the ss-contraction -always ssonntag = -always sspiel 234-2-346 -always ssprach 234-234-1234 -always sstand 234-2-23456 -midendword stitel 234-2345-24-2345-13456 -always studien 23456-136-145-24-14 shouldn't use the ie-contraction -always stunde 23456-256-145-15 shouldn't use the und-contraction -always stunden 23456-256-145-14 -always esystem 15-234-6-13456-23456-12356 shouldn't use the es-contraction -always sturz 23456-136-1235-1356 Absturzursache shouldn't use the zu-contraction -always tagesstät 2345-1-1245-123456-23456-345-2345 shouldn't use the ss-contraction -always tagesstaet 2345-1-1245-123456-23456-345-2345 shouldn't use the ss-contraction -always team = shouldn't use the te-contraction -midendword termin 2345-12456-134-35 shouldn't use the te-contraction -always wagen 2456-1-1245-14 shouldn't use the ge-contraction -always weiber 2456-146-12-12456 shouldn't use the be-contraction -sufword verbund 36-12-256-145 shouldn't use the und-contraction -midendword verbund 1236-12456-12-256-145 shouldn't use the und-contraction -midword versamm 1236-12456-234-1-1346 shouldn't use the sam-contraction -always viertel 1236-346-1235-2345-13456 shouldn't use the te-contraction -before g always zeitsta 1356-2345-234-2345-1 -begword zion = zionist shouldn't use the nis-contraction -always zugantenn 1356-136-1245-235-2345-14-1345 -always zweiseit 1356-2456-146-234-146-2345 -always zweistaat 1356-2456-146-23456-2345 shouldn't use the weis-contraction - -midendword heitstätig 125-234-2345-345-2345-45 gelegenheitstätigkeit shouldn't use the st-contraction -begmidword admiral 1-145-134-24-1235-25 -begmidword astral 1-23456-1235-25 -before m sufword atom = -begmidword bifokal 12-24-124-135-13-25 -#begmidword brachial 12-1235-56-24-25 -begmidword bronchial 12-1235-135-1345-1456-24-25 bronchiallymphknoten shouldn't use the ll-contraction -begword general 1245-14-12456-25 -begmidword kolonial 13-135-123-135-1345-24-25 -begmidword zentral 1356-14-2345-1235-25 zentrallager -always schall 156-1-12345 schallen shouldn't use the allen-contraction -always herzultra 125-12456-1356-136-123-2345-1235-1 shouldn't use the zu-contraction -always mittagessen 134-24-2345-2345-1-1245-15-2346-14 -always snakeskin 234-1345-1-13-15-234-13-35 - -# countries -always dänemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction -always daenemark 145-345-1345-15-134-356-13 shouldn't use the em-contraction - -# names -word angela 235-1245-13456-1 shouldn't use the ge-contraction -word angeles 235-1245-13456-123456 shouldn't use the ge-contraction -word angelika 235-1245-13456-24-13-1 shouldn't use the ge-contraction -word angelina 235-1245-13456-35-1 shouldn't use the ge-contraction -word angelo 235-1245-13456-135 shouldn't use the ge-contraction -always daniel 145-235-24-13456 shouldn't use the ie-contraction -always gerlind 1245-12456-123-35-145 should use the er-contraction -always solveig 234-135-123-1235-146-1245 shouldn't use the so-contraction - -# TODO: -# 8-Punkte-Plan diff --git a/brltty/Contraction/de-vollschrift.ctb b/brltty/Contraction/de-vollschrift.ctb index 7826da7..da1f165 100644 --- a/brltty/Contraction/de-vollschrift.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -46,6 +46,7 @@ midendword iell = shouldn't use the ie-contraction begmidword dien 145-346-1345 always indien = shouldn't use the ie-contraction midendword ietät = +always spezies = before cst midword ungs = Bindungscharakter, Regierungschef # unsolvable problems: diff --git a/brltty/Contraction/en-ueb-g2.ctb b/brltty/Contraction/en-ueb-g2.ctb index 911147f..e5db89b 100644 --- a/brltty/Contraction/en-ueb-g2.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -374,4 +374,5 @@ always £ 4-123 pounds always ¥ 4-13456 yen always µ 46-134 mu - +# inline contraction of emoji descriptions +cldr en diff --git a/brltty/Contraction/en-us-g2.ctb b/brltty/Contraction/en-us-g2.ctb index d232c2f..e07aafe 100644 --- a/brltty/Contraction/en-us-g2.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -1266,9 +1266,9 @@ begword atto 1-2345-2345-135 10^-18 begword zepto 1356-15-1234-2345-135 10^-21 begword yocto 13456-135-14-2345-135 10^-24 -word thz = teraherz -word ghz = gigaherz -word chz = centiherz +word thz = terahertz +word ghz = gigahertz +word chz = centihertz begword ante = begword anti = @@ -1538,3 +1538,6 @@ literal .zip # when a decimal begins with a period, it should be translated with a # number sign followed by a decimal point, followed by the number. + +# inline contraction of emoji descriptions +cldr en diff --git a/brltty/Contraction/es.ctb b/brltty/Contraction/es.ctb index d10a10d..f8284d6 100644 --- a/brltty/Contraction/es.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -351,3 +351,6 @@ word verdad 1236-145 word veces 1236-14 word vosotros 45-1236 word vuestro 56-1236 + +# inline contraction of emoji descriptions +cldr es diff --git a/brltty/Contraction/fr-abrege.ctb b/brltty/Contraction/fr-abrege.ctb index b07e7b1..55eb88d 100644 --- a/brltty/Contraction/fr-abrege.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -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 @@ -1787,3 +1787,5 @@ sufword jusqu' 245-12345-3 sufword lorsqu' 123-12345-3 sufword parce\squ' 1234-456-12345-3 +# inline contraction of emoji descriptions +cldr fr diff --git a/brltty/Contraction/fr-integral.ctb b/brltty/Contraction/fr-integral.ctb index cde42a3..4d9eafd 100644 --- a/brltty/Contraction/fr-integral.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/ha.ctb b/brltty/Contraction/ha.ctb index a1e298d..5ae7fc4 100644 --- a/brltty/Contraction/ha.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/id.ctb b/brltty/Contraction/id.ctb index 54de7b9..c840cfd 100644 --- a/brltty/Contraction/id.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/ipa.ctb b/brltty/Contraction/ipa.ctb index 64905d4..dc71200 100644 --- a/brltty/Contraction/ipa.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/ja.ctb b/brltty/Contraction/ja.ctb index 7106eb2..22a077d 100644 --- a/brltty/Contraction/ja.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/ko-g1.ctb b/brltty/Contraction/ko-g1.ctb index 12340ee..29b1e48 100644 --- a/brltty/Contraction/ko-g1.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/ko-g2.ctb b/brltty/Contraction/ko-g2.ctb index 44b7452..844db23 100644 --- a/brltty/Contraction/ko-g2.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -29,3 +29,6 @@ always 그러므로 26 always 그런데 1345 always 그리고 136 always 그리하여 156 + +# inline contraction of emoji descriptions +cldr ko diff --git a/brltty/Contraction/ko.ctb b/brltty/Contraction/ko.ctb index 64ddb3c..4a8a3dc 100644 --- a/brltty/Contraction/ko.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/latex-access.ctb b/brltty/Contraction/latex-access.ctb index 7e59fa3..e515978 100755 --- a/brltty/Contraction/latex-access.ctb +++ b/brltty/Contraction/latex-access.ctb @@ -1,9 +1,9 @@ -#!/usr/bin/python +#!/usr/bin/python3 ############################################################################### # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2017 by The BRLTTY Developers. +# Copyright (C) 1995-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -12,7 +12,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -126,7 +126,7 @@ def parseProgramArguments (): This is an executable contraction table for BRLTTY that uses the latex-access package to translate LaTeX mathematical notation into braille. - BRLTTY can be found at [http://brltty.com/]. + BRLTTY can be found at [http://brltty.app/]. latex-access can be found at [http://www.latex-access.sourceforge.net/]. """ ) diff --git a/brltty/Contraction/letters-latin.cti b/brltty/Contraction/letters-latin.cti index b5a6bb2..7f0d680 100644 --- a/brltty/Contraction/letters-latin.cti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/lt.ctb b/brltty/Contraction/lt.ctb new file mode 100644 index 0000000..2dc5929 --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# 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/brltty/Contraction/mg.ctb b/brltty/Contraction/mg.ctb index e060b6f..ea372c5 100644 --- a/brltty/Contraction/mg.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/mun.ctb b/brltty/Contraction/mun.ctb index 91c2e4f..2c44a78 100644 --- a/brltty/Contraction/mun.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/nabcc.cti b/brltty/Contraction/nabcc.cti index 7c57894..280380b 100644 --- a/brltty/Contraction/nabcc.cti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/nl.ctb b/brltty/Contraction/nl.ctb index 6608f61..48249ea 100644 --- a/brltty/Contraction/nl.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -29,3 +29,6 @@ always ch 1456 always ij 13456 always oe 246 always sch 156 + +# inline contraction of emoji descriptions +cldr nl diff --git a/brltty/Contraction/ny.ctb b/brltty/Contraction/ny.ctb index 8d3d250..9ab033e 100644 --- a/brltty/Contraction/ny.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/pt.ctb b/brltty/Contraction/pt.ctb index 238cc8e..841939f 100644 --- a/brltty/Contraction/pt.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -484,3 +484,6 @@ word quarta-feira 12345-1235-36-124 word segunda-feira 234-1245-36-124 word sexta-feira 234-1346-36-124 word terça-feira 2345-14-36-124 + +# inline contraction of emoji descriptions +cldr pt diff --git a/brltty/Contraction/si.ctb b/brltty/Contraction/si.ctb index 6965ea6..318f35d 100644 --- a/brltty/Contraction/si.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/spaces.cti b/brltty/Contraction/spaces.cti new file mode 100644 index 0000000..e2d7d3e --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# 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/brltty/Contraction/sw.ctb b/brltty/Contraction/sw.ctb index 09832c7..1a3a910 100644 --- a/brltty/Contraction/sw.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -44,3 +44,6 @@ always ii 35 always oo 246 always uu 1256 always st 34 + +# inline contraction of emoji descriptions +cldr sw diff --git a/brltty/Contraction/th.ctb b/brltty/Contraction/th.ctb index c59ebe7..1b0d721 100644 --- a/brltty/Contraction/th.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -116,3 +116,6 @@ always ๖ 1248 THAI DIGIT SIX always ๗ 12458 THAI DIGIT SEVEN always ๘ 1258 THAI DIGIT EIGHT always ๙ 248 THAI DIGIT NINE + +# inline contraction of emoji descriptions +cldr th diff --git a/brltty/Contraction/zh-tw-ucb.ctb b/brltty/Contraction/zh-tw-ucb.ctb index cd231dd..66b35f5 100644 --- a/brltty/Contraction/zh-tw-ucb.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/zh-tw.ctb b/brltty/Contraction/zh-tw.ctb index 23234cd..731d914 100644 --- a/brltty/Contraction/zh-tw.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Contraction/zu.ctb b/brltty/Contraction/zu.ctb index 714e72c..02459a5 100644 --- a/brltty/Contraction/zu.ctb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -29,3 +29,6 @@ include letters-latin.cti always 'b 23 always gq 126 + +# inline contraction of emoji descriptions +cldr zu diff --git a/brltty/Input/al/abt_basic.kti b/brltty/Input/al/abt_basic.kti index 6f80d7b..9db4e28 100644 --- a/brltty/Input/al/abt_basic.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/abt_extra.kti b/brltty/Input/al/abt_extra.kti index 12cb33d..b05fcb4 100644 --- a/brltty/Input/al/abt_extra.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/abt_large.ktb b/brltty/Input/al/abt_large.ktb index 850391e..4aabc06 100644 --- a/brltty/Input/al/abt_large.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/abt_small.ktb b/brltty/Input/al/abt_small.ktb index 1e6262a..0518d16 100644 --- a/brltty/Input/al/abt_small.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/bc-etouch.kti b/brltty/Input/al/bc-etouch.kti index 8728924..b4bf80f 100644 --- a/brltty/Input/al/bc-etouch.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/bc-smartpad.kti b/brltty/Input/al/bc-smartpad.kti index e89ce8b..2c8fe80 100644 --- a/brltty/Input/al/bc-smartpad.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/bc-thumb.kti b/brltty/Input/al/bc-thumb.kti index a7e7aa3..1564558 100644 --- a/brltty/Input/al/bc-thumb.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/bc.kti b/brltty/Input/al/bc.kti index 54bb95d..86c71a1 100644 --- a/brltty/Input/al/bc.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/bc640.ktb b/brltty/Input/al/bc640.ktb index fa7bd79..41710e2 100644 --- a/brltty/Input/al/bc640.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/bc680.ktb b/brltty/Input/al/bc680.ktb index a446238..0229b8d 100644 --- a/brltty/Input/al/bc680.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/el.ktb b/brltty/Input/al/el.ktb index f7ae4e3..a6e82e3 100644 --- a/brltty/Input/al/el.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/sat_basic.kti b/brltty/Input/al/sat_basic.kti index 75e1d05..05b1a4a 100644 --- a/brltty/Input/al/sat_basic.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/sat_extra.kti b/brltty/Input/al/sat_extra.kti index c640782..35731aa 100644 --- a/brltty/Input/al/sat_extra.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/sat_large.ktb b/brltty/Input/al/sat_large.ktb index e7183e1..333a993 100644 --- a/brltty/Input/al/sat_large.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/sat_small.ktb b/brltty/Input/al/sat_small.ktb index 8e9d258..a7b71a0 100644 --- a/brltty/Input/al/sat_small.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/al/voyager.ktb b/brltty/Input/al/voyager.ktb index b7687fe..f286b17 100644 --- a/brltty/Input/al/voyager.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/at/all.ktb b/brltty/Input/at/all.ktb index d66eb1f..f3270d7 100644 --- a/brltty/Input/at/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bg/all.ktb b/brltty/Input/bg/all.ktb index 3a1a3b0..beab7c6 100644 --- a/brltty/Input/bg/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/b2g.ktb b/brltty/Input/bm/b2g.ktb new file mode 100644 index 0000000..e46c872 --- /dev/null +++ b/brltty/Input/bm/b2g.ktb @@ -0,0 +1,46 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title NBP B2G + +note Press Space while holding Backward to switch to navigation mode. +note In navigation mode: Backward is F1, Forward is F4, Dots1-6 are display keys 1-6, Dot7 is F2, Dot8 is F3. +note Press Space while holding Forward to switch to keyboard mode. +note In keyboard mode: Backward is B9, Forward is B10, Space is B11. + +include d6.kti +include routing6.kti + +bind F1 FWINLT +bind F4 FWINRT + +bind B9 FWINLT +bind B10 FWINRT + +assign space B11 +include keyboard.kti + +bind B9+RoutingKey SETLEFT +bind B10+RoutingKey SWITCHVT + +bind B11+Up TOP +bind B11+Down BOT +bind B11+Left FWINLTSKIP +bind B11+Right FWINRTSKIP +bind B11+Press PASTE + diff --git a/brltty/Input/bm/b9b10.kti b/brltty/Input/bm/b9b10.kti index 668979a..a4f9796 100644 --- a/brltty/Input/bm/b9b10.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,14 +11,14 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### 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/brltty/Input/bm/b9b11b10.kti b/brltty/Input/bm/b9b11b10.kti index 7363ff1..5de9d59 100644 --- a/brltty/Input/bm/b9b11b10.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/command.kti b/brltty/Input/bm/command.kti index 33c57fd..eb747de 100644 --- a/brltty/Input/bm/command.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/connect.ktb b/brltty/Input/bm/connect.ktb index 9750f99..ddb3d80 100644 --- a/brltty/Input/bm/connect.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/conny.ktb b/brltty/Input/bm/conny.ktb index 2687883..69a79b5 100644 --- a/brltty/Input/bm/conny.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/d6.kti b/brltty/Input/bm/d6.kti index a7c0f00..07d222d 100644 --- a/brltty/Input/bm/d6.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/default.ktb b/brltty/Input/bm/default.ktb index 22074c5..09f5755 100644 --- a/brltty/Input/bm/default.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/display6.kti b/brltty/Input/bm/display6.kti index f44bd0a..1fa28b8 100644 --- a/brltty/Input/bm/display6.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/display7.kti b/brltty/Input/bm/display7.kti index 4bc15ed..550982c 100644 --- a/brltty/Input/bm/display7.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/dm80p.ktb b/brltty/Input/bm/dm80p.ktb index e3d209c..8367223 100644 --- a/brltty/Input/bm/dm80p.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/front10.kti b/brltty/Input/bm/front10.kti index 20c854e..c820172 100644 --- a/brltty/Input/bm/front10.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/front6.kti b/brltty/Input/bm/front6.kti index 5aa28f3..ed39483 100644 --- a/brltty/Input/bm/front6.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/horizontal.kti b/brltty/Input/bm/horizontal.kti index d044ae5..dac85bc 100644 --- a/brltty/Input/bm/horizontal.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/inka.ktb b/brltty/Input/bm/inka.ktb index bb8ba63..e78aadb 100644 --- a/brltty/Input/bm/inka.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/keyboard.kti b/brltty/Input/bm/keyboard.kti index 46faed0..4d3724b 100644 --- a/brltty/Input/bm/keyboard.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/orbit.ktb b/brltty/Input/bm/orbit.ktb index f72f127..99236ea 100644 --- a/brltty/Input/bm/orbit.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/pro.ktb b/brltty/Input/bm/pro.ktb index 046c334..400ae77 100644 --- a/brltty/Input/bm/pro.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/pronto.ktb b/brltty/Input/bm/pronto.ktb index a5a1c0d..fe6727f 100644 --- a/brltty/Input/bm/pronto.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/pv.ktb b/brltty/Input/bm/pv.ktb index 7d1e9c5..6448f27 100644 --- a/brltty/Input/bm/pv.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/rb.ktb b/brltty/Input/bm/rb.ktb index 370b269..6d68284 100644 --- a/brltty/Input/bm/rb.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/routing.kti b/brltty/Input/bm/routing.kti new file mode 100644 index 0000000..6cb86f3 --- /dev/null +++ b/brltty/Input/bm/routing.kti @@ -0,0 +1,19 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +bind RoutingKey ROUTE diff --git a/brltty/Input/bm/routing6.kti b/brltty/Input/bm/routing6.kti index 15b901a..86a673b 100644 --- a/brltty/Input/bm/routing6.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,14 +11,14 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### # 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/brltty/Input/bm/routing7.kti b/brltty/Input/bm/routing7.kti index e596e99..b1299a3 100644 --- a/brltty/Input/bm/routing7.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,14 +11,14 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### # 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/brltty/Input/bm/status.kti b/brltty/Input/bm/status.kti index 0b2db6e..6d536dd 100644 --- a/brltty/Input/bm/status.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/sv.ktb b/brltty/Input/bm/sv.ktb index ec504ff..dfd7309 100644 --- a/brltty/Input/bm/sv.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/ultra.ktb b/brltty/Input/bm/ultra.ktb index 0e7543d..a351946 100644 --- a/brltty/Input/bm/ultra.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/v40.ktb b/brltty/Input/bm/v40.ktb index 2f0324a..7591b4f 100644 --- a/brltty/Input/bm/v40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/v80.ktb b/brltty/Input/bm/v80.ktb index a97f61c..becb364 100644 --- a/brltty/Input/bm/v80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/vertical.kti b/brltty/Input/bm/vertical.kti index 57fe20d..a19c1e4 100644 --- a/brltty/Input/bm/vertical.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/vk.ktb b/brltty/Input/bm/vk.ktb index 389a0af..32df7a6 100644 --- a/brltty/Input/bm/vk.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bm/wheels.kti b/brltty/Input/bm/wheels.kti index 4dd7018..b333e67 100644 --- a/brltty/Input/bm/wheels.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bn/all.ktb b/brltty/Input/bn/all.ktb index 261ba6d..31a7128 100644 --- a/brltty/Input/bn/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bn/input.kti b/brltty/Input/bn/input.kti index 5c4650c..1e3f66c 100644 --- a/brltty/Input/bn/input.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/bp/all.kti b/brltty/Input/bp/all.kti index 8ff1f8e..afc7f56 100644 --- a/brltty/Input/bp/all.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/cb/all.ktb b/brltty/Input/cb/all.ktb index 874074a..631c40a 100644 --- a/brltty/Input/cb/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ce/all.ktb b/brltty/Input/ce/all.ktb index 4572a63..22a2ec3 100644 --- a/brltty/Input/ce/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ce/novem.ktb b/brltty/Input/ce/novem.ktb index 70df132..d55b3f9 100644 --- a/brltty/Input/ce/novem.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/chords.kti b/brltty/Input/chords.kti index 843c5a8..533b085 100644 --- a/brltty/Input/chords.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -80,6 +80,9 @@ bind \{chord}Dot1+Dot3+Dot4+Dot6+\{toggleOn} CLIP_SAVE bind \{chord}Dot2+Dot3+Dot5 SIXDOTS+on bind \{chord}Dot2+Dot3+Dot6 SIXDOTS+off +bind \{chord}Dot4+Dot6+Dot7 BRLUCDOTS+off +bind \{chord}Dot4+Dot6+Dot8 BRLUCDOTS+on + bind \{chord}Dot3 KEY_CURSOR_LEFT bind \{chord}Dot6 KEY_CURSOR_RIGHT bind \{chord}Dot2 KEY_HOME diff --git a/brltty/Input/eu/braille.kti b/brltty/Input/eu/braille.kti index 8120d09..a94cab7 100644 --- a/brltty/Input/eu/braille.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/clio.ktb b/brltty/Input/eu/clio.ktb index a12cf7f..7b75296 100644 --- a/brltty/Input/eu/clio.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/common.kti b/brltty/Input/eu/common.kti index 712a484..4371adc 100644 --- a/brltty/Input/eu/common.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/esys_large.ktb b/brltty/Input/eu/esys_large.ktb index 9e057d2..25a11ec 100644 --- a/brltty/Input/eu/esys_large.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/esys_medium.ktb b/brltty/Input/eu/esys_medium.ktb index 8cb52bb..1afbd6a 100644 --- a/brltty/Input/eu/esys_medium.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/esys_small.ktb b/brltty/Input/eu/esys_small.ktb index 275d51f..32504dc 100644 --- a/brltty/Input/eu/esys_small.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/esytime.ktb b/brltty/Input/eu/esytime.ktb index 8924426..6589473 100644 --- a/brltty/Input/eu/esytime.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,19 +11,19 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### 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/brltty/Input/eu/iris.ktb b/brltty/Input/eu/iris.ktb index 9b973b7..849769d 100644 --- a/brltty/Input/eu/iris.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/joysticks.kti b/brltty/Input/eu/joysticks.kti index aae03ae..ece047b 100644 --- a/brltty/Input/eu/joysticks.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/routing.kti b/brltty/Input/eu/routing.kti index aba3615..de24db7 100644 --- a/brltty/Input/eu/routing.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/sw12.kti b/brltty/Input/eu/sw12.kti index 6b7643c..016ef60 100644 --- a/brltty/Input/eu/sw12.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/sw34.kti b/brltty/Input/eu/sw34.kti index 15b06db..e2b62b4 100644 --- a/brltty/Input/eu/sw34.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/eu/sw56.kti b/brltty/Input/eu/sw56.kti index c9c707e..e00ee65 100644 --- a/brltty/Input/eu/sw56.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/bumpers.kti b/brltty/Input/fs/bumpers.kti index 5650310..bfcc7ff 100644 --- a/brltty/Input/fs/bumpers.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/common.kti b/brltty/Input/fs/common.kti index 5929cb5..7349ec0 100644 --- a/brltty/Input/fs/common.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/focus_basic.ktb b/brltty/Input/fs/focus_basic.ktb index 1f201ba..29e0d5d 100644 --- a/brltty/Input/fs/focus_basic.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/focus_basic.kti b/brltty/Input/fs/focus_basic.kti index 9095bfc..1c28822 100644 --- a/brltty/Input/fs/focus_basic.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/focus_large.ktb b/brltty/Input/fs/focus_large.ktb index 1dec473..80c754b 100644 --- a/brltty/Input/fs/focus_large.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/focus_small.ktb b/brltty/Input/fs/focus_small.ktb index f06771c..6ff0664 100644 --- a/brltty/Input/fs/focus_small.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/pacmate.ktb b/brltty/Input/fs/pacmate.ktb index 295d4db..e88d632 100644 --- a/brltty/Input/fs/pacmate.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/fs/rockers.kti b/brltty/Input/fs/rockers.kti index 5112254..8ed3f31 100644 --- a/brltty/Input/fs/rockers.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hd/mbl.ktb b/brltty/Input/hd/mbl.ktb index 2ebaf8a..ebc569a 100644 --- a/brltty/Input/hd/mbl.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hd/pfl.ktb b/brltty/Input/hd/pfl.ktb index ddde33b..fc567aa 100644 --- a/brltty/Input/hd/pfl.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/beetle.ktb b/brltty/Input/hm/beetle.ktb index 75ce0fd..4d7e311 100644 --- a/brltty/Input/hm/beetle.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/braille.kti b/brltty/Input/hm/braille.kti index e3eaf19..af3a190 100644 --- a/brltty/Input/hm/braille.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/common.kti b/brltty/Input/hm/common.kti index 01ac61d..6cb86f3 100644 --- a/brltty/Input/hm/common.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/contexts.kti b/brltty/Input/hm/contexts.kti index b1f75b1..c05c0f8 100644 --- a/brltty/Input/hm/contexts.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/edge.ktb b/brltty/Input/hm/edge.ktb index 43c3a0c..86d4de9 100644 --- a/brltty/Input/hm/edge.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/f14.kti b/brltty/Input/hm/f14.kti index 4790ec9..bfc0fc2 100644 --- a/brltty/Input/hm/f14.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/f18.kti b/brltty/Input/hm/f18.kti index 7e84499..c85cc9b 100644 --- a/brltty/Input/hm/f18.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/fnkey.kti b/brltty/Input/hm/fnkey.kti index f4ba3ae..e74a5aa 100644 --- a/brltty/Input/hm/fnkey.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/left.kti b/brltty/Input/hm/left.kti index 6d102c8..5bd445e 100644 --- a/brltty/Input/hm/left.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/letters.kti b/brltty/Input/hm/letters.kti index 6c65a4c..75260ce 100644 --- a/brltty/Input/hm/letters.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/pan.ktb b/brltty/Input/hm/pan.ktb index 757b2a3..227cf81 100644 --- a/brltty/Input/hm/pan.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/pan.kti b/brltty/Input/hm/pan.kti index 648e542..44ddda8 100644 --- a/brltty/Input/hm/pan.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/qwerty.ktb b/brltty/Input/hm/qwerty.ktb index 5bb9a93..8365b76 100644 --- a/brltty/Input/hm/qwerty.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/qwerty.kti b/brltty/Input/hm/qwerty.kti index 9987e29..b20d897 100644 --- a/brltty/Input/hm/qwerty.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -135,7 +135,9 @@ endVariables beginVariables assign keys Dot7+ -assign flags +meta +# these conflict with shifted letters +#assign flags +meta +assign flags +shift include letters.kti endVariables diff --git a/brltty/Input/hm/right.kti b/brltty/Input/hm/right.kti index 5def70c..c184bb8 100644 --- a/brltty/Input/hm/right.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/scroll.ktb b/brltty/Input/hm/scroll.ktb index 8c33d88..4726ce5 100644 --- a/brltty/Input/hm/scroll.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/scroll.kti b/brltty/Input/hm/scroll.kti index b05ae3c..4b7769a 100644 --- a/brltty/Input/hm/scroll.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hm/sync.ktb b/brltty/Input/hm/sync.ktb index a2b27db..70f8b21 100644 --- a/brltty/Input/hm/sync.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/ab40.ktb b/brltty/Input/ht/ab40.ktb index 49ce97f..532ddb7 100644 --- a/brltty/Input/ht/ab40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/ac4.ktb b/brltty/Input/ht/ac4.ktb new file mode 100644 index 0000000..c20605c --- /dev/null +++ b/brltty/Input/ht/ac4.ktb @@ -0,0 +1,24 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HandyTech Activator + +bind B1+B4+SpaceLeft TOUCH_NAV + +include joystick.kti +include bs.kti diff --git a/brltty/Input/ht/alo.ktb b/brltty/Input/ht/alo.ktb index e987c1b..a8d5644 100644 --- a/brltty/Input/ht/alo.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/as40.ktb b/brltty/Input/ht/as40.ktb index ec6f2e4..98b170e 100644 --- a/brltty/Input/ht/as40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/bb.ktb b/brltty/Input/ht/bb.ktb index 8f84f6f..455d515 100644 --- a/brltty/Input/ht/bb.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/bkwm.ktb b/brltty/Input/ht/bkwm.ktb index fbb6ec7..f636c7a 100644 --- a/brltty/Input/ht/bkwm.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/brln.ktb b/brltty/Input/ht/brln.ktb index e15f1d6..8c62f3c 100644 --- a/brltty/Input/ht/brln.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/bs.kti b/brltty/Input/ht/bs.kti index 53dc498..f25a161 100644 --- a/brltty/Input/ht/bs.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/bs40.ktb b/brltty/Input/ht/bs40.ktb index 78c4fa3..82d00e4 100644 --- a/brltty/Input/ht/bs40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/bs80.ktb b/brltty/Input/ht/bs80.ktb index 43981f8..436eb25 100644 --- a/brltty/Input/ht/bs80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/cb40.ktb b/brltty/Input/ht/cb40.ktb index 543e377..74eb618 100644 --- a/brltty/Input/ht/cb40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/dots.kti b/brltty/Input/ht/dots.kti index 1883d6c..e9f697b 100644 --- a/brltty/Input/ht/dots.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/easy.ktb b/brltty/Input/ht/easy.ktb index 5d531dc..c0d94dd 100644 --- a/brltty/Input/ht/easy.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/input.kti b/brltty/Input/ht/input.kti index 046c64d..34b9579 100644 --- a/brltty/Input/ht/input.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/joystick.kti b/brltty/Input/ht/joystick.kti index b8a2dcc..e713044 100644 --- a/brltty/Input/ht/joystick.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,12 +11,12 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### -# Key subtable for HandyTech Actilino +# Key subtable for HandyTech: Actilino, Activator bind Left KEY_CURSOR_LEFT bind Right KEY_CURSOR_RIGHT diff --git a/brltty/Input/ht/keypad.kti b/brltty/Input/ht/keypad.kti index 36239ae..5faccf2 100644 --- a/brltty/Input/ht/keypad.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/mc88.ktb b/brltty/Input/ht/mc88.ktb index 5c08160..c17ae30 100644 --- a/brltty/Input/ht/mc88.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/mdlr.ktb b/brltty/Input/ht/mdlr.ktb index 0a2dc27..fcbdea6 100644 --- a/brltty/Input/ht/mdlr.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/me.kti b/brltty/Input/ht/me.kti index 508d62e..26105d9 100644 --- a/brltty/Input/ht/me.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/me64.ktb b/brltty/Input/ht/me64.ktb index 5ca701f..42df3ac 100644 --- a/brltty/Input/ht/me64.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/me88.ktb b/brltty/Input/ht/me88.ktb index 869feae..5ec3027 100644 --- a/brltty/Input/ht/me88.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/rockers.kti b/brltty/Input/ht/rockers.kti index d802676..cb34b14 100644 --- a/brltty/Input/ht/rockers.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ht/wave.ktb b/brltty/Input/ht/wave.ktb index 1b93795..9e2cf70 100644 --- a/brltty/Input/ht/wave.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/hw/B80.ktb b/brltty/Input/hw/B80.ktb new file mode 100644 index 0000000..cd3417c --- /dev/null +++ b/brltty/Input/hw/B80.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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant B 80 + +include thumb.kti +include command.kti diff --git a/brltty/Input/hw/BI14.ktb b/brltty/Input/hw/BI14.ktb new file mode 100644 index 0000000..3f90bad --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant BI 14 + +include thumb.kti +include braille.kti +include joystick.kti diff --git a/brltty/Input/hw/BI32.ktb b/brltty/Input/hw/BI32.ktb new file mode 100644 index 0000000..4dea45b --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant BI 32 + +include thumb.kti +include braille.kti +include command.kti diff --git a/brltty/Input/hw/BI40.ktb b/brltty/Input/hw/BI40.ktb new file mode 100644 index 0000000..0cc4525 --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare Brailliant BI 40 + +include thumb.kti +include braille.kti +include command.kti diff --git a/brltty/Input/hw/braille.kti b/brltty/Input/hw/braille.kti new file mode 100644 index 0000000..a284f76 --- /dev/null +++ b/brltty/Input/hw/braille.kti @@ -0,0 +1,41 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +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 + +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 +map Back META +map Advance CONTROL + +bind Space+RoutingKey KEY_FUNCTION +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/brltty/Input/hw/command.kti b/brltty/Input/hw/command.kti new file mode 100644 index 0000000..89a92e7 --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +include ../bm/display6.kti +include ../bm/routing6.kti diff --git a/brltty/Input/hw/joystick.kti b/brltty/Input/hw/joystick.kti new file mode 100644 index 0000000..a585f81 --- /dev/null +++ b/brltty/Input/hw/joystick.kti @@ -0,0 +1,83 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +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. + +bind Up LNUP +bind Down LNDN +bind Left FWINLT +bind Right FWINRT +bind Action HOME + +bind Dot1+Up TOP +bind Dot1+Down BOT +bind Dot1+Left LNBEG +bind Dot1+Right LNEND +bind Dot1+Action BACK + +bind Dot2+Up KEY_CURSOR_UP +bind Dot2+Down KEY_CURSOR_DOWN +bind Dot2+Left KEY_CURSOR_LEFT +bind Dot2+Right KEY_CURSOR_RIGHT +bind Dot2+Action KEY_DELETE + +bind Dot3+Up KEY_PAGE_UP +bind Dot3+Down KEY_PAGE_DOWN +bind Dot3+Left KEY_HOME +bind Dot3+Right KEY_END +bind Dot3+Action KEY_INSERT + +bind Dot4+Up PRPROMPT +bind Dot4+Down NXPROMPT +bind Dot4+Left PRPGRPH +bind Dot4+Right NXPGRPH +bind Dot4+Action CSRTRK + +bind Dot5+Up PRDIFLN +bind Dot5+Down NXDIFLN +bind Dot5+Left FWINLTSKIP +bind Dot5+Right FWINRTSKIP +bind Dot5+Action CSRVIS + +bind Dot6+Up ATTRUP +bind Dot6+Down ATTRDN +bind Dot6+Left CHRLT +bind Dot6+Right CHRRT +bind Dot6+Action ATTRVIS + +bind Dot7+Up SAY_ABOVE +bind Dot7+Down SAY_BELOW +bind Dot7+Left MUTE +bind Dot7+Right SAY_LINE +bind Dot7+Action AUTOSPEAK + +bind Dot8+Up SAY_LOUDER +bind Dot8+Down SAY_SOFTER +bind Dot8+Left SAY_SLOWER +bind Dot8+Right SAY_FASTER +bind Dot8+Action SPKHOME + +bind RoutingKey+Up PRINDENT +bind RoutingKey+Down NXINDENT +bind RoutingKey+Left PRDIFCHAR +bind RoutingKey+Right NXDIFCHAR +bind RoutingKey+Action DESCCHAR + +include ../bm/routing.kti diff --git a/brltty/Input/hw/thumb.kti b/brltty/Input/hw/thumb.kti new file mode 100644 index 0000000..dbae88b --- /dev/null +++ b/brltty/Input/hw/thumb.kti @@ -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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +note There are four thumb keys on the front. From left to right, they are: +note * Previous, Back, Advance, Next. + +#################### +# Default Bindings # +#################### + +bind Back+Advance HOME +bind Back LNUP +bind Advance LNDN +bind Previous FWINLT +bind Next FWINRT + +bind Previous+Back TOP_LEFT +bind Previous+Advance BOT_LEFT +bind Next+Back PRDIFLN +bind Next+Advance NXDIFLN + +bind Previous+RoutingKey CLIP_NEW +bind Back+RoutingKey CLIP_ADD +bind Advance+RoutingKey COPY_RECT +bind Next+RoutingKey COPY_LINE +bind Previous+Next PASTE + + +################# +# Menu Bindings # +################# + +context menu + +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/brltty/Input/hw/touch.ktb b/brltty/Input/hw/touch.ktb new file mode 100644 index 0000000..5a0a5d1 --- /dev/null +++ b/brltty/Input/hw/touch.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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HumanWare BrailleNote Touch + +include thumb.kti +include braille.kti +include ../bm/routing.kti diff --git a/brltty/Input/ic/all.ktb b/brltty/Input/ic/all.ktb new file mode 100644 index 0000000..dd1fd56 --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title BrailleMe + +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/brltty/Input/ir/all.kti b/brltty/Input/ir/all.kti index 9f4192b..3e5dfa4 100644 --- a/brltty/Input/ir/all.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ir/brl.ktb b/brltty/Input/ir/brl.ktb index 81249a7..046fbb7 100644 --- a/brltty/Input/ir/brl.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ir/pc.ktb b/brltty/Input/ir/pc.ktb index 8573a76..5e6b512 100644 --- a/brltty/Input/ir/pc.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/md/common.kti b/brltty/Input/md/common.kti index 969066c..c81b973 100644 --- a/brltty/Input/md/common.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,20 +11,36 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### +note RoutingKey refers to any of the keys immediately behind the text cells. +note The long key in the center of the front surface is named Shift. +note * The two round keys to its left, from left to right, are named: Left, Up. +note * The two round keys to its right, from left to right, are named: Down, Right. + bind Left FWINLT bind Right FWINRT - bind Up LNUP bind Down LNDN +bind Shift+Left KEY_CURSOR_LEFT +bind Shift+Right KEY_CURSOR_RIGHT bind Shift+Up KEY_CURSOR_UP bind Shift+Down KEY_CURSOR_DOWN +bind Long+Left LNBEG +bind Long+Right LNEND +bind Long+Up TOP +bind Long+Down BOT + +bind Shift+Long+Left PRPGRPH +bind Shift+Long+Right NXPGRPH +bind Shift+Long+Up PRPROMPT +bind Shift+Long+Down NXPROMPT + bind RoutingKey ROUTE bind RoutingKey+Left CLIP_NEW bind RoutingKey+Up CLIP_APPEND diff --git a/brltty/Input/md/default.ktb b/brltty/Input/md/default.ktb index cdc9d1f..4b9f7f3 100644 --- a/brltty/Input/md/default.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/md/fk.ktb b/brltty/Input/md/fk.ktb index fa1e469..13ba827 100644 --- a/brltty/Input/md/fk.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/md/fk_s.ktb b/brltty/Input/md/fk_s.ktb index f102913..3812ea0 100644 --- a/brltty/Input/md/fk_s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/md/fkeys.kti b/brltty/Input/md/fkeys.kti index 8ce9e05..c560c35 100644 --- a/brltty/Input/md/fkeys.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,11 +11,15 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### +note There are five square keys at each end of the front surface. +note * The ones at the left, from left to right, are named: F5, F4, F3, F2, F1. +note * The ones at the right, from left to right, are named: F6, F7, F8, F9, F10. + bind F3 CHRLT bind F8 CHRRT @@ -43,11 +47,18 @@ bind Long+F6 ATTRBLINK bind F7 SKPBLNKWINS +bind F9 HELP +bind Shift+F9 LEARN +bind Long+F9 TIME + bind F10 PREFMENU bind Shift+F10 PASTE +bind long+F10 PREFLOAD +bind Shift+long+F10 PREFSAVE context menu -bind F9 MENU_PREV_SETTING -bind F10 MENU_NEXT_SETTING +bind F9 MENU_NEXT_SETTING +bind Shift+F9 MENU_PREV_SETTING +bind Shift+F10 MENU_PREV_LEVEL diff --git a/brltty/Input/md/kbd.ktb b/brltty/Input/md/kbd.ktb index d65cefe..4ff782f 100644 --- a/brltty/Input/md/kbd.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/md/keyboard.kti b/brltty/Input/md/keyboard.kti index b924b88..6ddd60a 100644 --- a/brltty/Input/md/keyboard.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/md/status.kti b/brltty/Input/md/status.kti index 81179d8..a77f4e0 100644 --- a/brltty/Input/md/status.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,10 +11,12 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### +note StatusKey refers to any of the keys immediately behind the status cells. + hotkey StatusKey.1 CSRHIDE+on CSRHIDE+off diff --git a/brltty/Input/menu.kti b/brltty/Input/menu.kti index ab9816f..98ef0b6 100644 --- a/brltty/Input/menu.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mm/common.kti b/brltty/Input/mm/common.kti index 6af4ca3..b2537b6 100644 --- a/brltty/Input/mm/common.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mm/pocket.ktb b/brltty/Input/mm/pocket.ktb index edf60f1..6beda35 100644 --- a/brltty/Input/mm/pocket.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mm/smart.ktb b/brltty/Input/mm/smart.ktb index dadda86..d6e899f 100644 --- a/brltty/Input/mm/smart.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd1_3.ktb b/brltty/Input/mt/bd1_3.ktb index b4b68ad..e1c006c 100644 --- a/brltty/Input/mt/bd1_3.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd1_3.kti b/brltty/Input/mt/bd1_3.kti index b1029cd..556cbaf 100644 --- a/brltty/Input/mt/bd1_3.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd1_3s.ktb b/brltty/Input/mt/bd1_3s.ktb index bb55c64..622f46a 100644 --- a/brltty/Input/mt/bd1_3s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd1_6.ktb b/brltty/Input/mt/bd1_6.ktb index e6888ce..5984c42 100644 --- a/brltty/Input/mt/bd1_6.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd1_6.kti b/brltty/Input/mt/bd1_6.kti index 1eda691..713914f 100644 --- a/brltty/Input/mt/bd1_6.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd1_6s.ktb b/brltty/Input/mt/bd1_6s.ktb index 16b0ccb..e5a9ae4 100644 --- a/brltty/Input/mt/bd1_6s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/bd2.ktb b/brltty/Input/mt/bd2.ktb index 753076e..6793893 100644 --- a/brltty/Input/mt/bd2.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/mt/status.kti b/brltty/Input/mt/status.kti index 3633810..9fcf360 100644 --- a/brltty/Input/mt/status.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/np/all.ktb b/brltty/Input/np/all.ktb index 32aef94..c5074d9 100644 --- a/brltty/Input/np/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pg/all.ktb b/brltty/Input/pg/all.ktb index 1680464..71b4eb0 100644 --- a/brltty/Input/pg/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/2d_l.ktb b/brltty/Input/pm/2d_l.ktb index 27413af..47a4249 100644 --- a/brltty/Input/pm/2d_l.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/2d_s.ktb b/brltty/Input/pm/2d_s.ktb index 1b0e34b..719ea34 100644 --- a/brltty/Input/pm/2d_s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/bar.kti b/brltty/Input/pm/bar.kti index d355be3..05b51d5 100644 --- a/brltty/Input/pm/bar.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/c.ktb b/brltty/Input/pm/c.ktb index e07492a..c73e14f 100644 --- a/brltty/Input/pm/c.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/c_486.ktb b/brltty/Input/pm/c_486.ktb index dcb01ed..497ae91 100644 --- a/brltty/Input/pm/c_486.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el2d_80s.ktb b/brltty/Input/pm/el2d_80s.ktb index 2e8fbbf..02f3829 100644 --- a/brltty/Input/pm/el2d_80s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el40c.ktb b/brltty/Input/pm/el40c.ktb index e31c8b0..4ee7fed 100644 --- a/brltty/Input/pm/el40c.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el40s.ktb b/brltty/Input/pm/el40s.ktb index d0033c1..3fd0a62 100644 --- a/brltty/Input/pm/el40s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el60c.ktb b/brltty/Input/pm/el60c.ktb index 1ba594c..e4b84a5 100644 --- a/brltty/Input/pm/el60c.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el66s.ktb b/brltty/Input/pm/el66s.ktb index 579258d..6375158 100644 --- a/brltty/Input/pm/el66s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el70s.ktb b/brltty/Input/pm/el70s.ktb index 0627d42..dc86a2c 100644 --- a/brltty/Input/pm/el70s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el80_ii.ktb b/brltty/Input/pm/el80_ii.ktb index f5d4deb..b884cf5 100644 --- a/brltty/Input/pm/el80_ii.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el80c.ktb b/brltty/Input/pm/el80c.ktb index 1add567..6915f8f 100644 --- a/brltty/Input/pm/el80c.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el80s.ktb b/brltty/Input/pm/el80s.ktb index af52e2b..9c120f6 100644 --- a/brltty/Input/pm/el80s.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el_2d_40.ktb b/brltty/Input/pm/el_2d_40.ktb index dea9142..a73066a 100644 --- a/brltty/Input/pm/el_2d_40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el_2d_66.ktb b/brltty/Input/pm/el_2d_66.ktb index cb0ab4e..3a0e2f3 100644 --- a/brltty/Input/pm/el_2d_66.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el_2d_80.ktb b/brltty/Input/pm/el_2d_80.ktb index fa087af..f572313 100644 --- a/brltty/Input/pm/el_2d_80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el_40_p.ktb b/brltty/Input/pm/el_40_p.ktb index f4c8eda..80266c9 100644 --- a/brltty/Input/pm/el_40_p.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/el_80.ktb b/brltty/Input/pm/el_80.ktb index dc792d1..691cc4a 100644 --- a/brltty/Input/pm/el_80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/elb_tr_20.ktb b/brltty/Input/pm/elb_tr_20.ktb index c6b2398..8867572 100644 --- a/brltty/Input/pm/elb_tr_20.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/elb_tr_32.ktb b/brltty/Input/pm/elb_tr_32.ktb index 4158aa3..4b68f6b 100644 --- a/brltty/Input/pm/elb_tr_32.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/elba_20.ktb b/brltty/Input/pm/elba_20.ktb index 79d7ca8..aa87484 100644 --- a/brltty/Input/pm/elba_20.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/elba_32.ktb b/brltty/Input/pm/elba_32.ktb index b8729b0..bd2a330 100644 --- a/brltty/Input/pm/elba_32.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/front13.kti b/brltty/Input/pm/front13.kti index af5e818..084cc6f 100644 --- a/brltty/Input/pm/front13.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/front9.kti b/brltty/Input/pm/front9.kti index 6ad38b2..e10100c 100644 --- a/brltty/Input/pm/front9.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/ib_80.ktb b/brltty/Input/pm/ib_80.ktb index 5d58d58..5081d6b 100644 --- a/brltty/Input/pm/ib_80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/keyboard.kti b/brltty/Input/pm/keyboard.kti index ab2b440..14b5b74 100644 --- a/brltty/Input/pm/keyboard.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/keys.kti b/brltty/Input/pm/keys.kti index 2c240fc..a633f9c 100644 --- a/brltty/Input/pm/keys.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/live.ktb b/brltty/Input/pm/live.ktb index 4e4c2c1..ea3a9df 100644 --- a/brltty/Input/pm/live.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/routing.kti b/brltty/Input/pm/routing.kti index ebe2df2..e503b67 100644 --- a/brltty/Input/pm/routing.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/status0.kti b/brltty/Input/pm/status0.kti index cf43552..f6a32b9 100644 --- a/brltty/Input/pm/status0.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/status13.kti b/brltty/Input/pm/status13.kti index 3e50240..4545e80 100644 --- a/brltty/Input/pm/status13.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/status2.kti b/brltty/Input/pm/status2.kti index ca9461c..e6cc8a7 100644 --- a/brltty/Input/pm/status2.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/status20.kti b/brltty/Input/pm/status20.kti index 1e5d954..f53fa3a 100644 --- a/brltty/Input/pm/status20.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/status22.kti b/brltty/Input/pm/status22.kti index 282f689..c90838c 100644 --- a/brltty/Input/pm/status22.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/status4.kti b/brltty/Input/pm/status4.kti index 4b11033..34189c1 100644 --- a/brltty/Input/pm/status4.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/switches.kti b/brltty/Input/pm/switches.kti index 6443351..d307442 100644 --- a/brltty/Input/pm/switches.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/pm/trio.ktb b/brltty/Input/pm/trio.ktb index 7960be7..2f5119d 100644 --- a/brltty/Input/pm/trio.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/sk/bdp.ktb b/brltty/Input/sk/bdp.ktb index 809c0a2..6a2c00c 100644 --- a/brltty/Input/sk/bdp.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/sk/ntk.ktb b/brltty/Input/sk/ntk.ktb index 8c9bb17..158f856 100644 --- a/brltty/Input/sk/ntk.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -127,9 +127,9 @@ bind Backspace+RightJoystickRight SAY_LINE bind Backspace+RightJoystickPress SPKHOME -#################### -# Default Bindings # -#################### +################# +# Menu Bindings # +################# context menu diff --git a/brltty/Input/toggle.kti b/brltty/Input/toggle.kti index 45ad4a8..e13dbfa 100644 --- a/brltty/Input/toggle.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/nav.kti b/brltty/Input/ts/nav.kti index da73973..fcaabb7 100644 --- a/brltty/Input/ts/nav.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/nav20.ktb b/brltty/Input/ts/nav20.ktb index 6981c97..f980bb5 100644 --- a/brltty/Input/ts/nav20.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/nav40.ktb b/brltty/Input/ts/nav40.ktb index 7e02557..d86b295 100644 --- a/brltty/Input/ts/nav40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/nav80.ktb b/brltty/Input/ts/nav80.ktb index a11baf9..8d3017c 100644 --- a/brltty/Input/ts/nav80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/nav_large.kti b/brltty/Input/ts/nav_large.kti index 8c7f95f..db06376 100644 --- a/brltty/Input/ts/nav_large.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/nav_small.kti b/brltty/Input/ts/nav_small.kti index 0dc2e2b..e0ef041 100644 --- a/brltty/Input/ts/nav_small.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/pb.kti b/brltty/Input/ts/pb.kti index 4465b99..93a96f0 100644 --- a/brltty/Input/ts/pb.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/pb40.ktb b/brltty/Input/ts/pb40.ktb index 5b930a5..dce265a 100644 --- a/brltty/Input/ts/pb40.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/pb65.ktb b/brltty/Input/ts/pb65.ktb index 0feb9b3..079b663 100644 --- a/brltty/Input/ts/pb65.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/pb80.ktb b/brltty/Input/ts/pb80.ktb index eb700c6..4739053 100644 --- a/brltty/Input/ts/pb80.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/pb_large.kti b/brltty/Input/ts/pb_large.kti index 512f038..957b85c 100644 --- a/brltty/Input/ts/pb_large.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/pb_small.kti b/brltty/Input/ts/pb_small.kti index a3c394d..a371cc5 100644 --- a/brltty/Input/ts/pb_small.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/ts/routing.kti b/brltty/Input/ts/routing.kti index 0e721b2..c384dc7 100644 --- a/brltty/Input/ts/routing.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/vo/all.ktb b/brltty/Input/vo/all.ktb index c260389..360918d 100644 --- a/brltty/Input/vo/all.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/vo/all.kti b/brltty/Input/vo/all.kti index 33ed7c5..f42ba16 100644 --- a/brltty/Input/vo/all.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Input/vo/bp.ktb b/brltty/Input/vo/bp.ktb index b3d26c8..314a859 100644 --- a/brltty/Input/vo/bp.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Keyboard/braille.ktb b/brltty/Keyboard/braille.ktb index 77a435c..3730649 100644 --- a/brltty/Keyboard/braille.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Keyboard/braille.kti b/brltty/Keyboard/braille.kti index 1ab0dcc..a4c3f9b 100644 --- a/brltty/Keyboard/braille.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Keyboard/desktop.ktb b/brltty/Keyboard/desktop.ktb index 416cda1..c6f32ab 100644 --- a/brltty/Keyboard/desktop.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Keyboard/desktop.kti b/brltty/Keyboard/desktop.kti index bba658f..4505700 100644 --- a/brltty/Keyboard/desktop.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Keyboard/keypad.ktb b/brltty/Keyboard/keypad.ktb index 31961d4..dad09c6 100644 --- a/brltty/Keyboard/keypad.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -94,6 +94,7 @@ assign kpEight KP8 assign kpNine KP9 assign kpDivide KPDivide assign kpMultiply KPMultiply +assign kpMinus KPMinus assign kpSay KPEnter include kp_say.kti diff --git a/brltty/Keyboard/kp_say.kti b/brltty/Keyboard/kp_say.kti index 52625dc..3995f86 100644 --- a/brltty/Keyboard/kp_say.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -25,7 +25,7 @@ bind \{kpSay}+!\{kpSeven} SAY_SLOWER bind \{kpSay}+!\{kpNine} SAY_FASTER bind \{kpSay}+!\{kpOne} SAY_SOFTER bind \{kpSay}+!\{kpThree} SAY_LOUDER -bind \{kpSay}+!\{kpMultiply} SPKHOME +bind \{kpSay}+!\{kpDivide} SPKHOME bind \{kpSay}+\{kpAlt}+!\{kpOne} ASPK_DEL_CHARS bind \{kpSay}+\{kpAlt}+!\{kpTwo} ASPK_REP_CHARS diff --git a/brltty/Keyboard/kp_speak.kti b/brltty/Keyboard/kp_speak.kti index f4f3fe6..bdb3cd0 100644 --- a/brltty/Keyboard/kp_speak.kti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -38,3 +38,6 @@ bind \{kpSpeak}+!\{kpDivide} SPEAK_CURR_LOCN bind \{kpSpeak}+\{kpAlt}+!\{kpDivide} SHOW_CURR_LOCN bind \{kpSpeak}+!\{kpMultiply} ROUTE_CURR_LOCN +bind \{kpSpeak}+!\{kpMinus} SPEAK_INDENT +bind \{kpSpeak}+\{kpAlt}+!\{kpMinus} ASPK_INDENT + diff --git a/brltty/Keyboard/laptop.ktb b/brltty/Keyboard/laptop.ktb index 25b7f95..7cf7697 100644 --- a/brltty/Keyboard/laptop.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -108,6 +108,7 @@ assign kpEight I assign kpNine O assign kpDivide Eight assign kpMultiply Nine +assign kpMinus Zero assign kpSay CapsLock+ShiftLeft include kp_say.kti diff --git a/brltty/Keyboard/sun_type6.ktb b/brltty/Keyboard/sun_type6.ktb index 68a4e65..8e2b3ac 100644 --- a/brltty/Keyboard/sun_type6.ktb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/alias.tti b/brltty/Text/alias.tti new file mode 100644 index 0000000..19eaf59 --- /dev/null +++ b/brltty/Text/alias.tti @@ -0,0 +1,80 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# This BRLTTY text subtable defines several useful character aliases + +# ensure that space is defined +ifNotGlyph \s + ifCell 0 + glyph \s 0 + else + char \s 0 + endIf +endIf + +# characters that represent a space +alias \xA0 \s # no-break space +alias \u2002 \s # en space +alias \u2003 \s # em space +alias \u2004 \s # three-per-em space +alias \u2005 \s # four-per-em space +alias \u2006 \s # six-per-em space +alias \u2007 \s # figure space +alias \u2008 \s # punctuation space +alias \u2009 \s # thin space +alias \u200A \s # hair space +alias \u202F \s # narrow no-break space +alias \u205F \s # medium mathematical space + +ifGlyph - + # characters that represent a dash + alias \u2012 - # figure dash + alias \u2013 - # en dash + alias \u2014 - # em dash + alias \u2448 - # ocr dash + alias \u301C - # wave dash + alias \u3030 - # wavy dash + alias \uFE58 - # small em dash + + # characters that represent a hyphen + alias \xAD - # soft hyphen + alias \u2010 - # hyphen + alias \u2011 - # non-breaking hyphen + + # characters that represent a minus sign + alias \u2052 - # commercial minus sign + alias \u2212 - # minus sign + + # characters that can represent either a hyphen or a minus sign + alias \uFE63 - # small hyphen-minus + alias \uFF0D - # fullwidth hyphen-minus + + # other characters that can look like a dash + alias \u2015 - # horizontal bar +endIf + +ifGlyph ' + # characters commonly (mis)used to represent an apostrophe + alias \u2018 ' # left single quotation mark + alias \u2019 ' # right single quotation mark +endIf + +# degree signs +ifGlyph C alias \u2103 C # degree Celsius +ifGlyph F alias \u2109 F # degree Fahrenheit + diff --git a/brltty/Text/ar.ttb b/brltty/Text/ar.ttb index c52b4e6..ef8be23 100644 --- a/brltty/Text/ar.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -26,9 +26,6 @@ # Converted from liblouis table by Samuel Thibault # generated by ttbtest: charset=iso-8859-6 -char \x09 ( ) # 09 ⠀ [CHARACTER TABULATION] -char \x0A ( ) # 0A ⠀ [LINE FEED (LF)] -char \x0D ( ) # 0D ⠀ [CARRIAGE RETURN (CR)] char \x20 ( ) # 20 ⠀ [SPACE] char \x21 ( 23 5 ) # 21 ⠖ ! [EXCLAMATION MARK] char \x22 ( 23 56 ) # 22 ⠶ " [QUOTATION MARK] @@ -112,9 +109,7 @@ char \x79 (1 3456 ) # 79 ⠽ y [LATIN SMALL LETTER Y] char \x7A (1 3 56 ) # 7A ⠵ z [LATIN SMALL LETTER Z] char \x7C (12 45 ) # 7C ⠛ | [VERTICAL LINE] char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] -char \xA0 ( ) # A0 ⠀   [NO-BREAK SPACE] char \u060C ( 5 ) # AC ⠐ ، [ARABIC COMMA] -char \xAD ( 3 6 ) # AD ⠤ ­ [SOFT HYPHEN] char \u061B ( 56 ) # BB ⠰ ؛ [ARABIC SEMICOLON] char \u061F ( 23 6 ) # BF ⠦ ؟ [ARABIC QUESTION MARK] char \u0621 ( 3 ) # C1 ⠄ ء [ARABIC LETTER HAMZA] @@ -165,7 +160,6 @@ char \u0652 ( 2 5 ) # F2 ⠒ ْ [ARABIC SUKUN] char \xB0 ( 3 56 ) # ⠴ ° [DEGREE SIGN] char \xBF ( 23 6 ) # ⠦ ¿ [INVERTED QUESTION MARK] char \u06D4 ( 2 56 ) # ⠲ ۔ [ARABIC FULL STOP] -char \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] char \u2011 ( 234 78) # ⣎ ‑ [NON-BREAKING HYPHEN] char \u2018 ( 3 ) # ⠄ ‘ [LEFT SINGLE QUOTATION MARK] char \u2019 ( 3 ) # ⠄ ’ [RIGHT SINGLE QUOTATION MARK] diff --git a/brltty/Text/as.ttb b/brltty/Text/as.ttb index 9663bf0..1f917de 100644 --- a/brltty/Text/as.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ascii-basic.tti b/brltty/Text/ascii-basic.tti index b5d4aee..03fc5da 100644 --- a/brltty/Text/ascii-basic.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/awa.ttb b/brltty/Text/awa.ttb index 63ba06c..41cd1c1 100644 --- a/brltty/Text/awa.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/bengali.tti b/brltty/Text/bengali.tti index 7f6bfd9..ff30d08 100644 --- a/brltty/Text/bengali.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/bg.ttb b/brltty/Text/bg.ttb index 7ece109..7e6c836 100644 --- a/brltty/Text/bg.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/bh.ttb b/brltty/Text/bh.ttb index e49d399..e070b06 100644 --- a/brltty/Text/bh.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/blocks.tti b/brltty/Text/blocks.tti index be178e8..f3b6e4f 100644 --- a/brltty/Text/blocks.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/bn.ttb b/brltty/Text/bn.ttb index c2a2731..51b5644 100644 --- a/brltty/Text/bn.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/bo.ttb b/brltty/Text/bo.ttb index 7bea6e1..df7ac46 100644 --- a/brltty/Text/bo.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/boxes.tti b/brltty/Text/boxes.tti index 7f9889d..dc54ddd 100644 --- a/brltty/Text/boxes.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/bra.ttb b/brltty/Text/bra.ttb index 8d34a0a..3b893b6 100644 --- a/brltty/Text/bra.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/brf.ttb b/brltty/Text/brf.ttb index 893c7f5..0f3db95 100644 --- a/brltty/Text/brf.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/common.tti b/brltty/Text/common.tti index 0f0326b..de60baa 100644 --- a/brltty/Text/common.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -20,11 +20,7 @@ # sole purpose is to be a common place wherein to include text subtables which # define braille representations that are generally useful in all contexts. -# space characters -include spaces.tti - -# box drawing characters +include alias.tti include boxes.tti - -# block characters include blocks.tti +include win-1252.tti diff --git a/brltty/Text/cs.ttb b/brltty/Text/cs.ttb index 4cd7552..d59ef69 100644 --- a/brltty/Text/cs.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ctl-latin.tti b/brltty/Text/ctl-latin.tti index a294917..664b48a 100644 --- a/brltty/Text/ctl-latin.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/cy.ttb b/brltty/Text/cy.ttb index 2aadac6..64564b5 100644 --- a/brltty/Text/cy.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -92,7 +92,6 @@ char \xFC (1 3 6 ) # FC ⠥ ü [LATIN SMALL LETTER U WITH DIAERESIS] char \xFD (1 3456 ) # FD ⠽ ý [LATIN SMALL LETTER Y WITH ACUTE] char \u0177 (1 3456 ) # FE ⠽ ŷ [LATIN SMALL LETTER Y WITH CIRCUMFLEX] char \xFF (1 3456 ) # FF ⠽ ÿ [LATIN SMALL LETTER Y WITH DIAERESIS] -char \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] char \u2011 ( 234 78) # ⣎ ‑ [NON-BREAKING HYPHEN] include common.tti diff --git a/brltty/Text/da-1252.ttb b/brltty/Text/da-1252.ttb index f7b8832..8b8b41c 100644 --- a/brltty/Text/da-1252.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/da-lt.ttb b/brltty/Text/da-lt.ttb index 2e6cb8f..d535c76 100644 --- a/brltty/Text/da-lt.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/da.ttb b/brltty/Text/da.ttb index 746451b..e6c52c9 100644 --- a/brltty/Text/da.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/de-chess.tti b/brltty/Text/de-chess.tti index 041db42..348f13d 100644 --- a/brltty/Text/de-chess.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -21,15 +21,15 @@ # See: http://en.wikipedia.org/wiki/Chess_symbols_in_Unicode -glyph \u2654 (1 3 7 ) # ⡅ ♔ [WHITE CHESS KING] -glyph \u2655 (1 45 7 ) # ⡙ ♕ [WHITE CHESS QUEEN] -glyph \u2656 ( 2345 7 ) # ⡞ ♖ [WHITE CHESS ROOK] -glyph \u2657 (123 7 ) # ⡇ ♗ [WHITE CHESS BISHOP] -glyph \u2658 ( 234 7 ) # ⡎ ♘ [WHITE CHESS KNIGHT] -glyph \u2659 (12 7 ) # ⡃ ♙ [WHITE CHESS PAWN] -glyph \u265A (1 3 ) # ⠅ ♚ [BLACK CHESS KING] -glyph \u265B (1 45 ) # ⠙ ♛ [BLACK CHESS QUEEN] -glyph \u265C ( 2345 ) # ⠞ ♜ [BLACK CHESS ROOK] -glyph \u265D (123 ) # ⠇ ♝ [BLACK CHESS BISHOP] -glyph \u265E ( 234 ) # ⠎ ♞ [BLACK CHESS KNIGHT] -glyph \u265F (12 ) # ⠃ ♟ [BLACK CHESS PAWN] +alias \u2654 K # ♔ [WHITE CHESS KING] +alias \u2655 D # ♕ [WHITE CHESS QUEEN] +alias \u2656 T # ♖ [WHITE CHESS ROOK] +alias \u2657 L # ♗ [WHITE CHESS BISHOP] +alias \u2658 S # ♘ [WHITE CHESS KNIGHT] +alias \u2659 B # ♙ [WHITE CHESS PAWN] +alias \u265A k # ♚ [BLACK CHESS KING] +alias \u265B d # ♛ [BLACK CHESS QUEEN] +alias \u265C t # ♜ [BLACK CHESS ROOK] +alias \u265D l # ♝ [BLACK CHESS BISHOP] +alias \u265E s # ♞ [BLACK CHESS KNIGHT] +alias \u265F b # ♟ [BLACK CHESS PAWN] diff --git a/brltty/Text/de.ttb b/brltty/Text/de.ttb index c60e715..c77a7b0 100644 --- a/brltty/Text/de.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -76,38 +76,6 @@ char \x7C ( 34 ) # 7C ⠌ | [VERTICAL LINE] char \x7D ( 23456 ) # 7D ⠾ } [RIGHT CURLY BRACKET] char \x7E ( 234 6 ) # 7E ⠮ ~ [TILDE] char \x7F ( 456 ) # 7F ⠸ [DELETE] -char \x80 ( 2 67 ) # 80 ⡢ [] -char \x81 (1 34 6 8) # 81 ⢭ [] -char \x82 ( 2 56 8) # 82 ⢲ [BREAK PERMITTED HERE] -char \x83 ( 2 5 8) # 83 ⢒ [NO BREAK HERE] -char \x84 ( 3 5 7 ) # 84 ⡔ [] -char \x85 (1 8) # 85 ⢁ [NEXT LINE (NEL)] -char \x86 ( 234 8) # 86 ⢎ [START OF SELECTED AREA] -char \x87 ( 2345 8) # 87 ⢞ [END OF SELECTED AREA] -char \x88 ( 3 56 8) # 88 ⢴ [CHARACTER TABULATION SET] -char \x89 (1 45 8) # 89 ⢙ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 23 5 8) # 8A ⢖ [LINE TABULATION SET] -char \x8B ( 5 78) # 8B ⣐ [PARTIAL LINE FORWARD] -char \x8C (1 5 8) # 8C ⢑ [PARTIAL LINE BACKWARD] -char \x8D ( 2 4 67 ) # 8D ⡪ [REVERSE LINE FEED] -char \x8E ( 67 ) # 8E ⡠ [SINGLE SHIFT TWO] -char \x8F (12 4 67 ) # 8F ⡫ [SINGLE SHIFT THREE] -char \x90 ( 23 567 ) # 90 ⡶ [DEVICE CONTROL STRING] -char \x91 ( 2 6 8) # 91 ⢢ [PRIVATE USE ONE] -char \x92 ( 6 8) # 92 ⢠ [PRIVATE USE TWO] -char \x93 (12 67 ) # 93 ⡣ [SET TRANSMIT STATE] -char \x94 ( 3 5 78) # 94 ⣔ [CANCEL CHARACTER] -char \x95 ( 45 8) # 95 ⢘ [MESSAGE WAITING] -char \x96 (1 4 67 ) # 96 ⡩ [START OF GUARDED AREA] -char \x97 ( 4 8) # 97 ⢈ [END OF GUARDED AREA] -char \x98 (12 4567 ) # 98 ⡻ [START OF STRING] -char \x99 (1 3 5 8) # 99 ⢕ [] -char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 56 8) # 9B ⢰ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 3 6 8) # 9C ⢤ [STRING TERMINATOR] -char \x9D ( 34 67 ) # 9D ⡬ [OPERATING SYSTEM COMMAND] -char \x9E ( 23 5 7 ) # 9E ⡖ [PRIVACY MESSAGE] -char \x9F (12 4 678) # 9F ⣫ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 ( 5 8) # A2 ⢐ ¢ [CENT SIGN] char \xA3 ( 4 67 ) # A3 ⡨ £ [POUND SIGN] @@ -204,17 +172,12 @@ char \xFD ( 23 5678) # FD ⣶ ý [LATIN SMALL LETTER Y WITH ACUTE] char \xFE (1234567 ) # FE ⡿ þ [LATIN SMALL LETTER THORN] char \xFF (123456 8) # FF ⢿ ÿ [LATIN SMALL LETTER Y WITH DIAERESIS] -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 \u2019 \x27 # ’ [RIGHT SINGLE QUOTATION MARK] -alias \u2212 \x2D # − [MINUS SIGN] alias \u2295 \x2B # ⊕ [CIRCLED PLUS] alias \u2296 \x2D # ⊖ [CIRCLED MINUS] alias \u2298 \x2F # ⊘ [CIRCLED DIVISION SLASH] alias \u229B \x2A # ⊛ [CIRCLED ASTERISK OPERATOR] alias \u229C \x3D # ⊜ [CIRCLED EQUALS] +include de-chess.tti include common.tti diff --git a/brltty/Text/devanagari.tti b/brltty/Text/devanagari.tti index ebfce31..7bfa58f 100644 --- a/brltty/Text/devanagari.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/dra.ttb b/brltty/Text/dra.ttb index 2d3bde0..1cc3294 100644 --- a/brltty/Text/dra.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/el.ttb b/brltty/Text/el.ttb index 75ba5f9..8a4f1f0 100644 --- a/brltty/Text/el.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -25,13 +25,7 @@ include greek.tti include ltr-latin.tti -glyph \t ( ) # 09 [CHARACTER TABULATION] -glyph \r ( ) # 0D [CARRIAGE RETURN (CR)] - char \x2D ( 3 6 ) # ⠤ - [HYPHEN-MINUS] -glyph \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] -glyph \u2011 ( 3 6 ) # ⠤ ‑ [NON-BREAKING HYPHEN] -glyph \u2013 ( 3 6 ) # ⠤ – [EN DASH] char \x27 ( 3 ) # ⠄ ' [APOSTROPHE] char \x2C ( 2 ) # ⠂ , [COMMA] diff --git a/brltty/Text/en-chess.tti b/brltty/Text/en-chess.tti index 855a14e..56ebc48 100644 --- a/brltty/Text/en-chess.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -21,15 +21,15 @@ # See: http://en.wikipedia.org/wiki/Chess_symbols_in_Unicode -glyph \u2654 (1 3 7 ) # ⡅ ♔ [WHITE CHESS KING] -glyph \u2655 (12345 7 ) # ⡟ ♕ [WHITE CHESS QUEEN] -glyph \u2656 (123 5 7 ) # ⡗ ♖ [WHITE CHESS ROOK] -glyph \u2657 (12 7 ) # ⡃ ♗ [WHITE CHESS BISHOP] -glyph \u2658 (1 345 7 ) # ⡝ ♘ [WHITE CHESS KNIGHT] -glyph \u2659 (1234 7 ) # ⡏ ♙ [WHITE CHESS PAWN] -glyph \u265A (1 3 ) # ⠅ ♚ [BLACK CHESS KING] -glyph \u265B (12345 ) # ⠟ ♛ [BLACK CHESS QUEEN] -glyph \u265C (123 5 ) # ⠗ ♜ [BLACK CHESS ROOK] -glyph \u265D (12 ) # ⠃ ♝ [BLACK CHESS BISHOP] -glyph \u265E (1 345 ) # ⠝ ♞ [BLACK CHESS KNIGHT] -glyph \u265F (1234 ) # ⠏ ♟ [BLACK CHESS PAWN] +alias \u2654 K # ♔ [WHITE CHESS KING] +alias \u2655 Q # ♕ [WHITE CHESS QUEEN] +alias \u2656 R # ♖ [WHITE CHESS ROOK] +alias \u2657 B # ♗ [WHITE CHESS BISHOP] +alias \u2658 N # ♘ [WHITE CHESS KNIGHT] +alias \u2659 P # ♙ [WHITE CHESS PAWN] +alias \u265A k # ♚ [BLACK CHESS KING] +alias \u265B q # ♛ [BLACK CHESS QUEEN] +alias \u265C r # ♜ [BLACK CHESS ROOK] +alias \u265D b # ♝ [BLACK CHESS BISHOP] +alias \u265E n # ♞ [BLACK CHESS KNIGHT] +alias \u265F p # ♟ [BLACK CHESS PAWN] diff --git a/brltty/Text/en-na-ascii.tti b/brltty/Text/en-na-ascii.tti index 00f5378..fde5c5c 100644 --- a/brltty/Text/en-na-ascii.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/en-nabcc.ttb b/brltty/Text/en-nabcc.ttb index 7f4c9c9..c06ed7c 100644 --- a/brltty/Text/en-nabcc.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/en.ttb b/brltty/Text/en.ttb index b57cfe3..c2ca7ec 100644 --- a/brltty/Text/en.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/en_CA.ttb b/brltty/Text/en_CA.ttb index db7ac12..85d4098 100644 --- a/brltty/Text/en_CA.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -55,11 +55,6 @@ char \x19 (1 345678) # ⣽ [END OF MEDIUM] char \x1A (1 3 5678) # ⣵ [SUBSTITUTE] # equivalents to \x2D [HYPHEN-MINUS] -char \xAD ( 3 6 ) # ⠤ ­ [SOFT HYPHEN] -char \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] -char \u2011 ( 3 6 ) # ⠤ ‑ [NON-BREAKING HYPHEN] -char \u2013 ( 3 6 ) # ⠤ – [EN DASH] -char \u2212 ( 3 6 ) # ⠤ − [MINUS SIGN] # equivalents to \x7C [VERTICAL LINE] char \xA6 (12 56 ) # ⠳ ¦ [BROKEN BAR] diff --git a/brltty/Text/en_GB.ttb b/brltty/Text/en_GB.ttb index d39df1d..5e92790 100644 --- a/brltty/Text/en_GB.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -78,38 +78,6 @@ char \x7C ( 34 6 ) # 7C ⠬ | [VERTICAL LINE] char \x7D ( 23456 ) # 7D ⠾ } [RIGHT CURLY BRACKET] char \x7E ( 6 ) # 7E ⠠ ~ [TILDE] char \x7F ( 5 7 ) # 7F ⡐ [DELETE] -char \x80 ( 2 67 ) # 80 ⡢ [] -char \x81 (1 34 6 8) # 81 ⢭ [] -char \x82 ( 2 56 8) # 82 ⢲ [BREAK PERMITTED HERE] -char \x83 ( 2 5 8) # 83 ⢒ [NO BREAK HERE] -char \x84 ( 3 5 7 ) # 84 ⡔ [] -char \x85 (1 8) # 85 ⢁ [NEXT LINE (NEL)] -char \x86 ( 234 8) # 86 ⢎ [START OF SELECTED AREA] -char \x87 ( 2345 8) # 87 ⢞ [END OF SELECTED AREA] -char \x88 ( 3 56 8) # 88 ⢴ [CHARACTER TABULATION SET] -char \x89 (1 45 8) # 89 ⢙ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 23 5 8) # 8A ⢖ [LINE TABULATION SET] -char \x8B ( 345 78) # 8B ⣜ [PARTIAL LINE FORWARD] -char \x8C (1 5 8) # 8C ⢑ [PARTIAL LINE BACKWARD] -char \x8D ( 2 4 67 ) # 8D ⡪ [REVERSE LINE FEED] -char \x8E ( 4567 ) # 8E ⡸ [SINGLE SHIFT TWO] -char \x8F (12 4 67 ) # 8F ⡫ [SINGLE SHIFT THREE] -char \x90 ( 23 567 ) # 90 ⡶ [DEVICE CONTROL STRING] -char \x91 ( 2 6 8) # 91 ⢢ [PRIVATE USE ONE] -char \x92 ( 6 8) # 92 ⢠ [PRIVATE USE TWO] -char \x93 (12 67 ) # 93 ⡣ [SET TRANSMIT STATE] -char \x94 ( 3 5 78) # 94 ⣔ [CANCEL CHARACTER] -char \x95 ( 45 8) # 95 ⢘ [MESSAGE WAITING] -char \x96 (1 4 67 ) # 96 ⡩ [START OF GUARDED AREA] -char \x97 ( 4 8) # 97 ⢈ [END OF GUARDED AREA] -char \x98 (12 4567 ) # 98 ⡻ [START OF STRING] -char \x99 (1 3 5 8) # 99 ⢕ [] -char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 56 8) # 9B ⢰ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 3 6 8) # 9C ⢤ [STRING TERMINATOR] -char \x9D ( 34 7 ) # 9D ⡌ [OPERATING SYSTEM COMMAND] -char \x9E ( 23 5 7 ) # 9E ⡖ [PRIVACY MESSAGE] -char \x9F (12 4 678) # 9F ⣫ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 ( 5 8) # A2 ⢐ ¢ [CENT SIGN] char \xA3 ( 4 67 ) # A3 ⡨ £ [POUND SIGN] diff --git a/brltty/Text/en_US.ttb b/brltty/Text/en_US.ttb index 11b1bce..39ac474 100644 --- a/brltty/Text/en_US.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -72,38 +72,6 @@ char \x7C (12 56 ) # 7C ⠳ | [VERTICAL LINE] char \x7D (12 456 ) # 7D ⠻ } [RIGHT CURLY BRACKET] char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] char \x7F ( 4567 ) # 7F ⡸ [DELETE] -char \x80 ( 2 67 ) # 80 ⡢ [] -char \x81 (1 34 6 8) # 81 ⢭ [] -char \x82 ( 2 56 8) # 82 ⢲ [BREAK PERMITTED HERE] -char \x83 ( 2 5 8) # 83 ⢒ [NO BREAK HERE] -char \x84 ( 3 5 7 ) # 84 ⡔ [] -char \x85 (1 8) # 85 ⢁ [NEXT LINE (NEL)] -char \x86 ( 234 8) # 86 ⢎ [START OF SELECTED AREA] -char \x87 ( 2345 8) # 87 ⢞ [END OF SELECTED AREA] -char \x88 ( 3 56 8) # 88 ⢴ [CHARACTER TABULATION SET] -char \x89 (1 45 8) # 89 ⢙ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 23 5 8) # 8A ⢖ [LINE TABULATION SET] -char \x8B ( 5 78) # 8B ⣐ [PARTIAL LINE FORWARD] -char \x8C (1 5 8) # 8C ⢑ [PARTIAL LINE BACKWARD] -char \x8D ( 234 678) # 8D ⣮ [REVERSE LINE FEED] -char \x8E ( 67 ) # 8E ⡠ [SINGLE SHIFT TWO] -char \x8F (12 4 67 ) # 8F ⡫ [SINGLE SHIFT THREE] -char \x90 ( 23 567 ) # 90 ⡶ [DEVICE CONTROL STRING] -char \x91 ( 2 6 8) # 91 ⢢ [PRIVATE USE ONE] -char \x92 ( 6 8) # 92 ⢠ [PRIVATE USE TWO] -char \x93 ( 34 7 ) # 93 ⡌ [SET TRANSMIT STATE] -char \x94 ( 3 5 78) # 94 ⣔ [CANCEL CHARACTER] -char \x95 ( 45 8) # 95 ⢘ [MESSAGE WAITING] -char \x96 (1 4 67 ) # 96 ⡩ [START OF GUARDED AREA] -char \x97 ( 4 8) # 97 ⢈ [END OF GUARDED AREA] -char \x98 ( 234567 ) # 98 ⡾ [START OF STRING] -char \x99 (1 3 5 8) # 99 ⢕ [] -char \x9A (12 67 ) # 9A ⡣ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 56 8) # 9B ⢰ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 3 6 8) # 9C ⢤ [STRING TERMINATOR] -char \x9D ( 34 67 ) # 9D ⡬ [OPERATING SYSTEM COMMAND] -char \x9E ( 23 5 7 ) # 9E ⡖ [PRIVACY MESSAGE] -char \x9F (12 4 678) # 9F ⣫ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 ( 5 8) # A2 ⢐ ¢ [CENT SIGN] char \xA3 ( 4 67 ) # A3 ⡨ £ [POUND SIGN] diff --git a/brltty/Text/eo.ttb b/brltty/Text/eo.ttb index 5338b42..ae3b7ce 100644 --- a/brltty/Text/eo.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/es.ttb b/brltty/Text/es.ttb index 7b2a99e..597c5ac 100644 --- a/brltty/Text/es.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -100,38 +100,6 @@ char \x7C ( 456 8) # 7C ⢸ | [VERTICAL LINE] char \x7D ( 3 5 ) # 7D ⠔ } [RIGHT CURLY BRACKET] char \x7E ( 5 7 ) # 7E ⡐ ~ [TILDE] char \x7F ( 7 ) # 7F ⡀ [DELETE] -char \x80 (123 5 8) # 80 ⢗ [] -char \x81 ( 3 5 8) # 81 ⢔ [] -char \x82 ( 3 7 ) # 82 ⡄ [BREAK PERMITTED HERE] -char \x83 (12 4 8) # 83 ⢋ [NO BREAK HERE] -char \x84 ( 78) # 84 ⣀ [] -char \x85 (12 67 ) # 85 ⡣ [NEXT LINE (NEL)] -char \x86 ( 2 8) # 86 ⢂ [START OF SELECTED AREA] -char \x87 ( 2345 8) # 87 ⢞ [END OF SELECTED AREA] -char \x88 ( 45 8) # 88 ⢘ [CHARACTER TABULATION SET] -char \x89 ( 45678) # 89 ⣸ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A (123456 8) # 8A ⢿ [LINE TABULATION SET] -char \x8B (12 5 8) # 8B ⢓ [PARTIAL LINE FORWARD] -char \x8C (1 4 6 8) # 8C ⢩ [PARTIAL LINE BACKWARD] -char \x8D ( 3 5 7 ) # 8D ⡔ [REVERSE LINE FEED] -char \x8E (1 4 8) # 8E ⢉ [SINGLE SHIFT TWO] -char \x8F ( 2 7 ) # 8F ⡂ [SINGLE SHIFT THREE] -char \x90 ( 6 8) # 90 ⢠ [DEVICE CONTROL STRING] -char \x91 (1 3 8) # 91 ⢅ [PRIVATE USE ONE] -char \x92 ( 3 78) # 92 ⣄ [PRIVATE USE TWO] -char \x93 (1 456 8) # 93 ⢹ [SET TRANSMIT STATE] -char \x94 (1234 8) # 94 ⢏ [CANCEL CHARACTER] -char \x95 (1 45 8) # 95 ⢙ [MESSAGE WAITING] -char \x96 ( 3 6 8) # 96 ⢤ [START OF GUARDED AREA] -char \x97 ( 3 678) # 97 ⣤ [END OF GUARDED AREA] -char \x98 (1 3456 8) # 98 ⢽ [START OF STRING] -char \x99 ( 2 4 67 ) # 99 ⡪ [] -char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 3456 8) # 9B ⢼ [CONTROL SEQUENCE INTRODUCER] -char \x9C (123 8) # 9C ⢇ [STRING TERMINATOR] -char \x9D ( 2 5678) # 9D ⣲ [OPERATING SYSTEM COMMAND] -char \x9E ( 2 56 8) # 9E ⢲ [PRIVACY MESSAGE] -char \x9F ( 3 67 ) # 9F ⡤ [APPLICATION PROGRAM COMMAND] char \xA1 ( 23 5 78) # A1 ⣖ ¡ [INVERTED EXCLAMATION MARK] char \xA2 (12 678) # A2 ⣣ ¢ [CENT SIGN] char \xA3 ( 23 78) # A3 ⣆ £ [POUND SIGN] diff --git a/brltty/Text/et.ttb b/brltty/Text/et.ttb index 5cb26fb..2c4d6c4 100644 --- a/brltty/Text/et.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/fi.ttb b/brltty/Text/fi.ttb index c7932a2..5df4844 100644 --- a/brltty/Text/fi.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/fr-2007.ttb b/brltty/Text/fr-2007.ttb index 52b6be3..7df8517 100644 --- a/brltty/Text/fr-2007.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/fr-cbifs.ttb b/brltty/Text/fr-cbifs.ttb index a1e054d..832b4cf 100644 --- a/brltty/Text/fr-cbifs.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/fr-vs.ttb b/brltty/Text/fr-vs.ttb index d60144f..ec2af22 100644 --- a/brltty/Text/fr-vs.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/fr.ttb b/brltty/Text/fr.ttb index 3dcd967..74ac716 100644 --- a/brltty/Text/fr.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/fr_CA.ttb b/brltty/Text/fr_CA.ttb index bbd93fe..cd2c33e 100644 --- a/brltty/Text/fr_CA.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -71,38 +71,6 @@ char \x7C (12 56 ) # 7C ⠳ | [VERTICAL LINE] char \x7D (12 456 ) # 7D ⠻ } [RIGHT CURLY BRACKET] char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] char \x7F ( 4567 ) # 7F ⡸ [DELETE] -char \x80 ( 3 78) # 80 ⣄ [] -char \x81 (12 6 8) # 81 ⢣ [] -char \x82 ( 23456 8) # 82 ⢾ [BREAK PERMITTED HERE] -char \x83 ( 5 8) # 83 ⢐ [NO BREAK HERE] -char \x84 (12 4 6 8) # 84 ⢫ [] -char \x85 ( 8) # 85 ⢀ [NEXT LINE (NEL)] -char \x86 (1 4 6 8) # 86 ⢩ [START OF SELECTED AREA] -char \x87 ( 3 8) # 87 ⢄ [END OF SELECTED AREA] -char \x88 (1 6 8) # 88 ⢡ [CHARACTER TABULATION SET] -char \x89 ( 34 6 8) # 89 ⢬ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A (123 56 8) # 8A ⢷ [LINE TABULATION SET] -char \x8B ( 34 8) # 8B ⢌ [PARTIAL LINE FORWARD] -char \x8C ( 4 6 8) # 8C ⢨ [PARTIAL LINE BACKWARD] -char \x8D ( 6 8) # 8D ⢠ [REVERSE LINE FEED] -char \x8E (12 4 678) # 8E ⣫ [SINGLE SHIFT TWO] -char \x8F (1 4 678) # 8F ⣩ [SINGLE SHIFT THREE] -char \x90 ( 2345678) # 90 ⣾ [DEVICE CONTROL STRING] -char \x91 ( 2 67 ) # 91 ⡢ [PRIVATE USE ONE] -char \x92 (1234 678) # 92 ⣯ [PRIVATE USE TWO] -char \x93 ( 2 56 8) # 93 ⢲ [SET TRANSMIT STATE] -char \x94 ( 23 56 8) # 94 ⢶ [CANCEL CHARACTER] -char \x95 ( 23 8) # 95 ⢆ [MESSAGE WAITING] -char \x96 ( 56 8) # 96 ⢰ [START OF GUARDED AREA] -char \x97 ( 3 5 8) # 97 ⢔ [END OF GUARDED AREA] -char \x98 (1 45678) # 98 ⣹ [START OF STRING] -char \x99 ( 23 5 78) # 99 ⣖ [] -char \x9A (12 678) # 9A ⣣ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 2 5 8) # 9B ⢒ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 23 567 ) # 9C ⡶ [STRING TERMINATOR] -char \x9D ( 2 78) # 9D ⣂ [OPERATING SYSTEM COMMAND] -char \x9E ( 45 8) # 9E ⢘ [PRIVACY MESSAGE] -char \x9F ( 456 8) # 9F ⢸ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 ( 2 4 6 8) # A2 ⢪ ¢ [CENT SIGN] char \xA3 (12 56 8) # A3 ⢳ £ [POUND SIGN] diff --git a/brltty/Text/fr_FR.ttb b/brltty/Text/fr_FR.ttb index 7f07a3a..4698f2b 100644 --- a/brltty/Text/fr_FR.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -76,38 +76,6 @@ char \x7C ( 234 67 ) # 7C ⡮ | [VERTICAL LINE] char \x7D ( 234567 ) # 7D ⡾ } [RIGHT CURLY BRACKET] char \x7E ( 34 7 ) # 7E ⡌ ~ [TILDE] char \x7F ( 4 67 ) # 7F ⡨ [DELETE] -char \x80 ( 345 8) # 80 ⢜ [] -char \x81 (1 8) # 81 ⢁ [] -char \x82 (12 8) # 82 ⢃ [BREAK PERMITTED HERE] -char \x83 ( 23 567 ) # 83 ⡶ [NO BREAK HERE] -char \x84 ( 3 8) # 84 ⢄ [] -char \x85 ( 3 5 8) # 85 ⢔ [NEXT LINE (NEL)] -char \x86 ( 23 6 8) # 86 ⢦ [START OF SELECTED AREA] -char \x87 (12 45 8) # 87 ⢛ [END OF SELECTED AREA] -char \x88 (12 5 8) # 88 ⢓ [CHARACTER TABULATION SET] -char \x89 ( 2 4 8) # 89 ⢊ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 2 45 8) # 8A ⢚ [LINE TABULATION SET] -char \x8B (1 3 8) # 8B ⢅ [PARTIAL LINE FORWARD] -char \x8C ( 3 7 ) # 8C ⡄ [PARTIAL LINE BACKWARD] -char \x8D ( 3 567 ) # 8D ⡴ [REVERSE LINE FEED] -char \x8E ( 23 67 ) # 8E ⡦ [SINGLE SHIFT TWO] -char \x8F ( 3 56 8) # 8F ⢴ [SINGLE SHIFT THREE] -char \x90 ( 567 ) # 90 ⡰ [DEVICE CONTROL STRING] -char \x91 ( 7 ) # 91 ⡀ [PRIVATE USE ONE] -char \x92 ( 8) # 92 ⢀ [PRIVATE USE TWO] -char \x93 ( 3 5 7 ) # 93 ⡔ [SET TRANSMIT STATE] -char \x94 ( 67 ) # 94 ⡠ [CANCEL CHARACTER] -char \x95 ( 23 5 7 ) # 95 ⡖ [MESSAGE WAITING] -char \x96 (123 6 8) # 96 ⢧ [START OF GUARDED AREA] -char \x97 ( 2 456 8) # 97 ⢺ [END OF GUARDED AREA] -char \x98 (1234 678) # 98 ⣯ [START OF STRING] -char \x99 ( 3 6 8) # 99 ⢤ [] -char \x9A (1 3 56 8) # 9A ⢵ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 4 6 8) # 9B ⢨ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 5 8) # 9C ⢐ [STRING TERMINATOR] -char \x9D ( 56 8) # 9D ⢰ [OPERATING SYSTEM COMMAND] -char \x9E ( 6 8) # 9E ⢠ [PRIVACY MESSAGE] -char \x9F ( 456 8) # 9F ⢸ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 (1 4 8) # A2 ⢉ ¢ [CENT SIGN] char \xA3 (123 8) # A3 ⢇ £ [POUND SIGN] diff --git a/brltty/Text/ga.ttb b/brltty/Text/ga.ttb index 12c013c..3561d82 100644 --- a/brltty/Text/ga.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/gd.ttb b/brltty/Text/gd.ttb index c626dbe..ce1b6b4 100644 --- a/brltty/Text/gd.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/gon.ttb b/brltty/Text/gon.ttb index a319500..220b102 100644 --- a/brltty/Text/gon.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/greek.tti b/brltty/Text/greek.tti index bc189b3..de55cba 100644 --- a/brltty/Text/greek.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/gu.ttb b/brltty/Text/gu.ttb index 48056e8..c0599a8 100644 --- a/brltty/Text/gu.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/gujarati.tti b/brltty/Text/gujarati.tti index dedc4f0..8c889ed 100644 --- a/brltty/Text/gujarati.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/gurmukhi.tti b/brltty/Text/gurmukhi.tti index 37e2cbd..3eed143 100644 --- a/brltty/Text/gurmukhi.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/he.ttb b/brltty/Text/he.ttb index 50d3b19..05307ab 100644 --- a/brltty/Text/he.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/hi.ttb b/brltty/Text/hi.ttb index 5446b07..9676fca 100644 --- a/brltty/Text/hi.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/hr.ttb b/brltty/Text/hr.ttb index 9f2e2b9..6131b05 100644 --- a/brltty/Text/hr.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/hu.ttb b/brltty/Text/hu.ttb index 72d7a93..e6568f9 100644 --- a/brltty/Text/hu.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/hy.ttb b/brltty/Text/hy.ttb index a23066c..c492dda 100644 --- a/brltty/Text/hy.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/is.ttb b/brltty/Text/is.ttb index 27d1567..5141a28 100644 --- a/brltty/Text/is.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/it.ttb b/brltty/Text/it.ttb index fc628b0..344166c 100644 --- a/brltty/Text/it.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -73,38 +73,6 @@ char \x7C ( 2 56 8) # 7C ⢲ | [VERTICAL LINE] char \x7D ( 3 56 8) # 7D ⢴ } [RIGHT CURLY BRACKET] char \x7E ( 234 6 8) # 7E ⢮ ~ [TILDE] char \x7F ( 78) # 7F ⣀ [DELETE] -char \x80 ( 456 8) # 80 ⢸ [] -char \x81 (1 4 8) # 81 ⢉ [] -char \x82 ( 34 6 8) # 82 ⢬ [BREAK PERMITTED HERE] -char \x83 (1 4567 ) # 83 ⡹ [NO BREAK HERE] -char \x84 ( 2 7 ) # 84 ⡂ [] -char \x85 (1 45 8) # 85 ⢙ [NEXT LINE (NEL)] -char \x86 ( 2 67 ) # 86 ⡢ [START OF SELECTED AREA] -char \x87 (123 56 8) # 87 ⢷ [END OF SELECTED AREA] -char \x88 (1 567 ) # 88 ⡱ [CHARACTER TABULATION SET] -char \x89 ( 2 6 8) # 89 ⢢ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 5 7 ) # 8A ⡐ [LINE TABULATION SET] -char \x8B ( 3 5 8) # 8B ⢔ [PARTIAL LINE FORWARD] -char \x8C ( 5 8) # 8C ⢐ [PARTIAL LINE BACKWARD] -char \x8D ( 3 7 ) # 8D ⡄ [REVERSE LINE FEED] -char \x8E ( 3 6 ) # 8E ⠤ [SINGLE SHIFT TWO] -char \x8F ( 456 8) # 8F ⢸ [SINGLE SHIFT THREE] -char \x90 ( 23 56 ) # 90 ⠶ [DEVICE CONTROL STRING] -char \x91 ( 456 8) # 91 ⢸ [PRIVATE USE ONE] -char \x92 ( 456 8) # 92 ⢸ [PRIVATE USE TWO] -char \x93 ( 2 4 7 ) # 93 ⡊ [SET TRANSMIT STATE] -char \x94 ( 234 8) # 94 ⢎ [CANCEL CHARACTER] -char \x95 ( 45 8) # 95 ⢘ [MESSAGE WAITING] -char \x96 ( 2 456 8) # 96 ⢺ [START OF GUARDED AREA] -char \x97 ( 4 8) # 97 ⢈ [END OF GUARDED AREA] -char \x98 ( 3 678) # 98 ⣤ [START OF STRING] -char \x99 ( 3 6 ) # 99 ⠤ [] -char \x9A ( 3 678) # 9A ⣤ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 56 8) # 9B ⢰ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 3 6 ) # 9C ⠤ [STRING TERMINATOR] -char \x9D ( 23 56 ) # 9D ⠶ [OPERATING SYSTEM COMMAND] -char \x9E ( 23 5 7 ) # 9E ⡖ [PRIVACY MESSAGE] -char \x9F (12 4 678) # 9F ⣫ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 (1 4 6 8) # A2 ⢩ ¢ [CENT SIGN] char \xA3 ( 4 67 ) # A3 ⡨ £ [POUND SIGN] diff --git a/brltty/Text/kannada.tti b/brltty/Text/kannada.tti index eb49a61..588fe08 100644 --- a/brltty/Text/kannada.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/kha.ttb b/brltty/Text/kha.ttb index 82cf5ae..f2af09d 100644 --- a/brltty/Text/kha.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/kn.ttb b/brltty/Text/kn.ttb index 70bf5ea..ae29bb9 100644 --- a/brltty/Text/kn.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/kok.ttb b/brltty/Text/kok.ttb index f96fac9..37f9a76 100644 --- a/brltty/Text/kok.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/kru.ttb b/brltty/Text/kru.ttb index d56ee1d..cad9956 100644 --- a/brltty/Text/kru.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/lt.ttb b/brltty/Text/lt.ttb index ed2d772..ed0fc7d 100644 --- a/brltty/Text/lt.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,34 +11,173 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### # 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. +char \xAD ( 3 6 8) # ⢤ ­ [SOFT HYPHEN] + +# The following characters are not defined in the standard. + +# 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. +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/brltty/Text/ltr-alias.tti b/brltty/Text/ltr-alias.tti index 3c69ae7..73aa5eb 100644 --- a/brltty/Text/ltr-alias.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ltr-cyrillic.tti b/brltty/Text/ltr-cyrillic.tti index e1f2ffd..b2bd9ce 100644 --- a/brltty/Text/ltr-cyrillic.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -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/brltty/Text/ltr-dot8.tti b/brltty/Text/ltr-dot8.tti index bfb9756..9ffa4cb 100644 --- a/brltty/Text/ltr-dot8.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ltr-latin.tti b/brltty/Text/ltr-latin.tti index 9a7afde..c672873 100644 --- a/brltty/Text/ltr-latin.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ltr-tibetan.tti b/brltty/Text/ltr-tibetan.tti index 8f92f85..1276884 100644 --- a/brltty/Text/ltr-tibetan.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/lv.ttb b/brltty/Text/lv.ttb index 7640aed..e898887 100644 --- a/brltty/Text/lv.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -23,9 +23,6 @@ # Converted from liblouis table by Samuel Thibault # generated by ttbtest: charset=latin7 -char \x09 ( ) # 09 ⠀ [CHARACTER TABULATION] -char \x0A ( ) # 0A ⠀ [LINE FEED (LF)] -char \x0D ( ) # 0D ⠀ [CARRIAGE RETURN (CR)] char \x20 ( ) # 20 ⠀ [SPACE] char \x21 ( 23 5 ) # 21 ⠖ ! [EXCLAMATION MARK] char \x22 ( 3 56 ) # 22 ⠴ " [QUOTATION MARK] @@ -107,12 +104,10 @@ char \x79 (1 3456 ) # 79 ⠽ y [LATIN SMALL LETTER Y] char \x7A ( 345 ) # 7A ⠜ z [LATIN SMALL LETTER Z] char \x7C ( 456 ) # 7C ⠸ | [VERTICAL LINE] char \x7E ( 5 ) # 7E ⠐ ~ [TILDE] -char \xA0 ( ) # A0 ⠀   [NO-BREAK SPACE] char \u201D ( 3 56 ) # A1 ⠴ ” [RIGHT DOUBLE QUOTATION MARK] char \u201E ( 23 6 ) # A5 ⠦ „ [DOUBLE LOW-9 QUOTATION MARK] char \xA7 ( 34 6 ) # A7 ⠬ § [SECTION SIGN] char \xD8 ( 2 4 6 ) # A8 ⠪ Ø [LATIN CAPITAL LETTER O WITH STROKE] -char \xAD ( 3 6 ) # AD ⠤ ­ [SOFT HYPHEN] char \u201C ( 23 6 ) # B4 ⠦ “ [LEFT DOUBLE QUOTATION MARK] char \xF8 ( 2 4 6 ) # B8 ⠪ ø [LATIN SMALL LETTER O WITH STROKE] char \u0104 (1 6 ) # C0 ⠡ Ą [LATIN CAPITAL LETTER A WITH OGONEK] @@ -218,9 +213,6 @@ char \u016C ( 23456 ) # ⠾ Ŭ [LATIN CAPITAL LETTER U WITH BREVE] char \u016D ( 23456 ) # ⠾ ŭ [LATIN SMALL LETTER U WITH BREVE] char \u016E ( 23456 ) # ⠾ Ů [LATIN CAPITAL LETTER U WITH RING ABOVE] char \u016F ( 23456 ) # ⠾ ů [LATIN SMALL LETTER U WITH RING ABOVE] -char \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] -char \u2011 ( 3 6 ) # ⠤ ‑ [NON-BREAKING HYPHEN] -char \u2013 ( 3 6 ) # ⠤ – [EN DASH] char \u2018 ( 3 ) # ⠄ ‘ [LEFT SINGLE QUOTATION MARK] char \u201F ( 3 56 ) # ⠴ ‟ [DOUBLE HIGH-REVERSED-9 QUOTATION MARK] diff --git a/brltty/Text/malayalam.tti b/brltty/Text/malayalam.tti index 96af981..79ff82a 100644 --- a/brltty/Text/malayalam.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mg.ttb b/brltty/Text/mg.ttb index 620383b..e53e4db 100644 --- a/brltty/Text/mg.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mi.ttb b/brltty/Text/mi.ttb index 3c06fac..fa5702a 100644 --- a/brltty/Text/mi.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ml.ttb b/brltty/Text/ml.ttb index b14f909..f26dfa9 100644 --- a/brltty/Text/ml.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mni.ttb b/brltty/Text/mni.ttb index 068ba4d..a3c5fe8 100644 --- a/brltty/Text/mni.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mr.ttb b/brltty/Text/mr.ttb index fca5bfb..a507240 100644 --- a/brltty/Text/mr.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mt.ttb b/brltty/Text/mt.ttb index 380ccae..b1cc6b4 100644 --- a/brltty/Text/mt.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mun.ttb b/brltty/Text/mun.ttb index 385ce54..8b147ba 100644 --- a/brltty/Text/mun.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/mwr.ttb b/brltty/Text/mwr.ttb index b561860..e343707 100644 --- a/brltty/Text/mwr.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ne.ttb b/brltty/Text/ne.ttb index 62898f4..8867dcd 100644 --- a/brltty/Text/ne.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/new.ttb b/brltty/Text/new.ttb index f713c96..cb0ab26 100644 --- a/brltty/Text/new.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/nl.ttb b/brltty/Text/nl.ttb index e57a1d7..6d96e62 100644 --- a/brltty/Text/nl.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/nl_BE.ttb b/brltty/Text/nl_BE.ttb index 83c9b12..b652368 100644 --- a/brltty/Text/nl_BE.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -24,16 +24,13 @@ # Converted from liblouis table by Samuel Thibault # generated by ttbtest: charset=iso-8859-15 -char \x09 ( ) # 09 ⠀ [CHARACTER TABULATION] -char \x0A ( ) # 0A ⠀ [LINE FEED (LF)] -char \x0D ( ) # 0D ⠀ [CARRIAGE RETURN (CR)] char \x20 ( ) # 20 ⠀ [SPACE] char \x21 ( 23 5 ) # 21 ⠖ ! [EXCLAMATION MARK] char \x22 ( 23 56 ) # 22 ⠶ " [QUOTATION MARK] char \x23 ( 5 ) # 23 ⠐ # [NUMBER SIGN] char \x24 (1 45 ) # 24 ⠙ $ [DOLLAR SIGN] char \x26 (1234 6 ) # 26 ⠯ & [AMPERSAND] -char \x27 ( 3 6 ) # 27 ⠤ ' [APOSTROPHE] +char \x27 ( 3 ) # 27 ⠄ ' [APOSTROPHE] char \x28 ( 23 6 ) # 28 ⠦ ( [LEFT PARENTHESIS] char \x29 ( 3 56 ) # 29 ⠴ ) [RIGHT PARENTHESIS] char \x2A ( 3 5 ) # 2A ⠔ * [ASTERISK] @@ -117,9 +114,6 @@ char \x7A (1 3 56 ) # 7A ⠵ z [LATIN SMALL LETTER Z] char \x7B (123 56 ) # 7B ⠷ { [LEFT CURLY BRACKET] char \x7C (123456 ) # 7C ⠿ | [VERTICAL LINE] char \x7D ( 23456 ) # 7D ⠾ } [RIGHT CURLY BRACKET] -char \x80 (1 5 ) # 80 ⠑ [] -char \x92 ( 3 ) # 92 ⠄ [PRIVATE USE TWO] -char \xA0 ( ) # A0 ⠀   [NO-BREAK SPACE] char \xA1 ( 4 ) # A1 ⠈ ¡ [INVERTED EXCLAMATION MARK] char \xA2 (1 4 ) # A2 ⠉ ¢ [CENT SIGN] char \xA3 (1234 ) # A3 ⠏ £ [POUND SIGN] @@ -176,14 +170,10 @@ char \xFB (1 56 ) # FB ⠱ û [LATIN SMALL LETTER U WITH CIRCUMFLEX] char \xFC (12 56 ) # FC ⠳ ü [LATIN SMALL LETTER U WITH DIAERESIS] char \xB8 ( 45 ) # ⠘ ¸ [CEDILLA] char \u0192 (12 4 ) # ⠋ ƒ [LATIN SMALL LETTER F WITH HOOK] -char \u2010 ( 4 6 ) # ⠨ ‐ [HYPHEN] -char \u2011 ( 4 6 ) # ⠨ ‑ [NON-BREAKING HYPHEN] -char \u2013 ( 3 6 ) # ⠤ – [EN DASH] -char \u2018 ( 3 ) # ⠄ ‘ [LEFT SINGLE QUOTATION MARK] -char \u2019 ( 3 ) # ⠄ ’ [RIGHT SINGLE QUOTATION MARK] char \u201C ( 23 6 ) # ⠦ “ [LEFT DOUBLE QUOTATION MARK] char \u201D ( 3 56 ) # ⠴ ” [RIGHT DOUBLE QUOTATION MARK] char \u201E ( 23 6 ) # ⠦ „ [DOUBLE LOW-9 QUOTATION MARK] char \u201F ( 3 56 ) # ⠴ ‟ [DOUBLE HIGH-REVERSED-9 QUOTATION MARK] +char \u20AC (1 5 8) # ⢑ € [EURO SIGN] include common.tti diff --git a/brltty/Text/nl_NL.ttb b/brltty/Text/nl_NL.ttb index cf8853f..a8654a1 100644 --- a/brltty/Text/nl_NL.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -24,9 +24,6 @@ # Converted from liblouis table by Samuel Thibault # generated by ttbtest: charset=iso-8859-15 -char \x09 ( ) # 09 ⠀ [CHARACTER TABULATION] -char \x0A ( ) # 0A ⠀ [LINE FEED (LF)] -char \x0D ( ) # 0D ⠀ [CARRIAGE RETURN (CR)] char \x20 ( ) # 20 ⠀ [SPACE] char \x21 ( 23 5 ) # 21 ⠖ ! [EXCLAMATION MARK] char \x22 ( 23 56 ) # 22 ⠶ " [QUOTATION MARK] @@ -114,9 +111,6 @@ char \x77 ( 2 456 ) # 77 ⠺ w [LATIN SMALL LETTER W] char \x78 (1 34 6 ) # 78 ⠭ x [LATIN SMALL LETTER X] char \x79 (1 3456 ) # 79 ⠽ y [LATIN SMALL LETTER Y] char \x7A (1 3 56 ) # 7A ⠵ z [LATIN SMALL LETTER Z] -char \x80 (1 5 ) # 80 ⠑ [] -char \x92 ( 3 ) # 92 ⠄ [PRIVATE USE TWO] -char \xA0 ( ) # A0 ⠀   [NO-BREAK SPACE] char \xA3 (1234 ) # A3 ⠏ £ [POUND SIGN] char \u20AC (1 5 ) # A4 ⠑ € [EURO SIGN] char \xA5 (1 3456 ) # A5 ⠽ ¥ [YEN SIGN] @@ -167,14 +161,10 @@ char \xFB (1 56 ) # FB ⠱ û [LATIN SMALL LETTER U WITH CIRCUMFLEX] char \xFC (12 56 ) # FC ⠳ ü [LATIN SMALL LETTER U WITH DIAERESIS] char \xB8 ( 45 ) # ⠘ ¸ [CEDILLA] char \u0192 (12 4 ) # ⠋ ƒ [LATIN SMALL LETTER F WITH HOOK] -char \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] -char \u2011 ( 4 6 ) # ⠨ ‑ [NON-BREAKING HYPHEN] -char \u2013 ( 3 6 ) # ⠤ – [EN DASH] -char \u2018 ( 3 ) # ⠄ ‘ [LEFT SINGLE QUOTATION MARK] -char \u2019 ( 3 ) # ⠄ ’ [RIGHT SINGLE QUOTATION MARK] char \u201C ( 23 6 ) # ⠦ “ [LEFT DOUBLE QUOTATION MARK] char \u201D ( 3 56 ) # ⠴ ” [RIGHT DOUBLE QUOTATION MARK] char \u201E ( 23 6 ) # ⠦ „ [DOUBLE LOW-9 QUOTATION MARK] char \u201F ( 3 56 ) # ⠴ ‟ [DOUBLE HIGH-REVERSED-9 QUOTATION MARK] +char \u20AC (1 5 8) # ⢑ € [EURO SIGN] include common.tti diff --git a/brltty/Text/no-generic.ttb b/brltty/Text/no-generic.ttb index 726448e..d5309b5 100644 --- a/brltty/Text/no-generic.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/no-oup.ttb b/brltty/Text/no-oup.ttb index 0f440b4..d921b74 100644 --- a/brltty/Text/no-oup.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/no.ttb b/brltty/Text/no.ttb index bc02458..dc10dc0 100644 --- a/brltty/Text/no.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/num-alias.tti b/brltty/Text/num-alias.tti index 3e8b2e0..3b645d5 100644 --- a/brltty/Text/num-alias.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/num-dot6.tti b/brltty/Text/num-dot6.tti index a543b5e..6f582ab 100644 --- a/brltty/Text/num-dot6.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/num-dot8.tti b/brltty/Text/num-dot8.tti index 74ebf6d..a30fb65 100644 --- a/brltty/Text/num-dot8.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/num-french.tti b/brltty/Text/num-french.tti index ac4f0f8..b98f836 100644 --- a/brltty/Text/num-french.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/num-nemd8.tti b/brltty/Text/num-nemd8.tti index cc43799..a085e1a 100644 --- a/brltty/Text/num-nemd8.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/num-nemeth.tti b/brltty/Text/num-nemeth.tti index b17ba85..c5247ed 100644 --- a/brltty/Text/num-nemeth.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/nwc.ttb b/brltty/Text/nwc.ttb index 554d4e2..d51bf21 100644 --- a/brltty/Text/nwc.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/or.ttb b/brltty/Text/or.ttb index fe5bd8f..72af5e9 100644 --- a/brltty/Text/or.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/oriya.tti b/brltty/Text/oriya.tti index eed3073..b725f81 100644 --- a/brltty/Text/oriya.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/pa.ttb b/brltty/Text/pa.ttb index ea79a3d..08bdf38 100644 --- a/brltty/Text/pa.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/pi.ttb b/brltty/Text/pi.ttb index fd65894..3202aa9 100644 --- a/brltty/Text/pi.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/pl.ttb b/brltty/Text/pl.ttb index 816105b..ed00514 100644 --- a/brltty/Text/pl.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -72,38 +72,6 @@ char \x7C (12 56 ) # 7C ⠳ | [VERTICAL LINE] char \x7D ( 23 56 8) # 7D ⢶ } [RIGHT CURLY BRACKET] char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] char \x7F ( 4567 ) # 7F ⡸ [DELETE] -char \x80 ( 2 67 ) # 80 ⡢ [] -char \x81 (1 34 6 8) # 81 ⢭ [] -char \x82 ( 2 56 8) # 82 ⢲ [BREAK PERMITTED HERE] -char \x83 ( 2 5 8) # 83 ⢒ [NO BREAK HERE] -char \x84 ( 3 5 7 ) # 84 ⡔ [] -char \x85 (1 8) # 85 ⢁ [NEXT LINE (NEL)] -char \x86 ( 234 8) # 86 ⢎ [START OF SELECTED AREA] -char \x87 ( 2345 8) # 87 ⢞ [END OF SELECTED AREA] -char \x88 ( 3 56 8) # 88 ⢴ [CHARACTER TABULATION SET] -char \x89 (1 45 8) # 89 ⢙ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 23 5 8) # 8A ⢖ [LINE TABULATION SET] -char \x8B ( 5 78) # 8B ⣐ [PARTIAL LINE FORWARD] -char \x8C (1 5 8) # 8C ⢑ [PARTIAL LINE BACKWARD] -char \x8D ( 234 678) # 8D ⣮ [REVERSE LINE FEED] -char \x8E ( 67 ) # 8E ⡠ [SINGLE SHIFT TWO] -char \x8F (12 4 67 ) # 8F ⡫ [SINGLE SHIFT THREE] -char \x90 ( 23 567 ) # 90 ⡶ [DEVICE CONTROL STRING] -char \x91 ( 2 6 8) # 91 ⢢ [PRIVATE USE ONE] -char \x92 ( 6 8) # 92 ⢠ [PRIVATE USE TWO] -char \x93 ( 34 7 ) # 93 ⡌ [SET TRANSMIT STATE] -char \x94 ( 3 5 78) # 94 ⣔ [CANCEL CHARACTER] -char \x95 ( 45 8) # 95 ⢘ [MESSAGE WAITING] -char \x96 (1 4 67 ) # 96 ⡩ [START OF GUARDED AREA] -char \x97 ( 4 8) # 97 ⢈ [END OF GUARDED AREA] -char \x98 ( 234567 ) # 98 ⡾ [START OF STRING] -char \x99 (1 3 5 8) # 99 ⢕ [] -char \x9A (12 67 ) # 9A ⡣ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 56 8) # 9B ⢰ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 3 6 8) # 9C ⢤ [STRING TERMINATOR] -char \x9D ( 34 67 ) # 9D ⡬ [OPERATING SYSTEM COMMAND] -char \x9E ( 23 5 7 ) # 9E ⡖ [PRIVACY MESSAGE] -char \x9F (12 4 678) # 9F ⣫ [APPLICATION PROGRAM COMMAND] char \u0104 (1 67 ) # A1 ⡡ Ą [LATIN CAPITAL LETTER A WITH OGONEK] char \u02D8 ( 5 8) # A2 ⢐ ˘ [BREVE] char \u0141 (12 67 ) # A3 ⡣ Ł [LATIN CAPITAL LETTER L WITH STROKE] @@ -116,7 +84,6 @@ char \u0160 (1 4567 ) # A9 ⡹ Š [LATIN CAPITAL LETTER S WITH CARON] char \u015E (12 5 8) # AA ⢓ Ş [LATIN CAPITAL LETTER S WITH CEDILLA] char \u0164 (123 5678) # AB ⣷ Ť [LATIN CAPITAL LETTER T WITH CARON] char \u0179 ( 234 67 ) # AC ⡮ Ź [LATIN CAPITAL LETTER Z WITH ACUTE] -char \xAD ( 3 6 ) # AD ⠤ ­ [SOFT HYPHEN] char \u017D ( 4 678) # AE ⣨ Ž [LATIN CAPITAL LETTER Z WITH CARON] char \u017B (1234 6 8) # AF ⢯ Ż [LATIN CAPITAL LETTER Z WITH DOT ABOVE] char \xB0 ( 3 56 ) # B0 ⠴ ° [DEGREE SIGN] diff --git a/brltty/Text/pt.ttb b/brltty/Text/pt.ttb index faf82d4..2696fa3 100644 --- a/brltty/Text/pt.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -72,38 +72,6 @@ char \x7C ( 456 ) # 7C ⠸ | [VERTICAL LINE] char \x7D ( 4567 ) # 7D ⡸ } [RIGHT CURLY BRACKET] char \x7E ( 5 ) # 7E ⠐ ~ [TILDE] char \x7F ( 5 7 ) # 7F ⡐ [DELETE] -char \x80 ( 2 67 ) # 80 ⡢ [] -char \x81 (1 34 6 8) # 81 ⢭ [] -char \x82 ( 2 56 8) # 82 ⢲ [BREAK PERMITTED HERE] -char \x83 ( 2 5 8) # 83 ⢒ [NO BREAK HERE] -char \x84 ( 3 5 7 ) # 84 ⡔ [] -char \x85 (1 8) # 85 ⢁ [NEXT LINE (NEL)] -char \x86 ( 234 8) # 86 ⢎ [START OF SELECTED AREA] -char \x87 ( 2345 8) # 87 ⢞ [END OF SELECTED AREA] -char \x88 ( 3 56 8) # 88 ⢴ [CHARACTER TABULATION SET] -char \x89 (1 45 8) # 89 ⢙ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 23 5 8) # 8A ⢖ [LINE TABULATION SET] -char \x8B ( 345 78) # 8B ⣜ [PARTIAL LINE FORWARD] -char \x8C (1 5 8) # 8C ⢑ [PARTIAL LINE BACKWARD] -char \x8D ( 2 4 67 ) # 8D ⡪ [REVERSE LINE FEED] -char \x8E ( 4567 ) # 8E ⡸ [SINGLE SHIFT TWO] -char \x8F (12 4 67 ) # 8F ⡫ [SINGLE SHIFT THREE] -char \x90 ( 23 567 ) # 90 ⡶ [DEVICE CONTROL STRING] -char \x91 ( 2 6 8) # 91 ⢢ [PRIVATE USE ONE] -char \x92 ( 6 8) # 92 ⢠ [PRIVATE USE TWO] -char \x93 (12 67 ) # 93 ⡣ [SET TRANSMIT STATE] -char \x94 ( 3 5 78) # 94 ⣔ [CANCEL CHARACTER] -char \x95 ( 45 8) # 95 ⢘ [MESSAGE WAITING] -char \x96 (1 4 67 ) # 96 ⡩ [START OF GUARDED AREA] -char \x97 ( 4 8) # 97 ⢈ [END OF GUARDED AREA] -char \x98 (12 4567 ) # 98 ⡻ [START OF STRING] -char \x99 (1 3 5 8) # 99 ⢕ [] -char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 56 8) # 9B ⢰ [CONTROL SEQUENCE INTRODUCER] -char \x9C ( 3 6 8) # 9C ⢤ [STRING TERMINATOR] -char \x9D ( 34 7 ) # 9D ⡌ [OPERATING SYSTEM COMMAND] -char \x9E ( 23 5 7 ) # 9E ⡖ [PRIVACY MESSAGE] -char \x9F (12 4 678) # 9F ⣫ [APPLICATION PROGRAM COMMAND] char \xA1 ( 3 67 ) # A1 ⡤ ¡ [INVERTED EXCLAMATION MARK] char \xA2 ( 56 8) # A2 ⢰ ¢ [CENT SIGN] char \xA3 ( 4 6 ) # A3 ⠨ £ [POUND SIGN] diff --git a/brltty/Text/punc-alternate.tti b/brltty/Text/punc-alternate.tti index 6cb103a..55356ca 100644 --- a/brltty/Text/punc-alternate.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/punc-basic.tti b/brltty/Text/punc-basic.tti index 8c6f689..10174e1 100644 --- a/brltty/Text/punc-basic.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/punc-tibetan.tti b/brltty/Text/punc-tibetan.tti index 47c4a97..be13382 100644 --- a/brltty/Text/punc-tibetan.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ro.ttb b/brltty/Text/ro.ttb index 327a58d..5a17807 100644 --- a/brltty/Text/ro.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ru.ttb b/brltty/Text/ru.ttb index c2c4cb9..3a6bd0a 100644 --- a/brltty/Text/ru.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sa.ttb b/brltty/Text/sa.ttb index 331ec30..ab6a7f0 100644 --- a/brltty/Text/sa.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sat.ttb b/brltty/Text/sat.ttb index 932b0fa..fb7848d 100644 --- a/brltty/Text/sat.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sd.ttb b/brltty/Text/sd.ttb index f04bb94..f442c98 100644 --- a/brltty/Text/sd.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/se.ttb b/brltty/Text/se.ttb new file mode 100644 index 0000000..6cea8d9 --- /dev/null +++ b/brltty/Text/se.ttb @@ -0,0 +1,44 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# BRLTTY Text Table - Sami (Northern) +# Tomas Mårdsjö +# see: https://en.wikipedia.org/wiki/Northern_Sami_Braille + +char \xC1 (123 567 ) # ⡷ Á [LATIN CAPITAL LETTER A WITH ACUTE] +char \xE1 (123 56 ) # ⠷ á [LATIN SMALL LETTER A WITH ACUTE] + +char \u010C (1 4 67 ) # ⡩ Č [LATIN CAPITAL LETTER C WITH CARON] +char \u010D (1 4 6 ) # ⠩ č [LATIN SMALL LETTER C WITH CARON] + +char \u0110 (1 4567 ) # ⡹ Đ [LATIN CAPITAL LETTER D WITH STROKE] +char \u0111 (1 456 ) # ⠹ đ [LATIN SMALL LETTER D WITH STROKE] + +char \u014A (12 4 67 ) # ⡫ Ŋ [LATIN CAPITAL LETTER ENG] +char \u014B (12 4 6 ) # ⠫ ŋ [LATIN SMALL LETTER ENG] + +char \u0160 (1 567 ) # ⡱ Š [LATIN CAPITAL LETTER S WITH CARON] +char \u0161 (1 56 ) # ⠱ š [LATIN SMALL LETTER S WITH CARON] + +char \u0166 (12 567 ) # ⡳ Ŧ [LATIN CAPITAL LETTER T WITH STROKE] +char \u0167 (12 56 ) # ⠳ ŧ [LATIN SMALL LETTER T WITH STROKE] + +char \u017D ( 234 67 ) # ⡮ Ž [LATIN CAPITAL LETTER Z WITH CARON] +char \u017E ( 234 6 ) # ⠮ ž [LATIN SMALL LETTER Z WITH CARON] + +include no-oup.ttb diff --git a/brltty/Text/sk.ttb b/brltty/Text/sk.ttb index a00c7e7..6d80979 100644 --- a/brltty/Text/sk.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sl.ttb b/brltty/Text/sl.ttb index 4f6c316..2c41e48 100644 --- a/brltty/Text/sl.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sv-1989.ttb b/brltty/Text/sv-1989.ttb index 3c77187..f72b5ee 100644 --- a/brltty/Text/sv-1989.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sv-1996.ttb b/brltty/Text/sv-1996.ttb index 2a3ffb4..19b584b 100644 --- a/brltty/Text/sv-1996.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sv.ttb b/brltty/Text/sv.ttb index 8edd921..e726922 100644 --- a/brltty/Text/sv.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/sw.ttb b/brltty/Text/sw.ttb index 4b35e76..1d38e14 100644 --- a/brltty/Text/sw.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/ta.ttb b/brltty/Text/ta.ttb index cb00a02..475c298 100644 --- a/brltty/Text/ta.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/tamil.tti b/brltty/Text/tamil.tti index 31a9368..43506aa 100644 --- a/brltty/Text/tamil.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/te.ttb b/brltty/Text/te.ttb index 7329f63..1b8d45a 100644 --- a/brltty/Text/te.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/telugu.tti b/brltty/Text/telugu.tti index 7211baf..22149ff 100644 --- a/brltty/Text/telugu.tti +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/tr.ttb b/brltty/Text/tr.ttb index dbefe02..0181a73 100644 --- a/brltty/Text/tr.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### diff --git a/brltty/Text/uk.ttb b/brltty/Text/uk.ttb new file mode 100644 index 0000000..bb530b0 --- /dev/null +++ b/brltty/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-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# 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/brltty/Text/vi.ttb b/brltty/Text/vi.ttb index 8c57c0b..65aaf4b 100644 --- a/brltty/Text/vi.ttb +++ b/brltty/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-2019 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -11,7 +11,7 @@ # Foundation; either version 2.1 of the License, or (at your option) any # later version. Please see the file LICENSE-LGPL for details. # -# Web Page: http://brltty.com/ +# Web Page: http://brltty.app/ # # This software is maintained by Dave Mielke . ############################################################################### @@ -118,39 +118,6 @@ char \x7C ( 456 8) # 7C ⢸ | [VERTICAL LINE] char \x7D ( 2345678) # 7D ⣾ } [RIGHT CURLY BRACKET] char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] char \x7F ( 456 ) # 7F ⠸ [DELETE] -char \x80 ( 4 8) # 80 ⢈ [] -char \x81 (1 8) # 81 ⢁ [] -char \x82 (12 8) # 82 ⢃ [BREAK PERMITTED HERE] -char \x83 (1 4 8) # 83 ⢉ [NO BREAK HERE] -char \x84 (1 45 8) # 84 ⢙ [] -char \x85 (1 5 8) # 85 ⢑ [NEXT LINE (NEL)] -char \x86 (12 4 8) # 86 ⢋ [START OF SELECTED AREA] -char \x87 (12 45 8) # 87 ⢛ [END OF SELECTED AREA] -char \x88 (12 5 8) # 88 ⢓ [CHARACTER TABULATION SET] -char \x89 ( 2 4 8) # 89 ⢊ [CHARACTER TABULATION WITH JUSTIFICATION] -char \x8A ( 2 45 8) # 8A ⢚ [LINE TABULATION SET] -char \x8B (1 3 8) # 8B ⢅ [PARTIAL LINE FORWARD] -char \x8C (123 8) # 8C ⢇ [PARTIAL LINE BACKWARD] -char \x8D (1 34 8) # 8D ⢍ [REVERSE LINE FEED] -char \x8E (1 345 8) # 8E ⢝ [SINGLE SHIFT TWO] -char \x8F (1 3 5 8) # 8F ⢕ [SINGLE SHIFT THREE] -char \x90 (1234 8) # 90 ⢏ [DEVICE CONTROL STRING] -char \x91 (12345 8) # 91 ⢟ [PRIVATE USE ONE] -char \x92 (123 5 8) # 92 ⢗ [PRIVATE USE TWO] -char \x93 ( 234 8) # 93 ⢎ [SET TRANSMIT STATE] -char \x94 ( 2345 8) # 94 ⢞ [CANCEL CHARACTER] -char \x95 (1 3 6 8) # 95 ⢥ [MESSAGE WAITING] -char \x96 (123 6 8) # 96 ⢧ [START OF GUARDED AREA] -char \x97 ( 2 456 8) # 97 ⢺ [END OF GUARDED AREA] -char \x98 (1 34 6 8) # 98 ⢭ [START OF STRING] -char \x99 (1 3456 8) # 99 ⢽ [] -char \x9A (1 3 56 8) # 9A ⢵ [SINGLE CHARACTER INTRODUCER] -char \x9B ( 2 4 6 8) # 9B ⢪ [CONTROL SEQUENCE INTRODUCER] -char \x9C (12 56 8) # 9C ⢳ [STRING TERMINATOR] -char \x9D (12 456 8) # 9D ⢻ [OPERATING SYSTEM COMMAND] -char \x9E ( 45 8) # 9E ⢘ [PRIVACY MESSAGE] -char \x9F ( 456 8) # 9F ⢸ [APPLICATION PROGRAM COMMAND] -char \xA0 ( ) # A0 ⠀   [NO-BREAK SPACE] char \xA1 (12345678) # A1 ⣿ ¡ [INVERTED EXCLAMATION MARK] char \xA2 (12345678) # A2 ⣿ ¢ [CENT SIGN] char \xA3 (12345678) # A3 ⣿ £ [POUND SIGN] diff --git a/brltty/Text/win-1252.tti b/brltty/Text/win-1252.tti new file mode 100644 index 0000000..bad7437 --- /dev/null +++ b/brltty/Text/win-1252.tti @@ -0,0 +1,120 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2019 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.app/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# This BRLTTY text subtable defines aliases to/from Windows-1252 characters. +# Dave Mielke + +################ +# Introduction # +################ + +# Windows-1252 defines characters within the ISO-8859-1 C1 range (\x80-\x9F). +# Since BRLTTY uses Unicode characters internally, the traditional use of +# Windows-1252 characters has caused confusion within at least two areas: +# +# * Some braille standards have been developed around, and, therefore, their +# tables have been written using, Windows-1252 character values. +# +# * Some programs write Windows-1252 characters to the screen. +# +# This text subtable seeks to resolve these issues (see its sections below): + +# Windows-1252 doesn't define five of the 32 ISO-8859-1 C1 characters: +# +# \x81, \x8D, \x8F, \x90, \x9D +# +# Wikipedia says: +# +# “According to the information on Microsoft's and the Unicode Consortium's +# websites, positions 81, 8D, 8F, 90, and 9D are unused; however, the +# Windows API MultiByteToWideChar maps these to the corresponding C1 control +# codes. The "best fit" mapping documents this behavior, too.” + + +############################################################## +# Braille Tables Written Using Windows-1252 Character Values # +############################################################## + +# Alias each relevant Unicode character to its corresponding Windows-1252 +# value so that its braille representation will be found. + +ifGlyph \x80 alias \u20AC \x80 # € [EURO SIGN] +ifGlyph \x82 alias \u201A \x82 # ‚ [SINGLE LOW-9 QUOTATION MARK] +ifGlyph \x83 alias \u0192 \x83 # ƒ [LATIN SMALL LETTER F WITH HOOK] +ifGlyph \x84 alias \u201E \x84 # „ [DOUBLE LOW-9 QUOTATION MARK] +ifGlyph \x85 alias \u2026 \x85 # … [HORIZONTAL ELLIPSIS] +ifGlyph \x86 alias \u2020 \x86 # † [DAGGER] +ifGlyph \x87 alias \u2021 \x87 # ‡ [DOUBLE DAGGER] +ifGlyph \x88 alias \u02C6 \x88 # ˆ [MODIFIER LETTER CIRCUMFLEX ACCENT] +ifGlyph \x89 alias \u2030 \x89 # ‰ [PER MILLE SIGN] +ifGlyph \x8A alias \u0160 \x8A # Š [LATIN CAPITAL LETTER S WITH CARON] +ifGlyph \x8B alias \u2039 \x8B # ‹ [SINGLE LEFT-POINTING ANGLE QUOTATION MARK] +ifGlyph \x8C alias \u0152 \x8C # Œ [LATIN CAPITAL LIGATURE OE] +ifGlyph \x8E alias \u017D \x8E # Ž [LATIN CAPITAL LETTER Z WITH CARON] +ifGlyph \x91 alias \u2018 \x91 # ‘ [LEFT SINGLE QUOTATION MARK] +ifGlyph \x92 alias \u2019 \x92 # ’ [RIGHT SINGLE QUOTATION MARK] +ifGlyph \x93 alias \u201C \x93 # “ [LEFT DOUBLE QUOTATION MARK] +ifGlyph \x94 alias \u201D \x94 # ” [RIGHT DOUBLE QUOTATION MARK] +ifGlyph \x95 alias \u2022 \x95 # • [BULLET] +ifGlyph \x96 alias \u2013 \x96 # – [EN DASH] +ifGlyph \x97 alias \u2014 \x97 # — [EM DASH] +ifGlyph \x98 alias \u02DC \x98 # ˜ [SMALL TILDE] +ifGlyph \x99 alias \u2122 \x99 # ™ [TRADE MARK SIGN] +ifGlyph \x9A alias \u0161 \x9A # š [LATIN SMALL LETTER S WITH CARON] +ifGlyph \x9B alias \u203A \x9B # › [SINGLE RIGHT-POINTING ANGLE QUOTATION MARK] +ifGlyph \x9C alias \u0153 \x9C # œ [LATIN SMALL LIGATURE OE] +ifGlyph \x9E alias \u017E \x9E # ž [LATIN SMALL LETTER Z WITH CARON] +ifGlyph \x9F alias \u0178 \x9F # Ÿ [LATIN CAPITAL LETTER Y WITH DIAERESIS] + + +################################################# +# Windows-1252 characters Written to the Screen # +################################################# + +# Alias the Windows-1252 characters to their corresponding Unicode values so +# that their braille representations can be found. + +alias \x80 \u20AC # € [EURO SIGN] +alias \x82 \u201A # ‚ [SINGLE LOW-9 QUOTATION MARK] +alias \x83 \u0192 # ƒ [LATIN SMALL LETTER F WITH HOOK] +alias \x84 \u201E # „ [DOUBLE LOW-9 QUOTATION MARK] +alias \x85 \u2026 # … [HORIZONTAL ELLIPSIS] +alias \x86 \u2020 # † [DAGGER] +alias \x87 \u2021 # ‡ [DOUBLE DAGGER] +alias \x88 \u02C6 # ˆ [MODIFIER LETTER CIRCUMFLEX ACCENT] +alias \x89 \u2030 # ‰ [PER MILLE SIGN] +alias \x8A \u0160 # Š [LATIN CAPITAL LETTER S WITH CARON] +alias \x8B \u2039 # ‹ [SINGLE LEFT-POINTING ANGLE QUOTATION MARK] +alias \x8C \u0152 # Œ [LATIN CAPITAL LIGATURE OE] +alias \x8E \u017D # Ž [LATIN CAPITAL LETTER Z WITH CARON] +alias \x91 \u2018 # ‘ [LEFT SINGLE QUOTATION MARK] +alias \x92 \u2019 # ’ [RIGHT SINGLE QUOTATION MARK] +alias \x93 \u201C # “ [LEFT DOUBLE QUOTATION MARK] +alias \x94 \u201D # ” [RIGHT DOUBLE QUOTATION MARK] +alias \x95 \u2022 # • [BULLET] +alias \x96 \u2013 # – [EN DASH] +alias \x97 \u2014 # — [EM DASH] +alias \x98 \u02DC # ˜ [SMALL TILDE] +alias \x99 \u2122 # ™ [TRADE MARK SIGN] +alias \x9A \u0161 # š [LATIN SMALL LETTER S WITH CARON] +alias \x9B \u203A # › [SINGLE RIGHT-POINTING ANGLE QUOTATION MARK] +alias \x9C \u0153 # œ [LATIN SMALL LIGATURE OE] +alias \x9E \u017E # ž [LATIN SMALL LETTER Z WITH CARON] +alias \x9F \u0178 # Ÿ [LATIN CAPITAL LETTER Y WITH DIAERESIS] + + diff --git a/chrony/chrony.keys b/chrony/chrony.keys index cee70b3..a2d655d 100644 --- a/chrony/chrony.keys +++ b/chrony/chrony.keys @@ -6,5 +6,5 @@ # chronyc keygen 1 SHA256 256 >> /etc/chrony/chrony.keys # would generate a 256-bit SHA-256 key using ID 1. # -# A list of supported hash functions and output encoding can be found in -# the "keyfile" section from the "/usr/share/doc/chrony/chrony.txt.gz" file. +# A list of supported hash functions and output encoding is available by +# consulting the "keyfile" directive in the chrony.conf(5) man page. diff --git a/cron.d/mdadm b/cron.d/mdadm deleted file mode 100644 index 309d180..0000000 --- a/cron.d/mdadm +++ /dev/null @@ -1,12 +0,0 @@ -# -# cron.d/mdadm -- schedules periodic redundancy checks of MD devices -# -# Copyright © martin f. krafft -# distributed under the terms of the Artistic Licence 2.0 -# - -# By default, run at 00:57 on every Sunday, but do nothing unless the day of -# the month is less than or equal to 7. Thus, only run on the first Sunday of -# each month. crontab(5) sucks, unfortunately, in this regard; therefore this -# hack (see #380425). -57 0 * * 0 root if [ -x /usr/share/mdadm/checkarray ] && [ $(date +\%d) -le 7 ]; then /usr/share/mdadm/checkarray --cron --all --idle --quiet; fi diff --git a/cron.d/zfsutils-linux b/cron.d/zfsutils-linux index 2f3a8ca..fd395a8 100644 --- a/cron.d/zfsutils-linux +++ b/cron.d/zfsutils-linux @@ -1,4 +1,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # Scrub the second Sunday of every month. -24 0 8-14 * * root [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ] && /usr/lib/zfs-linux/scrub +24 0 8-14 * * root if [ $(date +\%w) -eq 0 ] && [ -x /usr/lib/zfs-linux/scrub ]; then /usr/lib/zfs-linux/scrub; fi diff --git a/cron.daily/man-db b/cron.daily/man-db index 0aeb8a5..1342bc6 100755 --- a/cron.daily/man-db +++ b/cron.daily/man-db @@ -4,6 +4,11 @@ set -e +if [ -d /run/systemd/system ]; then + # Skip in favour of systemd timer. + exit 0 +fi + iosched_idle= # Don't try to change I/O priority in a vserver or OpenVZ. if ! egrep -q '(envID|VxID):.*[1-9]' /proc/self/status && \ @@ -17,7 +22,7 @@ if ! [ -d /var/cache/man ]; then fi # expunge old catman pages which have not been read in a week -if [ ! -d /run/systemd/system ] && [ -d /var/cache/man ]; then +if [ -d /var/cache/man ]; then cd / start-stop-daemon --start --pidfile /dev/null --startas /bin/sh \ --oknodo --chuid man $iosched_idle -- -c \ diff --git a/cron.daily/mdadm b/cron.daily/mdadm deleted file mode 100755 index d5ac1ae..0000000 --- a/cron.daily/mdadm +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# cron.daily/mdadm -- daily check that MD devices are functional -# -# Copyright © 2008 Paul Slootman -# distributed under the terms of the Artistic Licence 2.0 - -# As recommended by the manpage, run -# mdadm --monitor --scan --oneshot -# every day to ensure that any degraded MD devices don't go unnoticed. -# Email will go to the address specified in /etc/mdadm/mdadm.conf . -# -set -eu - -MDADM=/sbin/mdadm -[ -x $MDADM ] || exit 0 # package may be removed but not purged - -exec $MDADM --monitor --scan --oneshot diff --git a/cron.daily/passwd b/cron.daily/passwd deleted file mode 100755 index 4778bf0..0000000 --- a/cron.daily/passwd +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -cd /var/backups || exit 0 - -for FILE in passwd group shadow gshadow; do - test -f /etc/$FILE || continue - cmp -s $FILE.bak /etc/$FILE && continue - cp -p /etc/$FILE $FILE.bak && chmod 600 $FILE.bak -done diff --git a/cron.weekly/man-db b/cron.weekly/man-db index 87da3b8..6e3ad83 100755 --- a/cron.weekly/man-db +++ b/cron.weekly/man-db @@ -4,6 +4,11 @@ set -e +if [ -d /run/systemd/system ]; then + # Skip in favour of systemd timer. + exit 0 +fi + iosched_idle= # Don't try to change I/O priority in a vserver or OpenVZ. if ! egrep -q '(envID|VxID):.*[1-9]' /proc/self/status && \ diff --git a/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd b/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd index 16e5f35..c34068c 100644 --- a/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd +++ b/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd @@ -155,7 +155,7 @@ *PageRegion EnvC5/Envelope C5: "<>setpagedevice" *PageRegion EnvDL/Envelope DL: "<>setpagedevice" *CloseUI: *PageRegion -*DefaultImageableArea: A4 +*DefaultImageableArea: Letter *ImageableArea Letter/US Letter: "12 12 600 780" *ImageableArea Legal/US Legal: "12 12 600 996" *ImageableArea Executive/Executive: "12 12 510 744" @@ -179,7 +179,7 @@ *ImageableArea EnvISOB5/Envelope B5: "12 12 487 697" *ImageableArea EnvC5/Envelope C5: "12 12 447 637" *ImageableArea EnvDL/Envelope DL: "12 12 300 612" -*DefaultPaperDimension: A4 +*DefaultPaperDimension: Letter *PaperDimension Letter/US Letter: "612 792" *PaperDimension Legal/US Legal: "612 1008" *PaperDimension Executive/Executive: "522 756" diff --git a/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd.O b/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd.O index 72f67fb..16e5f35 100644 --- a/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd.O +++ b/cups/ppd/Hewlett-Packard_HP_Color_LaserJet_MFP_M277dw.ppd.O @@ -155,7 +155,7 @@ *PageRegion EnvC5/Envelope C5: "<>setpagedevice" *PageRegion EnvDL/Envelope DL: "<>setpagedevice" *CloseUI: *PageRegion -*DefaultImageableArea: Letter +*DefaultImageableArea: A4 *ImageableArea Letter/US Letter: "12 12 600 780" *ImageableArea Legal/US Legal: "12 12 600 996" *ImageableArea Executive/Executive: "12 12 510 744" @@ -179,7 +179,7 @@ *ImageableArea EnvISOB5/Envelope B5: "12 12 487 697" *ImageableArea EnvC5/Envelope C5: "12 12 447 637" *ImageableArea EnvDL/Envelope DL: "12 12 300 612" -*DefaultPaperDimension: Letter +*DefaultPaperDimension: A4 *PaperDimension Letter/US Letter: "612 792" *PaperDimension Legal/US Legal: "612 1008" *PaperDimension Executive/Executive: "522 756" @@ -248,7 +248,7 @@ *OpenGroup: InstallableOptions/Installable Options *OpenUI *HPOption_Duplexer/Duplex Unit: Boolean *OrderDependency: 0 AnySetup *HPOption_Duplexer -*DefaultHPOption_Duplexer: False +*DefaultHPOption_Duplexer: True *HPOption_Duplexer True/On: "" *HPOption_Duplexer False/Off: "" *CloseUI: *HPOption_Duplexer diff --git a/cups/printers.conf b/cups/printers.conf index dcd6638..17c3dd9 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -32,8 +32,7 @@ MakeModel HP Color LaserJet Pro MFP M277 Postscript (recommended) DeviceURI dnssd://HP%20Color%20LaserJet%20MFP%20M277dw%20(28CAA8)._ipp._tcp.local/?uuid=564e4238-4b34-3044-4a46-3c528228caa8 State Idle StateTime 1593541277 -ConfigTime 1589725075 -Reason wifi-not-configured-report +ConfigTime 1595325762 Type 8425500 Accepting Yes Shared No diff --git a/cups/printers.conf.O b/cups/printers.conf.O index af7c292..dcd6638 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -1,7 +1,9 @@ -# Printer configuration file for CUPS v2.2.7 +# Printer configuration file for CUPS v2.3.1 # Written by cupsd # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING +NextPrinterId 3 +PrinterId 1 UUID urn:uuid:0f8503b4-fe4c-35ea-760f-71161f4f3f13 Info Kyocera FS-1020D Location bruni @@ -21,6 +23,7 @@ OpPolicy default ErrorPolicy retry-job +PrinterId 2 UUID urn:uuid:38ba23da-2745-3da7-565c-3282c050fbe8 AuthInfoRequired none Info Hewlett-Packard HP Color LaserJet MFP M277dw diff --git a/dbus-1/system.d/nm-dispatcher.conf b/dbus-1/system.d/nm-dispatcher.conf deleted file mode 100644 index fd2f0e5..0000000 --- a/dbus-1/system.d/nm-dispatcher.conf +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/dbus-1/system.d/org.freedesktop.ColorManager.conf b/dbus-1/system.d/org.freedesktop.ColorManager.conf deleted file mode 100644 index e628830..0000000 --- a/dbus-1/system.d/org.freedesktop.ColorManager.conf +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf b/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf deleted file mode 100644 index 4aac5b8..0000000 --- a/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/dbus-1/system.d/org.freedesktop.NetworkManager.conf b/dbus-1/system.d/org.freedesktop.NetworkManager.conf deleted file mode 100644 index 3dd2350..0000000 --- a/dbus-1/system.d/org.freedesktop.NetworkManager.conf +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1024 - 2048 - - diff --git a/dbus-1/system.d/org.freedesktop.bolt.conf b/dbus-1/system.d/org.freedesktop.bolt.conf deleted file mode 100644 index cdc87af..0000000 --- a/dbus-1/system.d/org.freedesktop.bolt.conf +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbus-1/system.d/org.freedesktop.fwupd.conf b/dbus-1/system.d/org.freedesktop.fwupd.conf deleted file mode 100644 index 7267fa9..0000000 --- a/dbus-1/system.d/org.freedesktop.fwupd.conf +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbus-1/system.d/wpa_supplicant.conf b/dbus-1/system.d/wpa_supplicant.conf index e375cdc..a333302 100644 --- a/dbus-1/system.d/wpa_supplicant.conf +++ b/dbus-1/system.d/wpa_supplicant.conf @@ -3,11 +3,6 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - - - - @@ -23,9 +18,6 @@ - - - diff --git a/debian_version b/debian_version index 2834e58..37ad99e 100644 --- a/debian_version +++ b/debian_version @@ -1 +1 @@ -buster/sid +bullseye/sid diff --git a/default/chrony b/default/chrony index b523f60..5391fc4 100644 --- a/default/chrony +++ b/default/chrony @@ -3,8 +3,8 @@ # the chrony daemon without editing the init script or service file. # Options to pass to chrony. -DAEMON_OPTS="" +DAEMON_OPTS="-F -1" -# Sync systecm clock in containers or without CAP_SYS_TIME (likely to fail) +# Sync system clock in containers or without CAP_SYS_TIME (likely to fail) # See /usr/share/doc/chrony/README.container for details. SYNC_IN_CONTAINER="no" diff --git a/default/grub.d/init-select.cfg b/default/grub.d/init-select.cfg new file mode 100644 index 0000000..7fbfff8 --- /dev/null +++ b/default/grub.d/init-select.cfg @@ -0,0 +1,7 @@ +# Work around a bug in the obsolete init-select package which broke +# grub-mkconfig when init-select was removed but not purged. This file does +# nothing and will be removed in a later release. +# +# See: +# https://bugs.debian.org/858528 +# https://bugs.debian.org/863801 diff --git a/default/kdm.d/10_desktop-base b/default/kdm.d/10_desktop-base deleted file mode 100644 index 434b518..0000000 --- a/default/kdm.d/10_desktop-base +++ /dev/null @@ -1,3 +0,0 @@ -USETHEME="true" -THEME="/usr/share/kde4/apps/kdm/themes/lines" -WALLPAPER="/usr/share/kde4/apps/kdm/themes/lines/background.svg" diff --git a/default/mdadm b/default/mdadm index b55b0ee..7bec463 100644 --- a/default/mdadm +++ b/default/mdadm @@ -11,6 +11,11 @@ # /etc/cron.d/mdadm. AUTOCHECK=true +# AUTOSCAN: +# should mdadm check once a day for degraded arrays? See +# /etc/cron.daily/mdadm. +AUTOSCAN=true + # START_DAEMON: # should mdadm start the MD monitoring daemon during boot? START_DAEMON=true diff --git a/default/named b/default/named new file mode 100644 index 0000000..66352f0 --- /dev/null +++ b/default/named @@ -0,0 +1,6 @@ +# +# run resolvconf? +RESOLVCONF=no + +# startup options for the server +OPTIONS="-u bind" diff --git a/default/qemu-kvm b/default/qemu-kvm index 5e98e61..08ab26c 100644 --- a/default/qemu-kvm +++ b/default/qemu-kvm @@ -4,7 +4,5 @@ KSM_ENABLED=AUTO SLEEP_MILLISECS=200 # Dropped VHOST_NET_ENABLED as this is auto-loaded in recent kernels -# it still works, but is deprecated and will be removed in a later version # Dropped KVM_HUGEPAGES as systemd provides feasible hugepage moutpoints -# it still works, but is deprecated and will be removed in a later version diff --git a/default/saned b/default/saned index b0647cc..691e5a5 100644 --- a/default/saned +++ b/default/saned @@ -1,8 +1,4 @@ # Defaults for the saned initscript, from sane-utils -# To enable under systemd please read README.Debian -# Set to yes to start saned under SysV -RUN=no - # Set to the user saned should run as RUN_AS_USER=saned diff --git a/default/smartmontools b/default/smartmontools index 6cbd289..6a8a6e2 100644 --- a/default/smartmontools +++ b/default/smartmontools @@ -5,8 +5,5 @@ # Not needed (and not recommended) if the device is monitored by smartd #enable_smart="/dev/hda /dev/hdb" -# uncomment to start smartd on system startup -#start_smartd=yes - # uncomment to pass additional options to smartd on startup #smartd_opts="--interval=1800" diff --git a/default/useradd b/default/useradd index a834fef..e32955a 100644 --- a/default/useradd +++ b/default/useradd @@ -2,7 +2,7 @@ # # The SHELL variable specifies the default login shell on your # system. -# Similar to DHSELL in adduser. However, we use "sh" here because +# Similar to DSHELL in adduser. However, we use "sh" here because # useradd is a low level utility and should be as general # as possible SHELL=/bin/sh diff --git a/default/zfs b/default/zfs index f2198d4..038ae6e 100644 --- a/default/zfs +++ b/default/zfs @@ -1,5 +1,11 @@ # ZoL userland configuration. +# NOTE: This file is intended for sysv init and initramfs. +# Changing some of these settings may not make any difference on +# systemd-based setup, e.g. setting ZFS_MOUNT=no will not prevent systemd +# from launching zfs-mount.service during boot. +# See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901436 + # To enable a boolean setting, set it to yes, on, true, or 1. # Anything else will be interpreted as unset. @@ -71,16 +77,16 @@ ZPOOL_IMPORT_OPTS="" # Full path to the ZFS cache file? # See "cachefile" in zpool(8). -# The default is "/etc/zfs/zpool.cache". -#ZPOOL_CACHE="/etc/zfs/zpool.cache" +# The default is "/usr/local/etc/zfs/zpool.cache". +#ZPOOL_CACHE="/usr/local/etc/zfs/zpool.cache" # # Setting ZPOOL_CACHE to an empty string ('') AND setting ZPOOL_IMPORT_OPTS to -# "-c /etc/zfs/zpool.cache" will _enforce_ the use of a cache file. +# "-c /usr/local/etc/zfs/zpool.cache" will _enforce_ the use of a cache file. # This is needed in some cases (extreme amounts of VDEVs, multipath etc). # Generally, the use of a cache file is usually not recommended on Linux # because it sometimes is more trouble than it's worth (laptops with external # devices or when/if device nodes changes names). -#ZPOOL_IMPORT_OPTS="-c /etc/zfs/zpool.cache" +#ZPOOL_IMPORT_OPTS="-c /usr/local/etc/zfs/zpool.cache" #ZPOOL_CACHE="" # Any additional option to the 'zfs mount' command line? @@ -91,6 +97,10 @@ MOUNT_EXTRA_OPTIONS="" # Only applicable for Debian GNU/Linux {dkms,initramfs}. ZFS_DKMS_ENABLE_DEBUG='no' +# Build kernel modules with the --enable-debuginfo switch? +# Only applicable for Debian GNU/Linux {dkms,initramfs}. +ZFS_DKMS_ENABLE_DEBUGINFO='no' + # Keep debugging symbols in kernel modules? # Only applicable for Debian GNU/Linux {dkms,initramfs}. ZFS_DKMS_DISABLE_STRIP='no' diff --git a/dhcp/dhclient-exit-hooks.d/chrony b/dhcp/dhclient-exit-hooks.d/chrony index 690f3ab..a1ea30d 100644 --- a/dhcp/dhclient-exit-hooks.d/chrony +++ b/dhcp/dhclient-exit-hooks.d/chrony @@ -1,16 +1,16 @@ SERVERFILE=/var/lib/dhcp/chrony.servers.$interface chrony_config() { - rm -f $SERVERFILE + rm -f "$SERVERFILE" for server in $new_ntp_servers; do - echo "$server iburst" >> $SERVERFILE + echo "$server iburst" >> "$SERVERFILE" done /usr/lib/chrony/chrony-helper update-daemon || : } chrony_restore() { - if [ -f $SERVERFILE ]; then - rm -f $SERVERFILE + if [ -f "$SERVERFILE" ]; then + rm -f "$SERVERFILE" /usr/lib/chrony/chrony-helper update-daemon || : fi } diff --git a/ffserver.conf b/ffserver.conf deleted file mode 100644 index e3f99bb..0000000 --- a/ffserver.conf +++ /dev/null @@ -1,372 +0,0 @@ -# Port on which the server is listening. You must select a different -# port from your standard HTTP web server if it is running on the same -# computer. -HTTPPort 8090 - -# Address on which the server is bound. Only useful if you have -# several network interfaces. -HTTPBindAddress 0.0.0.0 - -# Number of simultaneous HTTP connections that can be handled. It has -# to be defined *before* the MaxClients parameter, since it defines the -# MaxClients maximum limit. -MaxHTTPConnections 2000 - -# Number of simultaneous requests that can be handled. Since FFServer -# is very fast, it is more likely that you will want to leave this high -# and use MaxBandwidth, below. -MaxClients 1000 - -# This the maximum amount of kbit/sec that you are prepared to -# consume when streaming to clients. -MaxBandwidth 1000 - -# Access log file (uses standard Apache log file format) -# '-' is the standard output. -CustomLog - - -################################################################## -# Definition of the live feeds. Each live feed contains one video -# and/or audio sequence coming from an ffmpeg encoder or another -# ffserver. This sequence may be encoded simultaneously with several -# codecs at several resolutions. - - - -# You must use 'ffmpeg' to send a live feed to ffserver. In this -# example, you can type: -# -# ffmpeg http://localhost:8090/feed1.ffm - -# ffserver can also do time shifting. It means that it can stream any -# previously recorded live stream. The request should contain: -# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify -# a path where the feed is stored on disk. You also specify the -# maximum size of the feed, where zero means unlimited. Default: -# File=/tmp/feed_name.ffm FileMaxSize=5M -File /tmp/feed1.ffm -FileMaxSize 200K - -# You could specify -# ReadOnlyFile /saved/specialvideo.ffm -# This marks the file as readonly and it will not be deleted or updated. - -# Specify launch in order to start ffmpeg automatically. -# First ffmpeg must be defined with an appropriate path if needed, -# after that options can follow, but avoid adding the http:// field -#Launch ffmpeg - -# Only allow connections from localhost to the feed. -ACL allow 127.0.0.1 - - - - -################################################################## -# Now you can define each stream which will be generated from the -# original audio and video stream. Each format has a filename (here -# 'test1.mpg'). FFServer will send this stream when answering a -# request containing this filename. - - - -# coming from live feed 'feed1' -Feed feed1.ffm - -# Format of the stream : you can choose among: -# mpeg : MPEG-1 multiplexed video and audio -# mpegvideo : only MPEG-1 video -# mp2 : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec) -# ogg : Ogg format (Vorbis audio codec) -# rm : RealNetworks-compatible stream. Multiplexed audio and video. -# ra : RealNetworks-compatible stream. Audio only. -# mpjpeg : Multipart JPEG (works with Netscape without any plugin) -# jpeg : Generate a single JPEG image. -# mjpeg : Generate a M-JPEG stream. -# asf : ASF compatible streaming (Windows Media Player format). -# swf : Macromedia Flash compatible stream -# avi : AVI format (MPEG-4 video, MPEG audio sound) -Format mpeg - -# Bitrate for the audio stream. Codecs usually support only a few -# different bitrates. -AudioBitRate 32 - -# Number of audio channels: 1 = mono, 2 = stereo -AudioChannels 1 - -# Sampling frequency for audio. When using low bitrates, you should -# lower this frequency to 22050 or 11025. The supported frequencies -# depend on the selected audio codec. -AudioSampleRate 44100 - -# Bitrate for the video stream -VideoBitRate 64 - -# Ratecontrol buffer size -VideoBufferSize 40 - -# Number of frames per second -VideoFrameRate 3 - -# Size of the video frame: WxH (default: 160x128) -# The following abbreviations are defined: sqcif, qcif, cif, 4cif, qqvga, -# qvga, vga, svga, xga, uxga, qxga, sxga, qsxga, hsxga, wvga, wxga, wsxga, -# wuxga, woxga, wqsxga, wquxga, whsxga, whuxga, cga, ega, hd480, hd720, -# hd1080 -VideoSize 160x128 - -# Transmit only intra frames (useful for low bitrates, but kills frame rate). -#VideoIntraOnly - -# If non-intra only, an intra frame is transmitted every VideoGopSize -# frames. Video synchronization can only begin at an intra frame. -VideoGopSize 12 - -# More MPEG-4 parameters -# VideoHighQuality -# Video4MotionVector - -# Choose your codecs: -#AudioCodec mp2 -#VideoCodec mpeg1video - -# Suppress audio -#NoAudio - -# Suppress video -#NoVideo - -#VideoQMin 3 -#VideoQMax 31 - -# Set this to the number of seconds backwards in time to start. Note that -# most players will buffer 5-10 seconds of video, and also you need to allow -# for a keyframe to appear in the data stream. -#Preroll 15 - -# ACL: - -# You can allow ranges of addresses (or single addresses) -#ACL ALLOW - -# You can deny ranges of addresses (or single addresses) -#ACL DENY - -# You can repeat the ACL allow/deny as often as you like. It is on a per -# stream basis. The first match defines the action. If there are no matches, -# then the default is the inverse of the last ACL statement. -# -# Thus 'ACL allow localhost' only allows access from localhost. -# 'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and -# allow everybody else. - - - - -################################################################## -# Example streams - - -# Multipart JPEG - -# -#Feed feed1.ffm -#Format mpjpeg -#VideoFrameRate 2 -#VideoIntraOnly -#NoAudio -#Strict -1 -# - - -# Single JPEG - -# -#Feed feed1.ffm -#Format jpeg -#VideoFrameRate 2 -#VideoIntraOnly -##VideoSize 352x240 -#NoAudio -#Strict -1 -# - - -# Flash - -# -#Feed feed1.ffm -#Format swf -#VideoFrameRate 2 -#VideoIntraOnly -#NoAudio -# - - -# ASF compatible - - -Feed feed1.ffm -Format asf -VideoFrameRate 15 -VideoSize 352x240 -VideoBitRate 256 -VideoBufferSize 40 -VideoGopSize 30 -AudioBitRate 64 -StartSendOnKey - - - -# MP3 audio - -# -#Feed feed1.ffm -#Format mp2 -#AudioCodec mp3 -#AudioBitRate 64 -#AudioChannels 1 -#AudioSampleRate 44100 -#NoVideo -# - - -# Ogg Vorbis audio - -# -#Feed feed1.ffm -#Metadata title "Stream title" -#AudioBitRate 64 -#AudioChannels 2 -#AudioSampleRate 44100 -#NoVideo -# - - -# Real with audio only at 32 kbits - -# -#Feed feed1.ffm -#Format rm -#AudioBitRate 32 -#NoVideo -#NoAudio -# - - -# Real with audio and video at 64 kbits - -# -#Feed feed1.ffm -#Format rm -#AudioBitRate 32 -#VideoBitRate 128 -#VideoFrameRate 25 -#VideoGopSize 25 -#NoAudio -# - - -################################################################## -# A stream coming from a file: you only need to set the input -# filename and optionally a new format. Supported conversions: -# AVI -> ASF - -# -#File "/usr/local/httpd/htdocs/tlive.rm" -#NoAudio -# - -# -#File "/usr/local/httpd/htdocs/test.asf" -#NoAudio -#Metadata author "Me" -#Metadata copyright "Super MegaCorp" -#Metadata title "Test stream from disk" -#Metadata comment "Test comment" -# - - -################################################################## -# RTSP examples -# -# You can access this stream with the RTSP URL: -# rtsp://localhost:5454/test1-rtsp.mpg -# -# A non-standard RTSP redirector is also created. Its URL is: -# http://localhost:8090/test1-rtsp.rtsp - -# -#Format rtp -#File "/usr/local/httpd/htdocs/test1.mpg" -# - - -# Transcode an incoming live feed to another live feed, -# using libx264 and video presets - -# -#Format rtp -#Feed feed1.ffm -#VideoCodec libx264 -#VideoFrameRate 24 -#VideoBitRate 100 -#VideoSize 480x272 -#AVPresetVideo default -#AVPresetVideo baseline -#AVOptionVideo flags +global_header -# -#AudioCodec aac -#AudioBitRate 32 -#AudioChannels 2 -#AudioSampleRate 22050 -#AVOptionAudio flags +global_header -# - -################################################################## -# SDP/multicast examples -# -# If you want to send your stream in multicast, you must set the -# multicast address with MulticastAddress. The port and the TTL can -# also be set. -# -# An SDP file is automatically generated by ffserver by adding the -# 'sdp' extension to the stream name (here -# http://localhost:8090/test1-sdp.sdp). You should usually give this -# file to your player to play the stream. -# -# The 'NoLoop' option can be used to avoid looping when the stream is -# terminated. - -# -#Format rtp -#File "/usr/local/httpd/htdocs/test1.mpg" -#MulticastAddress 224.124.0.1 -#MulticastPort 5000 -#MulticastTTL 16 -#NoLoop -# - - -################################################################## -# Special streams - -# Server status - - -Format status - -# Only allow local people to get the status -ACL allow localhost -ACL allow 192.168.0.0 192.168.255.255 - -#FaviconURL http://pond1.gladstonefamily.net:8080/favicon.ico - - - -# Redirect index.html to the appropriate site - - -URL http://www.ffmpeg.org/ - diff --git a/fonts/conf.d/61-urw-bookman.conf b/fonts/conf.d/61-urw-bookman.conf new file mode 120000 index 0000000..b69766f --- /dev/null +++ b/fonts/conf.d/61-urw-bookman.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-bookman.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-c059.conf b/fonts/conf.d/61-urw-c059.conf new file mode 120000 index 0000000..b04adf4 --- /dev/null +++ b/fonts/conf.d/61-urw-c059.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-c059.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-d050000l.conf b/fonts/conf.d/61-urw-d050000l.conf new file mode 120000 index 0000000..9354e6e --- /dev/null +++ b/fonts/conf.d/61-urw-d050000l.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-d050000l.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-fallback-backwards.conf b/fonts/conf.d/61-urw-fallback-backwards.conf new file mode 120000 index 0000000..0620e3c --- /dev/null +++ b/fonts/conf.d/61-urw-fallback-backwards.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-fallback-backwards.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-fallback-generics.conf b/fonts/conf.d/61-urw-fallback-generics.conf new file mode 120000 index 0000000..f5eb212 --- /dev/null +++ b/fonts/conf.d/61-urw-fallback-generics.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-fallback-generics.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-gothic.conf b/fonts/conf.d/61-urw-gothic.conf new file mode 120000 index 0000000..5ca7b68 --- /dev/null +++ b/fonts/conf.d/61-urw-gothic.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-gothic.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-nimbus-mono-ps.conf b/fonts/conf.d/61-urw-nimbus-mono-ps.conf new file mode 120000 index 0000000..507c5da --- /dev/null +++ b/fonts/conf.d/61-urw-nimbus-mono-ps.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-nimbus-mono-ps.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-nimbus-roman.conf b/fonts/conf.d/61-urw-nimbus-roman.conf new file mode 120000 index 0000000..d41b7a1 --- /dev/null +++ b/fonts/conf.d/61-urw-nimbus-roman.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-nimbus-roman.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-nimbus-sans.conf b/fonts/conf.d/61-urw-nimbus-sans.conf new file mode 120000 index 0000000..b091be2 --- /dev/null +++ b/fonts/conf.d/61-urw-nimbus-sans.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-nimbus-sans.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-p052.conf b/fonts/conf.d/61-urw-p052.conf new file mode 120000 index 0000000..ae0c852 --- /dev/null +++ b/fonts/conf.d/61-urw-p052.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-p052.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-standard-symbols-ps.conf b/fonts/conf.d/61-urw-standard-symbols-ps.conf new file mode 120000 index 0000000..923d449 --- /dev/null +++ b/fonts/conf.d/61-urw-standard-symbols-ps.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-standard-symbols-ps.conf \ No newline at end of file diff --git a/fonts/conf.d/61-urw-z003.conf b/fonts/conf.d/61-urw-z003.conf new file mode 120000 index 0000000..2f24680 --- /dev/null +++ b/fonts/conf.d/61-urw-z003.conf @@ -0,0 +1 @@ +/usr/share/fontconfig/conf.avail/urw-z003.conf \ No newline at end of file diff --git a/fwupd/daemon.conf b/fwupd/daemon.conf index 881c145..8b472b9 100644 --- a/fwupd/daemon.conf +++ b/fwupd/daemon.conf @@ -6,7 +6,7 @@ BlacklistDevices= # Allow blacklisting specific plugins # Uses semicolons as delimiter -BlacklistPlugins=test +BlacklistPlugins=test;invalid # Maximum archive size that can be loaded in Mb, with 0 for the default ArchiveSizeMax=0 @@ -22,3 +22,6 @@ IdleTimeout=7200 # If set to FuValue, FuValue domain (same as --domain-verbose=FuValue) # If set to *, all domains (same as --verbose) VerboseDomains= + +# Update the message of the day (MOTD) on device and metadata changes +UpdateMotd=true diff --git a/fwupd/remotes.d/lvfs-testing.conf b/fwupd/remotes.d/lvfs-testing.conf index fb60efd..bbd7473 100644 --- a/fwupd/remotes.d/lvfs-testing.conf +++ b/fwupd/remotes.d/lvfs-testing.conf @@ -9,4 +9,5 @@ ReportURI=https://fwupd.org/lvfs/firmware/report Username= Password= OrderBefore=lvfs,fwupd +AutomaticReports=false ApprovalRequired=false diff --git a/fwupd/remotes.d/lvfs.conf b/fwupd/remotes.d/lvfs.conf index a08562f..047f942 100644 --- a/fwupd/remotes.d/lvfs.conf +++ b/fwupd/remotes.d/lvfs.conf @@ -7,4 +7,5 @@ Keyring=gpg MetadataURI=https://cdn.fwupd.org/downloads/firmware.xml.gz ReportURI=https://fwupd.org/lvfs/firmware/report OrderBefore=fwupd +AutomaticReports=false ApprovalRequired=false diff --git a/fwupd/thunderbolt.conf b/fwupd/thunderbolt.conf new file mode 100644 index 0000000..72dc0e4 --- /dev/null +++ b/fwupd/thunderbolt.conf @@ -0,0 +1,6 @@ +[thunderbolt] + +# Minimum kernel version to allow use of this plugin +# It's important that all backports from this kernel have been +# made if using an older kernel +MinimumKernelVersion=4.13.0 diff --git a/fwupd/upower.conf b/fwupd/upower.conf new file mode 100644 index 0000000..18c3b19 --- /dev/null +++ b/fwupd/upower.conf @@ -0,0 +1,5 @@ +[upower] + +# The threshold to to require battery be at or above to allow updates +# Measure in percent +BatteryThreshold=10 diff --git a/gnome-system-tools/user-profiles.conf b/gnome-system-tools/user-profiles.conf index a7c90df..d040454 100644 --- a/gnome-system-tools/user-profiles.conf +++ b/gnome-system-tools/user-profiles.conf @@ -87,7 +87,7 @@ Description[zh_CN]=不能执行普通任务。不能安装软件或修改影响 Description[zh_HK]=可以進行一般工作。不能安裝軟件或改變會影響所有使用者的設定值。 Description[zh_TW]=可以進行一般工作。不能安裝軟體或改變會影響所有使用者的設定值。 Default=1 -Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,video +Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,fuse,video [Administrator] Name=Administrator @@ -179,4 +179,4 @@ Description[uk]=Може змінювати у системі що завгод Description[zh_CN]=可以更改系统上的一切，包括安装和升级软件。 Description[zh_HK]=可以改變系統中的任何事，包括安裝和升級軟件。 Description[zh_TW]=可以改變系統中的任何事，包括安裝和升級軟體。 -Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,audio,scanner,fuse,sudo,sambashare,lpadmin,video +Groups=cdrom,floppy,dialout,tape,dip,adm,plugdev,fax,fuse,sudo,sambashare,lpadmin,video diff --git a/group b/group index feba050..76b3be5 100644 --- a/group +++ b/group @@ -89,3 +89,5 @@ gast:x:1126: docker:x:146:frank tcpdump:x:147: render:x:148: +tss:x:149: +_flatpak:x:150: diff --git a/group- b/group- index fc8002b..5149806 100644 --- a/group- +++ b/group- @@ -88,3 +88,5 @@ nobody:x:1000: gast:x:1126: docker:x:146:frank tcpdump:x:147: +render:x:148: +tss:x:149: diff --git a/grub.d/00_header b/grub.d/00_header index 646a628..c627dbb 100755 --- a/grub.d/00_header +++ b/grub.d/00_header @@ -50,6 +50,18 @@ if [ -s \$prefix/grubenv ]; then load_env fi EOF +cat < get the device mapper UUID for /dev/dm-0 +# get_dm_field_for_dev /dev/dm-1 name -> get the device mapper name for /dev/dm-1 +# etc +get_dm_field_for_dev () { + dmsetup info -c --noheadings -o $2 $1 2>/dev/null +} + +# Is $1 a multipath device? +is_multipath () { + local dmuuid dmtype + dmuuid="$(get_dm_field_for_dev $1 uuid)" + if [ $? -ne 0 ]; then + # Not a device mapper device -- or dmsetup not installed, and as + # multipath depends on kpartx which depends on dmsetup, if there is no + # dmsetup then there are not going to be any multipath devices. + return 1 + fi + # A device mapper "uuid" is always -. If is of the form + # part[0-9] then is the device the partition is on and we want to + # look at that instead. A multipath node always has of mpath. + dmtype="${dmuuid%%-*}" + if [ "${dmtype#part}" != "$dmtype" ]; then + dmuuid="${dmuuid#*-}" + dmtype="${dmuuid%%-*}" + fi + if [ "$dmtype" = "mpath" ]; then + return 0 + else + return 1 + fi +} + +if test -e "${GRUB_DEVICE}" && is_multipath "${GRUB_DEVICE}"; then + # If / is multipathed, there will be multiple paths to the partition, so + # using root=UUID= exposes the boot process to udev races. In addition + # GRUB_DEVICE in this case will be /dev/dm-0 or similar -- better to use a + # symlink that depends on the multipath name. + GRUB_DEVICE=/dev/mapper/"$(get_dm_field_for_dev $GRUB_DEVICE name)" + GRUB_DISABLE_LINUX_UUID=true +fi + # btrfs may reside on multiple devices. We cannot pass them as value of root= parameter # and mounting btrfs requires user space scanning, so force UUID in this case. -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ +if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \ + || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + && [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \ + || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + && ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then LINUX_ROOT_DEVICE=${GRUB_DEVICE} +elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then + LINUX_ROOT_DEVICE=PARTUUID=${GRUB_DEVICE_PARTUUID} else LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} fi @@ -79,9 +130,13 @@ case x"$GRUB_FS" in GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" fi;; xzfs) + # We have a more specialized ZFS handler, with multiple system in 10_linux_zfs. + if [ -e "`dirname $(readlink -f $0)`/10_linux_zfs" ]; then + exit 0 + fi rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" - LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}" ;; esac @@ -104,6 +159,10 @@ if [ "$vt_handoff" = 1 ]; then done fi +if [ x"$GRUB_FORCE_PARTUUID" != x ]; then + echo "set partuuid=${GRUB_FORCE_PARTUUID}" +fi + linux_entry () { os="$1" @@ -179,27 +238,60 @@ EOF linux ${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args} EOF else - if [ x"$GRUB_FORCE_PARTUUID" = x ]; then + # We have initrd and PARTUUID is set - we try to boot without initrd, and fallback to using it + # if it fails. + # "panic=-1" means "on panic reboot immediately". "panic=0" disables the reboot behavior. + if [ x"$GRUB_FORCE_PARTUUID" != x ]; then + linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}" + fi + message="$(gettext_printf "Loading initial ramdisk ...")" + if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then sed "s/^/$submenu_indentation/" << EOF - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} + if [ "\${initrdfail}" = 1 ]; then + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +EOF + if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +EOF + fi + + sed "s/^/$submenu_indentation/" << EOF + initrd ${rel_dirname}/${initrd} + else + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1 + fi + initrdfail EOF else + # We don't have initrd or we don't want to set PARTUUID. Don't try initrd-less boot with fallback. sed "s/^/$submenu_indentation/" << EOF - linux ${rel_dirname}/${basename} root=PARTUUID=${GRUB_FORCE_PARTUUID} ro ${args} + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} EOF - fi - fi - if test -n "${initrd}" && [ x"$GRUB_DISABLE_INITRD" != xtrue ]; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then - message="$(gettext_printf "Loading initial ramdisk ...")" - sed "s/^/$submenu_indentation/" << EOF + if test -n "${initrd}"; then + # We do have initrd - let's use it at boot. + # TRANSLATORS: ramdisk isn't identifier. Should be translated. + if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then + sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' EOF - fi - sed "s/^/$submenu_indentation/" << EOF + fi + sed "s/^/$submenu_indentation/" << EOF initrd ${rel_dirname}/${initrd} EOF + fi + fi + if test -n "${dtb}" ; then + if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then + message="$(gettext_printf "Loading device tree blob...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +EOF + fi + sed "s/^/$submenu_indentation/" << EOF + devicetree ${rel_dirname}/${dtb} +EOF + fi fi sed "s/^/$submenu_indentation/" << EOF } @@ -240,7 +332,7 @@ EOF if [ "$vt_handoff" = 1 ]; then cat << 'EOF' if [ "${1}" = "keep" ]; then - set vt_handoff=vt.handoff=1 + set vt_handoff=vt.handoff=7 else set vt_handoff= fi @@ -301,7 +393,15 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - initrd= + initrd_early= + for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \ + ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do + if test -e "${dirname}/${i}" ; then + initrd_early="${initrd_early} ${i}" + fi + done + + initrd_real= for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ @@ -311,7 +411,29 @@ while [ "x$list" != "x" ] ; do "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do if test -e "${dirname}/${i}" ; then - initrd="$i" + initrd_real="${i}" + break + fi + done + + initrd= + if test -n "${initrd_early}" || test -n "${initrd_real}"; then + initrd="${initrd_real}" + if test -n "${initrd_early}"; then + initrd="${initrd_early} ${initrd}" + fi + + initrd_display= + for i in ${initrd}; do + initrd_display="${initrd_display} ${dirname}/${i}" + done + gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 + fi + + dtb= + for i in "dtb-${version}" "dtb-${alt_version}" "dtb"; do + if test -e "${dirname}/${i}" ; then + dtb="$i" break fi done @@ -329,12 +451,16 @@ while [ "x$list" != "x" ] ; do initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"` fi - if test -n "${initrd}" ; then - gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 - elif test -z "${initramfs}" ; then + if test -z "${initramfs}" && test -z "${initrd_real}" ; then # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's # no initrd or builtin initramfs, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} + if [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ]; then + + linux_root_device_thisversion=${GRUB_DEVICE} + else + linux_root_device_thisversion=PARTUUID=${GRUB_DEVICE_PARTUUID} + fi fi if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then diff --git a/grub.d/10_linux_zfs b/grub.d/10_linux_zfs new file mode 100755 index 0000000..ae93c40 --- /dev/null +++ b/grub.d/10_linux_zfs @@ -0,0 +1,1108 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2019 Canonical Ltd. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix="/usr" +datarootdir="/usr/share" +ubuntu_recovery="1" +quiet_boot="1" +quick_boot="1" +gfxpayload_dynamic="1" +vt_handoff="1" + +. "${pkgdatadir}/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +set -u + +## Skip early if zfs utils isn't installed (instead of failing on first zpool list) +if ! `which zfs >/dev/null 2>&1`; then + exit 0 +fi + +imported_pools="" +MNTDIR="$(mktemp -d ${TMPDIR:-/tmp}/zfsmnt.XXXXXX)" +ZFSTMP="$(mktemp -d ${TMPDIR:-/tmp}/zfstmp.XXXXXX)" + +RC=0 +on_exit() { + # Restore initial zpool import state + for pool in ${imported_pools}; do + zpool export "${pool}" + done + + mountpoint -q "${MNTDIR}" && umount "${MNTDIR}" || true + rmdir "${MNTDIR}" + rm -rf "${ZFSTMP}" + exit "${RC}" +} +trap on_exit EXIT INT QUIT ABRT PIPE TERM + +# List ONLINE and DEGRADED pools +import_pools() { + # We have to ignore zpool import output, as potentially multiple / will be available, + # and we need to autodetect all zpools this way with their real mountpoints. + local initial_pools="$(zpool list | awk '{if (NR>1) print $1}')" + local all_pools="" + local imported_pools="" + local err="" + + set +e + err="$(zpool import -f -a -o cachefile=none -o readonly=on -N 2>&1)" + # Only print stderr if the command returned an error + # (it can echo "No zpool to import" with success, which we don't want) + if [ $? -ne 0 ]; then + echo "Some pools couldn't be imported and will be ignored:\n${err}" >&2 + fi + set -e + + all_pools="$(zpool list | awk '{if (NR>1) print $1}')" + for pool in ${all_pools}; do + if echo "${initial_pools}" | grep -wq "${pool}"; then + continue + fi + imported_pools="${imported_pools} ${pool}" + done + + echo "${imported_pools}" +} + +# List all the dataset with a root mountpoint +get_root_datasets() { + local pools="$(zpool list | awk '{if (NR>1) print $1}')" + + for p in ${pools}; do + local rel_pool_root=$(zpool get -H altroot ${p} | awk '{print $3}') + if [ "${rel_pool_root}" = "-" ]; then + rel_pool_root="/" + fi + + zfs list -H -o name,canmount,mountpoint -t filesystem | grep -E '^'"${p}"'(\s|/[[:print:]]*\s)(on|noauto)\s'"${rel_pool_root}"'$' | awk '{print $1}' + done +} + +# find if given datasets can be mounted for directory and return its path (snapshot or real path) +# $1 is our current dataset name +# $2 directory path we look for (cannot contains /) +# $3 is the temporary mount directory to use +# $4 is the optional snapshot name +# return path for directory (which can be a mountpoint) +validate_system_dataset() { + local dataset="$1" + local directory="$2" + local mntdir="$3" + local snapshot_name="$4" + + local mount_path="${mntdir}/${directory}" + + if ! zfs list "${dataset}" >/dev/null 2>&1; then + return + fi + + if ! mount -o noatime,zfsutil -t zfs "${dataset}" "${mount_path}"; then + grub_warn "Failed to find a valid directory '${directory}' for dataset '${dataset}@${snapshot_name}'. Ignoring" + return + fi + + local candidate_path="${mount_path}" + if [ -n "${snapshot_name}" ]; then + # WORKAROUND a bug https://github.com/zfsonlinux/zfs/issues/9958 + # Reading the content of a snapshot fails if it is not the first mount + # for a given dataset + first_mntdir=$(awk '{if ($1 == "'${dataset}'") {print $2; exit;}}' /proc/mounts) + if [ "${first_mntdir}" = "/" ]; then + # prevents // on candidate_path + first_mntdir="" + fi + candidate_path="${first_mntdir}/.zfs/snapshot/${snapshot_name}" + fi + + if [ -n "$(ls ${candidate_path} 2>/dev/null)" ]; then + echo "${candidate_path}" + return + else + mountpoint -q "${mount_path}" && umount "${mount_path}" || true + fi +} + +# Detect system directory relevant to the other, trying to find the ones associated on the current dataset or snapshot/ +# System directory should be at most a direct child dataset of main datasets (no recursivity) +# We can fallback trying other zfs pools if no match has been found. +# $1 is our current dataset name (which can have @snapshot name) +# $2 directory path we look for (cannot contains /) +# $3 restrict_to_same_pool (true|false) force looking for dataset with the same basename in the current dataset pool only +# $4 is the temporary mount directory to use +# $5 is the optional etc directory (if not $2 is not etc itself) +# return path for directory (which can be a mountpoint) +get_system_directory() { + local dataset_path="$1" + local directory="$2" + local restrict_to_same_pool="$3" + local mntdir="$4" + local etc_dir="$5" + + if [ -z "${etc_dir}" ]; then + etc_dir="${mntdir}/etc" + fi + + local candidate_path="${mntdir}/${directory}" + + # 1. Look for /etc/fstab first (which will mount even on top of non empty $directory) + local mounted_fstab_entry="false" + if [ -f "${etc_dir}/fstab" ]; then + mount_args=$(awk '/^[^#].*[ \t]\/'"${directory}"'[ \t]/ {print "-t", $3, $1}' "${etc_dir}/fstab") + if [ -n "${mount_args}" ]; then + mounted_fstab_entry="true" + mount -o noatime ${mount_args} "${candidate_path}" || mounted_fstab_entry="false" + fi + fi + + # If directory isn't empty. Only count if coming from /etc/fstab. Will be + # handled below otherwise as we are interested in potential snapshots. + if [ "${mounted_fstab_entry}" = "true" -a -n "$(ls ${candidate_path} 2>/dev/null)" ]; then + echo "${candidate_path}" + return + fi + + # 2. Handle zfs case, which can be a snapshots. + + local base_dataset_path="${dataset_path}" + local snapshot_name="" + # For snapshots we extract the parent dataset + if echo "${dataset_path}" | grep -q '@'; then + base_dataset_path=$(echo "${dataset_path}" | cut -d '@' -f1) + snapshot_name=$(echo "${dataset_path}" | cut -d '@' -f2) + fi + base_dataset_name="${base_dataset_path##*/}" + base_pool="$(echo "${base_dataset_path}" | cut -d'/' -f1)" + + # 2.a) Look for child dataset included in base dataset, which needs to hold same snapshot if any + candidate_path=$(validate_system_dataset "${base_dataset_path}/${directory}" "${directory}" "${mntdir}" "${snapshot_name}") + if [ -n "${candidate_path}" ]; then + echo "${candidate_path}" + return + fi + + # 2.b) Look for current dataset (which is already mounted as /) + candidate_path="${mntdir}/${directory}" + if [ -n "${snapshot_name}" ]; then + # WORKAROUND a bug https://github.com/zfsonlinux/zfs/issues/9958 + # Reading the content of a snapshot fails if it is not the first mount + # for a given dataset + first_mntdir=$(awk '{if ($1 == "'${base_dataset_path}'") {print $2; exit;}}' /proc/mounts) + if [ "${first_mntdir}" = "/" ]; then + # prevents // on candidate_path + first_mntdir="" + fi + candidate_path="${first_mntdir}/.zfs/snapshot/${snapshot_name}/${directory}" + fi + if [ -n "$(ls ${candidate_path} 2>/dev/null)" ]; then + echo "${candidate_path}" + return + fi + + # 2.c) Look for every datasets in every pool which isn't the current dataset which holds: + # - the same dataset name (last section) than our base_dataset_name + # - mountpoint=directory + # - canmount!=off + all_same_base_dataset_name="$(zfs list -H -t filesystem -o name,canmount | awk '/^[^ ]+\/'"${base_dataset_name}"'[ \t](on|noauto)/ {print $1}') " + + # order by local pool datasets first + current_pool_same_base_datasets="" + other_pools_same_base_datasets="" + root_pool=$(echo "${dataset_path%%/*}") + for d in ${all_same_base_dataset_name}; do + cur_dataset_pool=$(echo "${d%%/*}") + if echo "${cur_dataset_pool}" | grep -wq "${root_pool}" 2>/dev/null ; then + current_pool_same_base_datasets="${current_pool_same_base_datasets} ${d}" + else + other_pools_same_base_datasets="${other_pools_same_base_datasets} ${d}" + fi + done + ordered_same_base_datasets="${current_pool_same_base_datasets} ${other_pools_same_base_datasets}" + if [ "${restrict_to_same_pool}" = "true" ]; then + ordered_same_base_datasets="${current_pool_same_base_datasets}" + fi + + # now, loop over them + for d in ${ordered_same_base_datasets}; do + cur_dataset_pool=$(echo "${d%%/*}") + + rel_pool_root=$(zpool get -H altroot ${cur_dataset_pool} | awk '{print $3}') + if [ "${rel_pool_root}" = "-" ]; then + rel_pool_root="" + fi + + # check mountpoint match + candidate_dataset=$(zfs get -H mountpoint ${d} | grep -E "mountpoint\s${rel_pool_root}/${directory}\s" | awk '{print $1}') + if [ -z "${candidate_dataset}" ]; then + continue + fi + + candidate_path=$(validate_system_dataset "${candidate_dataset}" "${directory}" "${mntdir}" "${snapshot_name}") + if [ -n "${candidate_path}" ]; then + echo "${candidate_path}" + return + fi + done + + # 2.d) If we didn't find anything yet: check for persistent datasets corresponding to our mountpoint, with canmount=on without any snapshot associated: + # Note: we go over previous datasets as well, but this is ok, as we didn't include them before. + all_mountable_datasets="$(zfs list -t filesystem -o name,canmount | awk '/^[^ ]+[ \t]+on/ {print $1}')" + + # order by local pool datasets first + current_pool_datasets="" + other_pools_datasets="" + root_pool=$(echo "${dataset_path%%/*}") + for d in ${all_mountable_datasets}; do + cur_dataset_pool=$(echo "${d%%/*}") + if echo "${cur_dataset_pool}" | grep -wq "${root_pool}" 2>/dev/null ; then + current_pool_datasets="${current_pool_datasets} ${d}" + else + other_pools_datasets="${other_pools_datasets} ${d}" + fi + done + ordered_datasets="${current_pool_datasets} ${other_pools_datasets}" + if [ "${restrict_to_same_pool}" = "true" ]; then + ordered_datasets="${current_pool_datasets}" + fi + + for d in ${ordered_datasets}; do + cur_dataset_pool=$(echo "${d%%/*}") + + rel_pool_root=$(zpool get -H altroot ${cur_dataset_pool} | awk '{print $3}') + if [ "${rel_pool_root}" = "-" ]; then + rel_pool_root="" + fi + + # check mountpoint match + candidate_dataset=$(zfs get -H mountpoint ${d} | grep -E "mountpoint\s${rel_pool_root}/${directory}\s" | awk '{print $1}') + if [ -z "${candidate_dataset}" ]; then + continue + fi + + candidate_path=$(validate_system_dataset "${d}" "${directory}" "${mntdir}" "") + if [ -n "${candidate_path}" ]; then + echo "${candidate_path}" + return + fi + done + + grub_warn "Failed to find a valid directory '${directory}' for dataset '${dataset_path}'. Ignoring" + return +} + +# Try our default layout bpool as a prefered layout (fast path) +# This is get_system_directory for boot optimized for our default installation layout +# $1 is our current dataset name (which can have @snapshot name) +# $2 is the temporary mount directory to use +# return path for directory (which can be a mountpoint) if found +try_default_layout_bpool() { + local root_dataset_path="$1" + local mntdir="$2" + + dataset_basename="${root_dataset_path##*/}" + candidate_dataset="bpool/BOOT/${dataset_basename}" + dataset_properties="$(zfs get -H mountpoint,canmount ${candidate_dataset} | cut -f3 | paste -sd ' ')" + if [ -z "${dataset_properties}" ]; then + return + fi + + rel_pool_root=$(zpool get -H altroot bpool | awk '{print $3}') + if [ "${rel_pool_root}" = "-" ]; then + rel_pool_root="" + fi + + snapshot_name="${dataset_basename##*@}" + [ "${snapshot_name}" = "${dataset_basename}" ] && snapshot_name="" + if [ -z "${snapshot_name}" ]; then + if ! echo "${dataset_properties}" | grep -Eq "${rel_pool_root}/boot (on|noauto)"; then + return + fi + else + candidate_dataset=$(echo "${candidate_dataset}" | cut -d '@' -f1) + fi + + validate_system_dataset "${candidate_dataset}" "boot" "${mntdir}" "${snapshot_name}" +} + +# Return if secure boot is enabled on that system +is_secure_boot_enabled() { + if LANG=C mokutil --sb-state 2>/dev/null | grep -qi enabled; then + echo "true" + return + fi + echo "false" + return +} + +# Given a filesystem or snapshot dataset, returns dataset|machine id|pretty name|last used +# $1 is dataset we want information from +# $2 is the temporary mount directory to use +get_dataset_info() { + local dataset="$1" + local mntdir="$2" + + local base_dataset="${dataset}" + local etc_dir="${mntdir}/etc" + local is_snapshot="false" + # For snapshot we extract the parent dataset + if echo "${dataset}" | grep -q '@'; then + base_dataset=$(echo "${dataset}" | cut -d '@' -f1) + is_snapshot="true" + fi + + mount -o noatime,zfsutil -t zfs "${base_dataset}" "${mntdir}" + + # read machine-id/os-release from /etc + etc_dir=$(get_system_directory "${dataset}" "etc" "true" "${mntdir}" "") + if [ -z "${etc_dir}" ]; then + grub_warn "Ignoring ${dataset}" + mountpoint -q "${mntdir}/etc" && umount "${mntdir}/etc" || true + umount "${mntdir}" + return + fi + + machine_id="" + if [ -f "${etc_dir}/machine-id" ]; then + machine_id=$(cat "${etc_dir}/machine-id") + fi + # We have to use a random temporary id if we don't have any machine-id file or if this one is empty + # (mostly the case of new installations before first boot). + # Let's use the dataset name directly for this. + # Consequence is that all datasets are then separated. + if [ -z "${machine_id}" ]; then + machine_id="${dataset}" + fi + pretty_name=$(. "${etc_dir}/os-release" && echo "${PRETTY_NAME}") + mountpoint -q "${mntdir}/etc" && umount "${mntdir}/etc" || true + + # read available kernels from /boot + boot_dir="$(try_default_layout_bpool "${dataset}" "${mntdir}")" + if [ -z "${boot_dir}" ]; then + boot_dir=$(get_system_directory "${dataset}" "boot" "false" "${mntdir}" "${etc_dir}") + fi + + if [ -z "${boot_dir}" ]; then + grub_warn "Ignoring ${dataset}" + mountpoint -q "${mntdir}/boot" && umount "${mntdir}/boot" || true + umount "${mntdir}" + return + fi + + machine="$(uname -m)" + case "${machine}" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; + mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; + arm*) GENKERNEL_ARCH="arm" ;; + *) GENKERNEL_ARCH="${machine}" ;; + esac + + initrd_list="" + kernel_list="" + for linux in $(find "${boot_dir}" -maxdepth 1 -type f -regex '.*/\(vmlinuz\|vmlinux\|kernel\)-.*'|sort -V); do + if ! grub_file_is_not_garbage "${linux}" ; then + continue + fi + + # Filters entry if efi/non efi. + # Note that for now we allow kernel without .efi.signed as those are signed kernel + # on ubuntu, loaded by the shim. + case "${linux}" in + *.efi.signed) + if [ "$(is_secure_boot_enabled)" = "false" ]; then + continue + fi + ;; + esac + + linux_basename=$(basename "${linux}") + linux_dirname=$(dirname "${linux}") + version=$(echo "${linux_basename}" | sed -e "s,^[^0-9]*-,,g") + alt_version=$(echo "${version}" | sed -e "s,\.old$,,g") + + gettext_printf "Found linux image: %s in %s\n" "${linux_basename}" "${dataset}" >&2 + + initrd="" + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do + if test -e "${linux_dirname}/${i}" ; then + initrd="$i" + break + fi + done + + if test -z "${initrd}" ; then + grub_warn "Couldn't find any valid initrd for dataset ${dataset}." + continue + fi + + gettext_printf "Found initrd image: %s in %s\n" "${initrd}" "${dataset}" >&2 + + rel_linux_dirname=$(make_system_path_relative_to_its_root "${linux_dirname}") + + initrd_list="${rel_linux_dirname}/${initrd}|${initrd_list}" + kernel_list="${rel_linux_dirname}/${linux_basename}|${kernel_list}" + done + + initrd_list="${initrd_list%|}" + kernel_list="${kernel_list%|}" + + initrd_device=$(${grub_probe} --target=device "${boot_dir}" | head -1) + + mountpoint -q "${mntdir}/boot" && umount "${mntdir}/boot" || true + # We needed to look in / for snapshots on root dataset, umount there before zfs lazily unmount it + case "${boot_dir}" in /boot/.zfs/snapshot/*) + umount "${boot_dir}" || true + ;; + esac + + # for zsys snapshots: we want to know which kernel we successful last booted with + last_booted_kernel=$(zfs get -H com.ubuntu.zsys:last-booted-kernel "${dataset}" | awk '{print $3}') + + # snapshot: last_used is dataset creation time + if [ "${is_snapshot}" = "true" ]; then + last_used="$(zfs get -pH creation "${dataset}" | awk -F '\t' '{print $3}')" + # otherwise, last_used is manually marked at boot/shutdown on a root dataset for zsys + else + # if current system, take current time + if zfs mount | awk '/[ \t]+\/$/ {print $1}' | grep -q ${dataset}; then + last_used=$(date +%s) + else + last_used=$(zfs get -H com.ubuntu.zsys:last-used "${dataset}" | awk '{print $3}') + # case of non zsys, or zsys without annotation, take /etc/machine-id stat (as we mounted with noatime). + # However, as systems can be relatime, if system is current mounted one, set current time (case of clone + reboot + # within the same d). + if [ "${last_used}" = "-" ]; then + last_used=$(stat --printf="%X" "${mntdir}/etc/os-release") + if [ -f "${mntdir}/etc/machine-id" ]; then + last_used=$(stat --printf="%X" "${mntdir}/etc/machine-id") + fi + fi + fi + fi + + is_zsys=$(zfs get -H com.ubuntu.zsys:bootfs "${base_dataset}" | awk '{print $3}') + + if [ -n "${initrd_list}" -a -n "${kernel_list}" ]; then + echo "${dataset}\t${is_zsys}\t${machine_id}\t${pretty_name}\t${last_used}\t${initrd_device}\t${initrd_list}\t${kernel_list}\t${last_booted_kernel}" + else + grub_warn "didn't find any valid initrd or kernel." + fi + + umount "${mntdir}" || true + # We needed to look in / for snapshots on root dataset, umount the snapshot for etc before zfs lazily unmount it + case "${etc_dir}" in /.zfs/snapshot/*/etc) + snapshot_path="$(findmnt -n -o TARGET -T ${etc_dir})" + umount "${snapshot_path}" || true + ;; + esac +} + +# Scan available boot options and returns in a formatted list +# $1 is the temporary mount directory to use +bootlist() { + local mntdir="$1" + local boot_list="" + + for dataset in $(get_root_datasets); do + # get information from current root dataset + boot_list="${boot_list}$(get_dataset_info ${dataset} ${mntdir})\n" + + # get information from snapshots of this root dataset + for snapshot_dataset in $(zfs list -H -o name -t snapshot "${dataset}"); do + boot_list="${boot_list}$(get_dataset_info ${snapshot_dataset} ${mntdir})\n" + done + done + echo "${boot_list}" +} + + +# Order machine ids by last_used from their main entry +get_machines_sorted() { + local bootlist="$1" + + local machineids="$(echo "${bootlist}" | awk '{print $3}' | sort -u)" + for machineid in ${machineids}; do + echo "${bootlist}" | awk 'BEGIN{FS="\t"} $1 !~ /.*@.*/ {print $5, $3}' | sort -nr | grep -E "[^^]\b${machineid}\b" | head -1 + done | sort -nr | awk '{print $2}' +} + +# Sort entries by last_used for a given machineid +sort_entries_for_machineid() { + local bootlist="$1" + local machineid="$2" + + tab="$(printf '\t')" + echo "${bootlist}" | grep -E "[^^]\b${machineid}\b" | sort -k5,5r -k1,1 -t "${tab}" +} + +# Return main entry index +get_main_entry() { + local entries="$1" + + echo "${entries}" | awk 'BEGIN{FS="\t"} $1 !~ /.*@.*/ {print}' | head -1 +} + +# Return specific field at index from entry +get_field_from_entry() { + local entry="$1" + local index="$2" + + echo "${entry}" | awk "BEGIN{FS=\"\t\"} {print \$$index}" +} + +# Get the main entry metadata +main_entry_meta() { + local main_entry="$1" + + initrd=$(get_field_from_entry "${main_entry}" 7 | cut -d'|' -f1) + kernel=$(get_field_from_entry "${main_entry}" 8 | cut -d'|' -f1) + + # Take first element (most recent entry) which is not a snapshot + echo "${main_entry}" | awk "BEGIN{ FS=\"\t\"; OFS=\"\t\"} {print \$3, \$2, \"main\", \$4, \$1, \$6, \"$initrd\", \"$kernel\"}" +} + +# Get advanced entries metadata +advanced_entries_meta() { + local main_entry="$1" + + last_used_kernel="$(get_field_from_entry "${main_entry}" 9 )" + + # We must align initrds with kernels. + # Adds initrds to the stack then pop them 1 by 1 as we process the kernels + set -- $(get_field_from_entry "${main_entry}" 7 | tr "|" " ") + for kernel in $(get_field_from_entry "${main_entry}" 8 | tr "|" " "); do + # get initrd and pop to the next one + initrd="$1"; shift + + was_last_used_kernel="false" + kernel_basename=$(basename "${kernel}") + if [ "${kernel_basename}" = "${last_used_kernel}" ]; then + was_last_used_kernel="true" + fi + + echo "${main_entry}" | awk "BEGIN{ FS=\"\t\"; OFS=\"\t\"} {print \$3, \$2, \"advanced\", \$4, \$1, \$6, \"$initrd\", \"$kernel\", \"$was_last_used_kernel\"}" + done +} + +# Get history metadata +history_entries_meta() { + local entries="$1" + local main_dataset_name="$2" + local main_dataset_releasename="$3" + + if [ -z "${entries}" ]; then + return + fi + + # Traverse snapshots and clones + echo "${entries}" | while read entry; do + name="" + # Compute snapshot/filesystem dataset name + snap_dataset_name="$(get_field_from_entry "${entry}" 1)" + + snapname="${snap_dataset_name##*@}" + # If, this is a clone, take what is after main_dataset_name + if [ "${snapname}" = "${snap_dataset_name}" ]; then + snapname="${snap_dataset_name##${main_dataset_name}_}" + + # Handle manual user clone (not prefixed by "main_dataset_name") + snapname="${snapname##*/}" + fi + + # We keep the snapname only if it is not only a zsys auto snapshot + if echo "${snapname}" | grep -q "^autozsys_"; then + snapname="" + fi + + # We store the release only if it different from main dataset release (snapshot before a release upgrade) + releasename=$(get_field_from_entry "${entry}" 4) + if [ "${releasename}" = "${main_dataset_releasename}" ]; then + releasename="" + fi + + # Snapshot date + foo="$(get_field_from_entry "${entry}" 5)" + snapdate="$(date -d @$(get_field_from_entry "${entry}" 5) "+%x @ %H:%M")" + + # For snapshots/clones the name can have the following formats: + # : autozsys, same release + # on : autozsys, different release + # on : Manual snapshot, same release + # , on : Manual snapshot, different release + if [ "${snapname}" = "" -a "${releasename}" = "" ]; then + name="${snapdate}" + elif [ "${snapname}" = "" -a "${releasename}" != "" ]; then + name=$(gettext_printf "%s on %s" "${releasename}" "${snapdate}") + elif [ "${snapname}" != "" -a "${releasename}" = "" ]; then + name=$(gettext_printf "%s on %s" "${snapname}" "${snapdate}") + else # snapname != "" && releasename != "" + name=$(gettext_printf "%s, %s on %s" "${snapname}" "${releasename}" "${snapdate}") + fi + + # Choose kernel and initrd if the snapshot was booted successfully on a specific kernel before + # Take latest by default if no match + initrd=$(get_field_from_entry "${entry}" 7 | cut -d'|' -f1) + kernel=$(get_field_from_entry "${entry}" 8 | cut -d'|' -f1) + last_used_kernel="$(get_field_from_entry "${entry}" 9)" + + # We must align initrds with kernels. + # Adds initrds to the stack then pop them 1 by 1 as we process the kernels + set -- $(get_field_from_entry "${entry}" 7 | tr "|" " ") + for k in $(get_field_from_entry "${entry}" 8|tr "|" " "); do + # get initrd and pop to the next one + candidate_initrd="$1"; shift + + kernel_basename=$(basename "${k}") + if [ "${kernel_basename}" = "${last_used_kernel}" ]; then + kernel="${k}" + initrd="${candidate_initrd}" + break + fi + done + + echo "${entry}" | awk "BEGIN{ FS=\"\t\"; OFS=\"\t\"} {print \$3, \$2, \"history\", \"$name\", \$1, \$6, \"$initrd\", \"$kernel\"}" + done +} + +# Generate metadata from a BOOTLIST that will subsequently used to generate +# the final grub menu entries +generate_grub_menu_metadata() { + local bootlist="$1" + + # Sort machineids by last_used from their main entry + for machineid in $(get_machines_sorted "${bootlist}"); do + entries="$(sort_entries_for_machineid "${bootlist}" ${machineid})" + main_entry="$(get_main_entry "${entries}")" + + if [ -z "$main_entry" ]; then + continue + fi + + main_entry_meta "${main_entry}" + advanced_entries_meta "${main_entry}" + + main_dataset_name="$(get_field_from_entry "${main_entry}" 1)" + main_dataset_releasename="$(get_field_from_entry "${main_entry}" 4)" + # grep -v errcode != 0 if there is no match. || true to not fail with -e + other_entries="$(echo "${entries}" | grep -v "${main_entry}" || true)" + history_entries_meta "${other_entries}" "${main_dataset_name}" "${main_dataset_releasename}" + done +} + +# Print the configuration part common to all sections +# Note: +# If 10_linux runs these part will be defined twice in grub configuration +print_menu_prologue() { + cat << 'EOF' +function gfxmode { + set gfxpayload="${1}" +EOF + if [ "${vt_handoff}" = 1 ]; then + cat << 'EOF' + if [ "${1}" = "keep" ]; then + set vt_handoff=vt.handoff=1 + else + set vt_handoff= + fi +EOF + fi + cat << EOF +} +EOF + + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + GRUB_GFXPAYLOAD_LINUX="${GRUB_GFXPAYLOAD_LINUX:-}" + if [ "${GRUB_GFXPAYLOAD_LINUX}" != "" ] || [ "${gfxpayload_dynamic}" = 0 ]; then + echo "set linux_gfx_mode=${GRUB_GFXPAYLOAD_LINUX}" + else + cat << EOF +if [ "\${recordfail}" != 1 ]; then + if [ -e \${prefix}/gfxblacklist.txt ]; then + if hwmatch \${prefix}/gfxblacklist.txt 3; then + if [ \${match} = 0 ]; then + set linux_gfx_mode=keep + else + set linux_gfx_mode=text + fi + else + set linux_gfx_mode=text + fi + else + set linux_gfx_mode=keep + fi +else + set linux_gfx_mode=text +fi +EOF + fi + cat << EOF +export linux_gfx_mode +EOF +} + +# Cache for prepare_grub_to_access_device call +# $1: boot_device +# $2: submenu_level +prepare_grub_to_access_device_cached() { + local boot_device="$1" + local submenu_level="$2" + + local boot_device_idx="$(echo ${boot_device} | tr '/' '_')" + + cache_file="${ZFSTMP}/$(echo boot_device${boot_device_idx})" + if [ ! -f "${cache_file}" ]; then + set +u + echo "$(prepare_grub_to_access_device "${boot_device}")" > "${cache_file}" + set -u + for i in 0 1 2; do + submenu_indentation="$(printf %${i}s | tr " " "${grub_tab}")" + sed "s/^/${submenu_indentation} /" "${cache_file}" > "${cache_file}--${i}" + done + fi + + cat "${cache_file}--${submenu_level}" +} + + +# Print a grub menu entry +zfs_linux_entry () { + submenu_level="$1" + title="$2" + type="$3" + dataset="$4" + boot_device="$5" + initrd="$6" + kernel="$7" + kernel_version="$8" + kernel_additional_args="${9:-}" + boot_devices="${10:-}" + + submenu_indentation="$(printf %${submenu_level}s | tr " " "${grub_tab}")" + + echo "${submenu_indentation}menuentry '$(echo "${title}" | grub_quote)' ${CLASS} \${menuentry_id_option} 'gnulinux-${dataset}-${kernel_version}' {" + + if [ "${quick_boot}" = 1 ]; then + echo "${submenu_indentation} recordfail" + fi + + if [ "${type}" != "recovery" ] ; then + GRUB_SAVEDEFAULT=${GRUB_SAVEDEFAULT:-} + default_entry="$(save_default_entry)" + if [ -n "${default_entry}" ]; then + echo "${submenu_indentation} ${default_entry}" + fi + fi + + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + if [ "${GRUB_GFXPAYLOAD_LINUX}" = "" ]; then + echo "${submenu_indentation} load_video" + else + if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then + echo "${submenu_indentation} load_video" + fi + fi + + if ([ "${ubuntu_recovery}" = 0 ] || [ "${type}" != "recovery" ]) && \ + ([ "${GRUB_GFXPAYLOAD_LINUX}" != "" ] || [ "${gfxpayload_dynamic}" = 1 ]); then + echo "${submenu_indentation} gfxmode \${linux_gfx_mode}" + fi + + echo "${submenu_indentation} insmod gzio" + echo "${submenu_indentation} if [ \"\${grub_platform}\" = xen ]; then insmod xzio; insmod lzopio; fi" + + if [ -n "$boot_devices" ]; then + for device in ${boot_devices}; do + echo "${submenu_indentation} if [ "${boot_device}" = "${device}" ]; then" + echo "$(prepare_grub_to_access_device_cached "${device}" $(( submenu_level +1 )) )" + echo "${submenu_indentation} fi" + done + else + echo "$(prepare_grub_to_access_device_cached "${boot_device}" "${submenu_level}")" + fi + + if [ "${quiet_boot}" = 0 ] || [ "${type}" != simple ]; then + echo "${submenu_indentation} echo $(gettext_printf "Loading Linux %s ..." ${kernel_version} | grub_quote)" + fi + + linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + if [ ${type} = "recovery" ]; then + linux_default_args="${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}" + fi + + echo "${submenu_indentation} linux ${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}" + + if [ "${quiet_boot}" = 0 ] || [ "${type}" != simple ]; then + echo "${submenu_indentation} echo '$(gettext_printf "Loading initial ramdisk ..." | grub_quote)'" + fi + echo "${submenu_indentation} initrd ${initrd}" + echo "${submenu_indentation}}" +} + +# Generate a GRUB Menu from menu meta data +# $1 menu metadata +generate_grub_menu() { + local menu_metadata="$1" + local last_section="" + local main_dataset_name="" + local main_dataset="" + local have_zsys="" + + if [ -z "${menu_metadata}" ]; then + return + fi + + CLASS="--class gnu-linux --class gnu --class os" + + if [ "${GRUB_DISTRIBUTOR}" = "" ] ; then + OS=GNU/Linux + else + case ${GRUB_DISTRIBUTOR} in + Ubuntu|Kubuntu) + OS="${GRUB_DISTRIBUTOR}" + ;; + *) + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + ;; + esac + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1 | LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" + fi + + if [ -x /lib/recovery-mode/recovery-menu ]; then + GRUB_CMDLINE_LINUX_RECOVERY=recovery + else + GRUB_CMDLINE_LINUX_RECOVERY=single + fi + if [ "${ubuntu_recovery}" = 1 ]; then + GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset" + fi + + if [ "${vt_handoff}" = 1 ]; then + for word in ${GRUB_CMDLINE_LINUX_DEFAULT}; do + if [ "${word}" = splash ]; then + GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT} \${vt_handoff}" + fi + done + fi + + print_menu_prologue + + cat<<'EOF' +function zsyshistorymenu { + # $1: root dataset (eg rpool/ROOT/ubuntu_2zhm07@autozsys_k56fr6) + # $2: boot device id (eg 411f29ce1557bfed) + # $3: initrd (eg /BOOT/ubuntu_2zhm07@autozsys_k56fr6/initrd.img-5.4.0-21-generic) + # $4: kernel (eg /BOOT/ubuntu_2zhm07@autozsys_k56fr6/vmlinuz-5.4.0-21-generic) + # $5: kernel_version (eg 5.4.0-21-generic) + + set root_dataset="${1}" + set boot_device="${2}" + set initrd="${3}" + set kernel="${4}" + set kversion="${5}" + +EOF + boot_devices=$(echo "${menu_metadata}" | cut -d"$(printf '\t')" -f6 | sort -u) + + title=$(gettext_printf "Revert system only") + zfs_linux_entry 1 "${title}" "simple" '${root_dataset}' '${boot_device}' '${initrd}' '${kernel}' '${kversion}' '' "${boot_devices}" + + title="$(gettext_printf "Revert system and user data")" + zfs_linux_entry 1 "${title}" "simple" '${root_dataset}' '${boot_device}' '${initrd}' '${kernel}' '${kversion}' 'zsys-revert=userdata' "${boot_devices}" + + GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}" + if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then + title="$(gettext_printf "Revert system only (%s)" "$(gettext "${GRUB_RECOVERY_TITLE}")")" + zfs_linux_entry 1 "${title}" "recovery" '${root_dataset}' '${boot_device}' '${initrd}' '${kernel}' '${kversion}' '' "${boot_devices}" + + title="$(gettext_printf "Revert system and user data (%s)" "$(gettext "${GRUB_RECOVERY_TITLE}")")" + zfs_linux_entry 1 "${title}" "recovery" '${root_dataset}' '${boot_device}' '${initrd}' '${kernel}' '${kversion}' 'zsys-revert=userdata' "${boot_devices}" + fi +echo "}" +echo + + # IFS is set to TAB (ASCII 0x09) + echo "${menu_metadata}" | + { + at_least_one_entry=0 + have_zsys="$(which zsysd || true)" + while IFS="$(printf '\t')" read -r machineid iszsys section name dataset device initrd kernel opt; do + + # Disable history for non zsys system or if systems is a zsys one and zsys isn't installed. + # In pure zfs systems, we identified multiple issues due to the mount generator + # in upstream zfs which makes it incompatible. Don't show history for now. + if [ "${section}" = "history" ]; then + if [ "${iszsys}" != "yes" ] || [ "${iszsys}" = "yes" -a -z "${have_zsys}" ]; then + continue + fi + fi + + if [ "${last_section}" != "${section}" -a -n "${last_section}" ]; then + # Close previous section wrapper + if [ "${last_section}" != "main" ]; then + echo "}" # Add grub_tabs + at_least_one_entry=0 + fi + fi + + case "${section}" in + main) + title="${name}" + main_dataset_name="${name}" + main_dataset="${dataset}" + + kernel_version=$(basename "${kernel}" | sed -e "s,^[^0-9]*-,,g") + zfs_linux_entry 0 "${title}" "simple" "${dataset}" "${device}" "${initrd}" "${kernel}" "${kernel_version}" + at_least_one_entry=1 + ;; + advanced) + # normal and recovery entries for a given kernel + if [ "${last_section}" != "${section}" ]; then + echo "submenu '$(gettext_printf "Advanced options for %s" "${main_dataset_name}" | grub_quote)' \${menuentry_id_option} 'gnulinux-advanced-${main_dataset}' {" + fi + + last_booted_kernel_marker="" + if [ "${opt}" = "true" ]; then + last_booted_kernel_marker="* " + fi + + kernel_version=$(basename "${kernel}" | sed -e "s,^[^0-9]*-,,g") + title="$(gettext_printf "%s%s, with Linux %s" "${last_booted_kernel_marker}" "${name}" "${kernel_version}")" + zfs_linux_entry 1 "${title}" "advanced" "${dataset}" "${device}" "${initrd}" "${kernel}" "${kernel_version}" + + GRUB_DISABLE_RECOVERY=${GRUB_DISABLE_RECOVERY:-} + if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then + title="$(gettext_printf "%s%s, with Linux %s (%s)" "${last_booted_kernel_marker}" "${name}" "${kernel_version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" + zfs_linux_entry 1 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}" "${kernel_version}" + fi + at_least_one_entry=1 + ;; + history) + # Revert to a snapshot + # revert system, revert system and user data and associated recovery entries + if [ "${last_section}" != "${section}" ]; then + echo "submenu '$(gettext_printf "History for %s" "${main_dataset_name}" | grub_quote)' \${menuentry_id_option} 'gnulinux-history-${main_dataset}' {" + fi + + if [ "${iszsys}" = "yes" ]; then + title="$(gettext_printf "Revert to %s" "${name}" | grub_quote)" + else + title="$(gettext_printf "Boot on %s" "${name}" | grub_quote)" + fi + echo " submenu '${title}' \${menuentry_id_option} 'gnulinux-history-${dataset}' {" + + kernel_version=$(basename "${kernel}" | sed -e "s,^[^0-9]*-,,g") + + # Zsys only: let revert system without destroying snapshots + if [ "${iszsys}" = "yes" ]; then + echo "${grub_tab}${grub_tab}zsyshistorymenu" \"${dataset}\" \"${device}\" \"${initrd}\" \"${kernel}\" \"${kernel_version}\" + # Non-zsys: boot temporarly on snapshots or rollback (destroying intermediate snapshots) + else + title="$(gettext_printf "One time boot")" + zfs_linux_entry 2 "${title}" "simple" "${dataset}" "${device}" "${initrd}" "${kernel}" "${kernel_version}" + + GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}" + if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then + title="$(gettext_printf "One time boot (%s)" "$(gettext "${GRUB_RECOVERY_TITLE}")")" + zfs_linux_entry 2 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}" "${kernel_version}" + fi + + title="$(gettext_printf "Revert system (all intermediate snapshots will be destroyed)")" + zfs_linux_entry 2 "${title}" "simple" "${dataset}" "${device}" "${initrd}" "${kernel}" "${kernel_version}" "rollback=yes" + fi + + echo " }" + at_least_one_entry=1 + ;; + *) + grub_warn "unknown section: ${section}. Ignoring entry ${name} for ${dataset}" + ;; + esac + last_section="${section}" + done + + if [ "${at_least_one_entry}" -eq 1 ]; then + echo "}" + fi + } +} + +# don't add trailing newline of variable is empty +# $1: content to write +# $2: destination file +trailing_newline_if_not_empty() { + content="$1" + dest="$2" + + if [ -z "${content}" ]; then + rm -f "${dest}" + touch "${dest}" + return + fi + echo "${content}" > "${dest}" +} + + +GRUB_LINUX_ZFS_TEST="${GRUB_LINUX_ZFS_TEST:-}" +case "${GRUB_LINUX_ZFS_TEST}" in + bootlist) + # Import all available pools on the system and return imported list + imported_pools=$(import_pools) + boot_list="$(bootlist ${MNTDIR})" + trailing_newline_if_not_empty "${boot_list}" "${GRUB_LINUX_ZFS_TEST_OUTPUT}" + break + ;; + metamenu) + boot_list="$(cat ${GRUB_LINUX_ZFS_TEST_INPUT})" + menu_metadata="$(generate_grub_menu_metadata "${boot_list}")" + trailing_newline_if_not_empty "${menu_metadata}" "${GRUB_LINUX_ZFS_TEST_OUTPUT}" + break + ;; + grubmenu) + menu_metadata="$(cat ${GRUB_LINUX_ZFS_TEST_INPUT})" + grub_menu=$(generate_grub_menu "${menu_metadata}") + trailing_newline_if_not_empty "${grub_menu}" "${GRUB_LINUX_ZFS_TEST_OUTPUT}" + break + ;; + *) + # Import all available pools on the system and return imported list + imported_pools=$(import_pools) + # Generate the complete list of boot entries + boot_list="$(bootlist ${MNTDIR})" + # Create boot menu meta data from the list of boot entries + menu_metadata="$(generate_grub_menu_metadata "${boot_list}")" + # Create boot menu meta data from the list of boot entries + grub_menu="$(generate_grub_menu "${menu_metadata}")" + if [ -n "${grub_menu}" ]; then + # We want the trailing newline as a marker will be added + echo "${grub_menu}" + fi + ;; +esac diff --git a/grub.d/20_linux_xen b/grub.d/20_linux_xen index 0f927fe..a032ecc 100755 --- a/grub.d/20_linux_xen +++ b/grub.d/20_linux_xen @@ -49,12 +49,22 @@ case ${GRUB_DEVICE} in ;; esac +# Default to disabling partition uuid support to maintian compatibility with +# older kernels. +GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true} + # btrfs may reside on multiple devices. We cannot pass them as value of root= parameter # and mounting btrfs requires user space scanning, so force UUID in this case. -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ +if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \ + || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + && [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \ + || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + && ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then LINUX_ROOT_DEVICE=${GRUB_DEVICE} +elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then + LINUX_ROOT_DEVICE=PARTUUID=${GRUB_DEVICE_PARTUUID} else LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} fi @@ -77,7 +87,7 @@ case x"$GRUB_FS" in xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" - LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}" ;; esac @@ -130,16 +140,20 @@ linux_entry () else xen_rm_opts="no-real-mode edd=off" fi - multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} + ${xen_loader} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} echo '$(echo "$lmessage" | grub_quote)' - module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} + ${module_loader} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} EOF if test -n "${initrd}" ; then # TRANSLATORS: ramdisk isn't identifier. Should be translated. message="$(gettext_printf "Loading initial ramdisk ...")" + initrd_path= + for i in ${initrd}; do + initrd_path="${initrd_path} ${rel_dirname}/${i}" + done sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' - module --nounzip ${rel_dirname}/${initrd} + ${module_loader} --nounzip $(echo $initrd_path) EOF fi sed "s/^/$submenu_indentation/" << EOF @@ -214,6 +228,27 @@ while [ "x${xen_list}" != "x" ] ; do if [ "x$is_top_level" != xtrue ]; then echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" fi + if ($grub_file --is-arm64-efi $current_xen); then + xen_loader="xen_hypervisor" + module_loader="xen_module" + else + if ($grub_file --is-x86-multiboot2 $current_xen); then + xen_loader="multiboot2" + module_loader="module2" + else + xen_loader="multiboot" + module_loader="module" + fi + fi + + initrd_early= + for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \ + ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do + if test -e "${xen_dirname}/${i}" ; then + initrd_early="${initrd_early} ${i}" + fi + done + while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` gettext_printf "Found linux image: %s\n" "$linux" >&2 @@ -224,7 +259,7 @@ while [ "x${xen_list}" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - initrd= + initrd_real= for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ @@ -234,15 +269,31 @@ while [ "x${xen_list}" != "x" ] ; do "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do if test -e "${dirname}/${i}" ; then - initrd="$i" + initrd_real="$i" break fi done - if test -n "${initrd}" ; then - gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 - else + + initrd= + if test -n "${initrd_early}" || test -n "${initrd_real}"; then + initrd="${initrd_early} ${initrd_real}" + + initrd_display= + for i in ${initrd}; do + initrd_display="${initrd_display} ${dirname}/${i}" + done + gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 + fi + + if test -z "${initrd_real}"; then # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} + if [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ]; then + + linux_root_device_thisversion=${GRUB_DEVICE} + else + linux_root_device_thisversion=PARTUUID=${GRUB_DEVICE_PARTUUID} + fi fi if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then diff --git a/grub.d/30_uefi-firmware b/grub.d/30_uefi-firmware index 0a4ee10..7cc32b6 100755 --- a/grub.d/30_uefi-firmware +++ b/grub.d/30_uefi-firmware @@ -32,9 +32,9 @@ OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data" if [ -e "$OsIndications" ] && \ [ "$(( $(printf 0x%x \'"$(cat $OsIndications | cut -b1)") & 1 ))" = 1 ]; then - LABEL="System setup" + LABEL="UEFI Firmware Settings" - gettext_printf "Adding boot menu entry for EFI firmware configuration\n" >&2 + gettext_printf "Adding boot menu entry for UEFI Firmware Settings\n" >&2 onstr="$(gettext_printf "(on %s)" "${DEVICE}")" diff --git a/gshadow b/gshadow index 9a49707..ddc679c 100644 --- a/gshadow +++ b/gshadow @@ -89,3 +89,5 @@ gast:!:: docker:!:: tcpdump:!:: render:!:: +tss:!:: +_flatpak:!:: diff --git a/gshadow- b/gshadow- index 436b4a2..e6fe73e 100644 --- a/gshadow- +++ b/gshadow- @@ -88,3 +88,5 @@ nobody:!:: gast:!:: docker:!:: tcpdump:!:: +render:!:: +tss:!:: diff --git a/hostid b/hostid new file mode 100644 index 0000000..aedbaf1 --- /dev/null +++ b/hostid @@ -0,0 +1 @@ +}Vϊ \ No newline at end of file diff --git a/init.d/apport b/init.d/apport index 7b8ff22..4997b83 100755 --- a/init.d/apport +++ b/init.d/apport @@ -50,7 +50,12 @@ do_start() rm -f /var/lib/pm-utils/resume-hang.log fi - echo "|$AGENT %p %s %c %d %P %E" > /proc/sys/kernel/core_pattern + # Old compatibility mode, switch later to second one + if true; then + echo "|$AGENT %p %s %c %d %P %E" > /proc/sys/kernel/core_pattern + else + echo "|$AGENT -p%p -s%s -c%c -d%d -P%P -E%E" > /proc/sys/kernel/core_pattern + fi echo 2 > /proc/sys/fs/suid_dumpable } diff --git a/init.d/bind9 b/init.d/bind9 deleted file mode 100755 index 59d8e3d..0000000 --- a/init.d/bind9 +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh -e - -### BEGIN INIT INFO -# Provides: bind9 -# Required-Start: $remote_fs -# Required-Stop: $remote_fs -# Should-Start: $network $syslog -# Should-Stop: $network $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start and stop bind9 -# Description: bind9 is a Domain Name Server (DNS) -# which translates ip addresses to and from internet names -### END INIT INFO - -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -# for a chrooted server: "-u bind -t /var/lib/named" -# Don't modify this line, change or create /etc/default/bind9. -OPTIONS="" -RESOLVCONF=no - -test -f /etc/default/bind9 && . /etc/default/bind9 - -test -x /usr/sbin/rndc || exit 0 - -. /lib/lsb/init-functions -PIDFILE=/run/named/named.pid - -check_network() { - if [ -x /usr/bin/uname ] && [ "X$(/usr/bin/uname -o)" = XSolaris ]; then - IFCONFIG_OPTS="-au" - else - IFCONFIG_OPTS="" - fi - if [ -z "$(/sbin/ifconfig $IFCONFIG_OPTS)" ]; then - #log_action_msg "No networks configured." - return 1 - fi - return 0 -} - -case "$1" in - start) - log_daemon_msg "Starting domain name service..." "bind9" - - modprobe capability >/dev/null 2>&1 || true - - # dirs under /run can go away on reboots. - mkdir -p /run/named - chmod 775 /run/named - chown root:bind /run/named >/dev/null 2>&1 || true - - if [ ! -x /usr/sbin/named ]; then - log_action_msg "named binary missing - not starting" - log_end_msg 1 - fi - - if ! check_network; then - log_action_msg "no networks configured" - log_end_msg 1 - fi - - if start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/named \ - --pidfile ${PIDFILE} -- $OPTIONS; then - if [ "X$RESOLVCONF" != "Xno" ] && [ -x /sbin/resolvconf ] ; then - echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.named - fi - log_end_msg 0 - else - log_end_msg 1 - fi - ;; - - stop) - log_daemon_msg "Stopping domain name service..." "bind9" - if ! check_network; then - log_action_msg "no networks configured" - log_end_msg 1 - fi - - if [ "X$RESOLVCONF" != "Xno" ] && [ -x /sbin/resolvconf ] ; then - /sbin/resolvconf -d lo.named - fi - pid=$(/usr/sbin/rndc stop -p | awk '/^pid:/ {print $2}') || true - if [ -z "$pid" ]; then # no pid found, so either not running, or error - pid=$(pgrep -f ^/usr/sbin/named) || true - start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/named \ - --pidfile ${PIDFILE} -- $OPTIONS - fi - if [ -n "$pid" ]; then - sig=0 - n=1 - while kill -$sig $pid 2>/dev/null; do - if [ $n -eq 1 ]; then - echo "waiting for pid $pid to die" - fi - if [ $n -eq 11 ]; then - echo "giving up on pid $pid with kill -0; trying -9" - sig=9 - fi - if [ $n -gt 20 ]; then - echo "giving up on pid $pid" - break - fi - n=$(($n+1)) - sleep 1 - done - fi - log_end_msg 0 - ;; - - reload|force-reload) - log_daemon_msg "Reloading domain name service..." "bind9" - if ! check_network; then - log_action_msg "no networks configured" - log_end_msg 1 - fi - - /usr/sbin/rndc reload >/dev/null && log_end_msg 0 || log_end_msg 1 - ;; - - restart) - if ! check_network; then - log_action_msg "no networks configured" - exit 1 - fi - - $0 stop - $0 start - ;; - - status) - ret=0 - status_of_proc -p ${PIDFILE} /usr/sbin/named bind9 2>/dev/null || ret=$? - exit $ret - ;; - - *) - log_action_msg "Usage: /etc/init.d/bind9 {start|stop|reload|restart|force-reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/init.d/irqbalance b/init.d/irqbalance index 8ebf8e0..fd15764 100755 --- a/init.d/irqbalance +++ b/init.d/irqbalance @@ -24,7 +24,6 @@ DOPTIONS="" # Defaults - don't touch, edit /etc/default/ OPTIONS="" -ONESHOT=0 test -x $DAEMON || exit 0 @@ -43,7 +42,7 @@ test -f /etc/default/irqbalance && . /etc/default/irqbalance if [ ! -z ${IRQBALANCE_ONESHOT+x} ]; then DOPTIONS="--oneshot" fi -if [ ! -z ${IRCBALANCE_ARGS+x} ]; then +if [ ! -z ${IRQBALANCE_ARGS+x} ]; then OPTIONS="$OPTIONS $IRQBALANCE_ARGS" fi @@ -58,6 +57,7 @@ case "$1" in exit 0 fi + mkdir -p /run/irqbalance start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- --pid=$PIDFILE $OPTIONS $DOPTIONS log_end_msg $? @@ -76,12 +76,17 @@ case "$1" in start-stop-daemon --stop --retry 5 --quiet --oknodo --exec $DAEMON rm -f $PIDFILE + mkdir -p /run/irqbalance start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- --pid=$PIDFILE $OPTIONS $DOPTIONS log_end_msg $? ;; status) - status_of_proc $DAEMON $NAME + if [ -z "${IRQBALANCE_ONESHOT+x}" ]; then + status_of_proc $DAEMON $NAME + else + echo "Irqbalance setup to run in oneshot mode." + fi ;; *) N=/etc/init.d/$SNAME diff --git a/init.d/lvm2-lvmetad b/init.d/lvm2-lvmetad deleted file mode 100755 index 3fd0e9c..0000000 --- a/init.d/lvm2-lvmetad +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# kFreeBSD do not accept scripts as interpreters, using #!/bin/sh and sourcing. -if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then - set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . /lib/init/init-d-script -fi -### BEGIN INIT INFO -# Provides: lvm2-lvmetad -# Required-Start: $local_fs -# Required-Stop: $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: LVM2 metadata daemon -### END INIT INFO - -DESC="LVM2 metadata daemon" -DAEMON=/sbin/lvmetad -PIDFILE=/run/lvmetad.pid - -do_start_prepare() { - mkdir -m 0700 -p /run/lvm -} diff --git a/init.d/mdadm b/init.d/mdadm deleted file mode 100755 index 0a9004f..0000000 --- a/init.d/mdadm +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# -# Start the MD monitor daemon for all active MD arrays if desired. -# This script is not used under systemd. -# -# Copyright © 2001-2005 Mario Jou/3en -# Copyright © 2005-2009 Martin F. Krafft -# Distributable under the terms of the GNU GPL version 2. -# -### BEGIN INIT INFO -# Provides: mdadm -# Required-Start: $local_fs $syslog -# Required-Stop: $local_fs $syslog sendsigs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: MD monitoring daemon -# Description: mdadm provides a monitor mode, in which it will scan for -# problems with the MD devices. If a problem is found, the -# administrator is alerted via email, or a custom script is -# run. -### END INIT INFO -# -set -eu - -MDADM=/sbin/mdadm -MDMON=/sbin/mdmon -RUNDIR=/run/mdadm -PIDFILE=$RUNDIR/monitor.pid -DEBIANCONFIG=/etc/default/mdadm - -test -x "$MDADM" || exit 0 - -test -f /proc/mdstat || exit 0 - -START_DAEMON=true -test -f $DEBIANCONFIG && . $DEBIANCONFIG - -. /lib/lsb/init-functions - -is_true() -{ - case "${1:-}" in - [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; - *) return 1; - esac -} - -case "${1:-}" in - start) - if [ -x /usr/bin/systemd-detect-virt ] && /usr/bin/systemd-detect-virt --quiet --container; then - log_daemon_msg "Not starting MD monitoring service in container" - log_end_msg 0 - exit 0 - fi - - if is_true $START_DAEMON; then - log_daemon_msg "Starting MD monitoring service" "mdadm --monitor" - mkdir -p $RUNDIR - set +e - start-stop-daemon -S -p $PIDFILE -x $MDADM -- \ - --monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-} - log_end_msg $? - set -e - fi - if [ "$(echo $RUNDIR/md[0-9]*.pid)" != "$RUNDIR/md[0-9]*.pid" ]; then - log_daemon_msg "Restarting MD external metadata monitor" "mdmon --takeover --all" - set +e - $MDMON --takeover --all - log_end_msg $? - set -e - fi - ;; - stop) - if [ -f $PIDFILE ] ; then - log_daemon_msg "Stopping MD monitoring service" "mdadm --monitor" - set +e - start-stop-daemon -K -p $PIDFILE -x $MDADM - rm -f $PIDFILE - log_end_msg $? - set -e - fi - for file in $RUNDIR/md[0-9]*.pid ; do - [ ! -f "$file" ] && continue - ln -sf $file /run/sendsigs.omit.d/mdmon-${file##*/} - done - ;; - status) - status_of_proc -p $PIDFILE "$MDADM" "mdadm" && exit 0 || exit $? - ;; - restart|reload|force-reload) - ${0:-} stop - ${0:-} start - ;; - *) - echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/init.d/mdadm-waitidle b/init.d/mdadm-waitidle deleted file mode 100755 index 920272c..0000000 --- a/init.d/mdadm-waitidle +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# This script is not used when systemd is running -### BEGIN INIT INFO -# Provides: mdadm-waitidle -# Required-Start: -# Required-Stop: -# Should-Stop: halt reboot kexec -# X-Stop-After: umountroot -# Default-Start: -# Default-Stop: 0 6 -# Short-Description: Wait for MD arrays to become idle -# Description: Waits until all MD arrays are in idle and synced state -# before halt/reboot. -### END INIT INFO -# -set -eu - -MDADM=/sbin/mdadm -test -x "$MDADM" || exit 0 -test -f /proc/mdstat || exit 0 - -. /lib/lsb/init-functions - -case "${1:-}" in - - start|restart|force-reload) - # nothing, the only reason the script is here is to stop arrays - ;; - - stop) - sync - wait= - for md in /sys/block/md*/md ; do - [ -d "$md" ] || continue - [ "$wait" ] || log_action_begin_msg "Waiting for MD arrays to become idle" - wait=y - [ -w $md/sync_action ] && echo idle > $md/sync_action - done - if [ "$wait" ]; then - # mdadm --wait-clean has a short internal timeout - if $MDADM --wait-clean --scan; then - log_action_end_msg 0 - else - log_action_end_msg 1 - sleep 1 - fi - fi - ;; - - *) - echo "Usage: ${0:-} stop" >&2 - exit 1;; - -esac - -exit 0 diff --git a/init.d/mysql b/init.d/mysql index c18ef8c..0694ed7 100755 --- a/init.d/mysql +++ b/init.d/mysql @@ -165,7 +165,7 @@ case "${1:-''}" in if ! mysqld_status check_dead warn; then log_end_msg 1 - log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.1/README.Debian.gz!" + log_failure_msg "Please stop MariaDB manually and read /usr/share/doc/mariadb-server-10.3/README.Debian.gz!" exit -1 else log_end_msg 0 diff --git a/init.d/named b/init.d/named new file mode 100755 index 0000000..44b00ca --- /dev/null +++ b/init.d/named @@ -0,0 +1,146 @@ +#!/bin/sh -e + +### BEGIN INIT INFO +# Provides: bind bind9 +# Required-Start: $remote_fs +# Required-Stop: $remote_fs +# Should-Start: $network $syslog +# Should-Stop: $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start and stop BIND 9 Domain Name Server +# Description: BIND 9 is a Domain Name Server (DNS) +# which translates ip addresses to and from internet names +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# for a chrooted server: "-u bind -t /var/lib/named" +# Don't modify this line, instead change or create /etc/default/named. +OPTIONS="" +RESOLVCONF=no + +test -f /etc/default/named && . /etc/default/named + +test -x /usr/sbin/rndc || exit 0 + +. /lib/lsb/init-functions +PIDFILE=/run/named/named.pid + +check_network() { + result=0 + if [ -x /usr/bin/uname ] && [ "X$(/usr/bin/uname -o)" = XSolaris ]; then + LIST_NICS_IP=$(/sbin/ifconfig -au) || result=$? + else + LIST_NICS_IP=$(/bin/ip addr) || result=$? + fi + if [ $result -ne 0 -o -z "${LIST_NICS_IP}" ]; then + #log_action_msg "No networks configured." + return 1 + fi + return 0 +} + +case "$1" in + start) + log_daemon_msg "Starting domain name service..." "named" + + modprobe capability >/dev/null 2>&1 || true + + # dirs under /run can go away on reboots. + mkdir -p /run/named + chmod 775 /run/named + chown root:bind /run/named >/dev/null 2>&1 || true + + if [ ! -x /usr/sbin/named ]; then + log_action_msg "named binary missing - not starting" + log_end_msg 1 + fi + + if ! check_network; then + log_action_msg "no networks configured" + log_end_msg 1 + fi + + if start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/named \ + --pidfile ${PIDFILE} -- $OPTIONS; then + if [ "X$RESOLVCONF" != "Xno" ] && [ -x /sbin/resolvconf ] ; then + echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo.named + fi + log_end_msg 0 + else + log_end_msg 1 + fi + ;; + + stop) + log_daemon_msg "Stopping domain name service..." "named" + if ! check_network; then + log_action_msg "no networks configured" + log_end_msg 1 + fi + + if [ "X$RESOLVCONF" != "Xno" ] && [ -x /sbin/resolvconf ] ; then + /sbin/resolvconf -d lo.named + fi + pid=$(/usr/sbin/rndc stop -p | awk '/^pid:/ {print $2}') || true + if [ -z "$pid" ]; then # no pid found, so either not running, or error + pid=$(pgrep -f ^/usr/sbin/named) || true + start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/named \ + --pidfile ${PIDFILE} -- $OPTIONS + fi + if [ -n "$pid" ]; then + sig=0 + n=1 + while kill -$sig $pid 2>/dev/null; do + if [ $n -eq 1 ]; then + echo "waiting for pid $pid to die" + fi + if [ $n -eq 11 ]; then + echo "giving up on pid $pid with kill -0; trying -9" + sig=9 + fi + if [ $n -gt 20 ]; then + echo "giving up on pid $pid" + break + fi + n=$(($n+1)) + sleep 1 + done + fi + log_end_msg 0 + ;; + + reload|force-reload) + log_daemon_msg "Reloading domain name service..." "named" + if ! check_network; then + log_action_msg "no networks configured" + log_end_msg 1 + fi + + /usr/sbin/rndc reload >/dev/null && log_end_msg 0 || log_end_msg 1 + ;; + + restart) + if ! check_network; then + log_action_msg "no networks configured" + exit 1 + fi + + $0 stop + $0 start + ;; + + status) + ret=0 + status_of_proc -p ${PIDFILE} /usr/sbin/named bind 2>/dev/null || ret=$? + exit $ret + ;; + + *) + log_action_msg "Usage: /etc/init.d/named {start|stop|reload|restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/init.d/postfix b/init.d/postfix index d783085..d8da282 100755 --- a/init.d/postfix +++ b/init.d/postfix @@ -35,20 +35,15 @@ enabled_instances() { running() { INSTANCE="$1" if [ "X$INSTANCE" = X ]; then - POSTCONF="postconf" + POSTMULTI="" else - POSTCONF="postmulti -i $INSTANCE -x postconf" + POSTMULTI="postmulti -i $INSTANCE -x " fi + POSTCONF="${POSTMULTI} postconf" - queue=$($POSTCONF -hx queue_directory 2>/dev/null || echo /var/spool/postfix) - daemondir=$($POSTCONF -hx daemon_directory 2>/dev/null || echo /usr/lib/postfix/sbin) - if [ -f ${queue}/pid/master.pid ]; then - pid=$(sed 's/ //g' ${queue}/pid/master.pid) - # what directory does the executable live in. stupid prelink systems. - dir=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* -> //; s/\/[^\/]*$//') - if [ "X$dir" = "X${daemondir}" ]; then - echo y - fi + daemon_directory=$($POSTCONF -hx daemon_directory 2>/dev/null || echo /usr/lib/postfix/sbin) + if ! ${POSTMULTI} $daemon_directory/master -t 2>/dev/null ; then + echo y fi } diff --git a/init.d/saned b/init.d/saned index 2e624a6..e629105 100755 --- a/init.d/saned +++ b/init.d/saned @@ -33,11 +33,6 @@ if [ -f /etc/default/saned ] ; then . /etc/default/saned fi -if [ "x$RUN" != "xyes" ] ; then - log_success_msg "$NAME disabled; edit /etc/default/saned" - exit 0 -fi - DAEMON_OPTS="-a $RUN_AS_USER" set -e diff --git a/init.d/smartmontools b/init.d/smartmontools index a64b0e6..7584d02 100755 --- a/init.d/smartmontools +++ b/init.d/smartmontools @@ -12,7 +12,7 @@ # Required-Start: $syslog $remote_fs # Required-Stop: $syslog $remote_fs # Default-Start: 2 3 4 5 -# Default-Stop: 1 +# Default-Stop: 0 1 6 # Short-Description: SMART monitoring daemon ### END INIT INFO @@ -42,21 +42,12 @@ enable_smart() { log_action_end_msg 0 } -check_start_smartd_option() { - if [ ! "$start_smartd" = "yes" ]; then - [ "$VERBOSE" = "yes" ] && log_warning_msg "Not starting S.M.A.R.T. daemon smartd, disabled via /etc/default/smartmontools" - return 1 - else - return 0 - fi -} - running_pid() { # Check if a given process pid's cmdline matches a given name pid=$1 name=$2 - [ -z "$pid" ] && return 1 + [ -z "$pid" ] && return 1 [ ! -d /proc/$pid ] && return 1 cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` # Is this the expected child? @@ -79,22 +70,19 @@ running() case "$1" in start) [ -n "$enable_smart" ] && enable_smart - if check_start_smartd_option; then - - log_daemon_msg "Starting S.M.A.R.T. daemon" "smartd" - if running; then - log_progress_msg "already running" - log_end_msg 0 - exit 0 - fi - rm -f $PIDFILE - if start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $smartd_opts; then - log_end_msg 0 - else - log_end_msg 1 - RET=1 - fi + log_daemon_msg "Starting S.M.A.R.T. daemon" "smartd" + if running; then + log_progress_msg "already running" + log_end_msg 0 + exit 0 + fi + rm -f $PIDFILE + if start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $smartd_opts; then + log_end_msg 0 + else + log_end_msg 1 + RET=1 fi ;; stop) @@ -111,19 +99,17 @@ case "$1" in log_end_msg 1 RET=1 fi - ;; + ;; restart) - if check_start_smartd_option; then - log_daemon_msg "Restarting S.M.A.R.T. daemon" "smartd" - start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $PIDFILE - rm -f $PIDFILE - if start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $smartd_opts; then - log_end_msg 0 - else - log_end_msg 1 - RET=1 - fi + log_daemon_msg "Restarting S.M.A.R.T. daemon" "smartd" + start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile $PIDFILE + rm -f $PIDFILE + if start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --exec $DAEMON -- $smartd_opts; then + log_end_msg 0 + else + log_end_msg 1 + RET=1 fi ;; status) diff --git a/init.d/zfs-import b/init.d/zfs-import new file mode 100755 index 0000000..873a318 --- /dev/null +++ b/init.d/zfs-import @@ -0,0 +1,340 @@ +#!/bin/sh +# +# zfs-import This script will import ZFS pools +# +# chkconfig: 2345 01 99 +# description: This script will perform a verbatim import of ZFS pools +# during system boot. +# probe: true +# +### BEGIN INIT INFO +# Provides: zfs-import +# Required-Start: mtab +# Required-Stop: $local_fs mtab +# Default-Start: S +# Default-Stop: 0 1 6 +# X-Start-Before: checkfs +# X-Stop-After: zfs-mount +# Short-Description: Import ZFS pools +# Description: Run the `zpool import` command. +### END INIT INFO +# +# NOTE: Not having '$local_fs' on Required-Start but only on Required-Stop +# is on purpose. If we have '$local_fs' in both (and X-Start-Before=checkfs) +# we get conflicts - import needs to be started extremely early, +# but not stopped too late. +# +# Released under the 2-clause BSD license. +# +# The original script that acted as a template for this script came from +# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a +# licensing stansa) in the commit dated Mar 24, 2011: +# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a + +# Source the common init script +. /etc/zfs/zfs-functions + +# ---------------------------------------------------- + +do_depend() +{ + before swap + after sysfs udev + keyword -lxc -openvz -prefix -vserver +} + +# Use the zpool cache file to import pools +do_verbatim_import() +{ + if [ -f "$ZPOOL_CACHE" ] + then + zfs_action "Importing ZFS pool(s)" \ + "$ZPOOL" import -c "$ZPOOL_CACHE" -N -a + fi +} + +# Support function to get a list of all pools, separated with ';' +find_pools() +{ + local CMD="$*" + local pools + + pools=$($CMD 2> /dev/null | \ + grep -E "pool:|^[a-zA-Z0-9]" | \ + sed 's@.*: @@' | \ + sort | \ + while read pool; do \ + echo -n "$pool;" + done) + + echo "${pools%%;}" # Return without the last ';'. +} + +# Find and import all visible pools, even exported ones +do_import_all_visible() +{ + local already_imported available_pools pool npools + local exception dir ZPOOL_IMPORT_PATH RET=0 r=1 + + # In case not shutdown cleanly. + [ -n "$init" ] && rm -f /etc/dfs/sharetab + + # Just simplify code later on. + if [ -n "$USE_DISK_BY_ID" -a "$USE_DISK_BY_ID" != 'yes' ] + then + # It's something, but not 'yes' so it's no good to us. + unset USE_DISK_BY_ID + fi + + # Find list of already imported pools. + already_imported=$(find_pools "$ZPOOL" list -H -oname) + available_pools=$(find_pools "$ZPOOL" import) + + # Just in case - seen it happen (that a pool isn't visible/found + # with a simple "zpool import" but only when using the "-d" + # option or setting ZPOOL_IMPORT_PATH). + if [ -d "/dev/disk/by-id" ] + then + npools=$(find_pools "$ZPOOL" import -d /dev/disk/by-id) + if [ -n "$npools" ] + then + # Because we have found extra pool(s) here, which wasn't + # found 'normally', we need to force USE_DISK_BY_ID to + # make sure we're able to actually import it/them later. + USE_DISK_BY_ID='yes' + + if [ -n "$available_pools" ] + then + # Filter out duplicates (pools found with the simpl + # "zpool import" but which is also found with the + # "zpool import -d ..."). + npools=$(echo "$npools" | sed "s,$available_pools,,") + + # Add the list to the existing list of + # available pools + available_pools="$available_pools;$npools" + else + available_pools="$npools" + fi + fi + fi + + # Filter out any exceptions... + if [ -n "$ZFS_POOL_EXCEPTIONS" ] + then + local found="" + local apools="" + OLD_IFS="$IFS" ; IFS=";" + + for pool in $available_pools + do + for exception in $ZFS_POOL_EXCEPTIONS + do + [ "$pool" = "$exception" ] && continue 2 + found="$pool" + done + + if [ -n "$found" ] + then + if [ -n "$apools" ] + then + apools="$apools;$pool" + else + apools="$pool" + fi + fi + done + + IFS="$OLD_IFS" + available_pools="$apools" + fi + + # For backwards compatibility, make sure that ZPOOL_IMPORT_PATH is set + # to something we can use later with the real import(s). We want to + # make sure we find all by* dirs, BUT by-vdev should be first (if it + # exists). + if [ -n "$USE_DISK_BY_ID" -a -z "$ZPOOL_IMPORT_PATH" ] + then + local dirs + dirs="$(for dir in $(echo /dev/disk/by-*) + do + # Ignore by-vdev here - we want it first! + echo "$dir" | grep -q /by-vdev && continue + [ ! -d "$dir" ] && continue + + echo -n "$dir:" + done | sed 's,:$,,g')" + + if [ -d "/dev/disk/by-vdev" ] + then + # Add by-vdev at the beginning. + ZPOOL_IMPORT_PATH="/dev/disk/by-vdev:" + fi + + # Help with getting LUKS partitions etc imported. + if [ -d "/dev/mapper" ]; then + if [ -n "$ZPOOL_IMPORT_PATH" ]; then + ZPOOL_IMPORT_PATH="$ZPOOL_IMPORT_PATH:/dev/mapper:" + else + ZPOOL_IMPORT_PATH="/dev/mapper:" + fi + fi + + # ... and /dev at the very end, just for good measure. + ZPOOL_IMPORT_PATH="$ZPOOL_IMPORT_PATH$dirs:/dev" + fi + + # Needs to be exported for "zpool" to catch it. + [ -n "$ZPOOL_IMPORT_PATH" ] && export ZPOOL_IMPORT_PATH + + # Mount all available pools (except those set in ZFS_POOL_EXCEPTIONS. + # + # If not interactive (run from init - variable init='/sbin/init') + # we get ONE line for all pools being imported, with just a dot + # as status for each pool. + # Example: Importing ZFS pool(s)... [OK] + # + # If it IS interactive (started from the shell manually), then we + # get one line per pool importing. + # Example: Importing ZFS pool pool1 [OK] + # Importing ZFS pool pool2 [OK] + # [etc] + [ -n "$init" ] && zfs_log_begin_msg "Importing ZFS pool(s)" + OLD_IFS="$IFS" ; IFS=";" + for pool in $available_pools + do + [ -z "$pool" ] && continue + + # We have pools that haven't been imported - import them + if [ -n "$init" ] + then + # Not interactive - a dot for each pool. + # Except on Gentoo where this doesn't work. + zfs_log_progress_msg "." + else + # Interactive - one 'Importing ...' line per pool + zfs_log_begin_msg "Importing ZFS pool $pool" + fi + + # Import by using ZPOOL_IMPORT_PATH (either set above or in + # the config file) _or_ with the 'built in' default search + # paths. This is the preferred way. + "$ZPOOL" import -N ${ZPOOL_IMPORT_OPTS} "$pool" 2> /dev/null + r="$?" ; RET=$((RET + r)) + if [ "$r" -eq 0 ] + then + # Output success and process the next pool + [ -z "$init" ] && zfs_log_end_msg 0 + continue + fi + # We don't want a fail msg here, we're going to try import + # using the cache file soon and that might succeed. + [ ! -f "$ZPOOL_CACHE" ] && zfs_log_end_msg "$RET" + + if [ "$r" -gt 0 -a -f "$ZPOOL_CACHE" ] + then + # Failed to import without a cache file. Try WITH... + if [ -z "$init" ] && check_boolean "$VERBOSE_MOUNT" + then + # Interactive + Verbose = more information + zfs_log_progress_msg " using cache file" + fi + + "$ZPOOL" import -c "$ZPOOL_CACHE" -N ${ZPOOL_IMPORT_OPTS} \ + "$pool" 2> /dev/null + r="$?" ; RET=$((RET + r)) + if [ "$r" -eq 0 ] + then + [ -z "$init" ] && zfs_log_end_msg 0 + continue 3 # Next pool + fi + zfs_log_end_msg "$RET" + fi + done + [ -n "$init" ] && zfs_log_end_msg "$RET" + + IFS="$OLD_IFS" + [ -n "$already_imported" -a -z "$available_pools" ] && return 0 + + return "$RET" +} + +do_import() +{ + if check_boolean "$ZPOOL_IMPORT_ALL_VISIBLE" + then + do_import_all_visible + else + # This is the default option + do_verbatim_import + fi +} + +# Output the status and list of pools +do_status() +{ + check_module_loaded "zfs" || exit 0 + + "$ZPOOL" status && echo "" && "$ZPOOL" list +} + +do_start() +{ + if check_boolean "$VERBOSE_MOUNT" + then + zfs_log_begin_msg "Checking if ZFS userspace tools present" + fi + + if checksystem + then + check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 0 + + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_begin_msg "Loading kernel ZFS infrastructure" + + if ! load_module "zfs" + then + check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 1 + return 5 + fi + check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 0 + + do_import && udev_trigger # just to make sure we get zvols. + + return 0 + else + return 1 + fi +} + +# ---------------------------------------------------- + +if [ ! -e /sbin/openrc-run ] +then + case "$1" in + start) + do_start + ;; + stop) + # no-op + ;; + status) + do_status + ;; + force-reload|condrestart|reload|restart) + # no-op + ;; + *) + [ -n "$1" ] && echo "Error: Unknown command $1." + echo "Usage: $0 {start|status}" + exit 3 + ;; + esac + + exit $? +else + # Create wrapper functions since Gentoo don't use the case part. + depend() { do_depend; } + start() { do_start; } + status() { do_status; } +fi diff --git a/init.d/zfs-mount b/init.d/zfs-mount new file mode 100755 index 0000000..9939447 --- /dev/null +++ b/init.d/zfs-mount @@ -0,0 +1,227 @@ +#!/bin/sh +# +# zfs-mount This script will mount/umount the zfs filesystems. +# +# chkconfig: 2345 06 99 +# description: This script will mount/umount the zfs filesystems during +# system boot/shutdown. Configuration of which filesystems +# should be mounted is handled by the zfs 'mountpoint' and +# 'canmount' properties. See the zfs(8) man page for details. +# It is also responsible for all userspace zfs services. +# probe: true +# +### BEGIN INIT INFO +# Provides: zfs-mount +# Required-Start: $local_fs zfs-import +# Required-Stop: $local_fs zfs-import +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# X-Stop-After: zfs-zed +# Short-Description: Mount ZFS filesystems and volumes +# Description: Run the `zfs mount -a` or `zfs umount -a` commands. +### END INIT INFO +# +# Released under the 2-clause BSD license. +# +# The original script that acted as a template for this script came from +# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a +# licensing stansa) in the commit dated Mar 24, 2011: +# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a + +# Source the common init script +. /etc/zfs/zfs-functions + +# ---------------------------------------------------- + +chkroot() { + while read line; do + set -- $line + if [ "$2" = "/" ]; then + return 0 + fi + done < /proc/self/mounts + + return 1 +} + +do_depend() +{ + # Try to allow people to mix and match fstab with ZFS in a way that makes sense. + if [ "$(mountinfo -s /)" = 'zfs' ] + then + before localmount + else + after localmount + fi + + # bootmisc will log to /var which may be a different zfs than root. + before bootmisc logger + + after zfs-import sysfs + use mtab + keyword -lxc -openvz -prefix -vserver +} + +# Mount all datasets/filesystems +do_mount() +{ + local verbose overlay i mntpt val + + check_boolean "$VERBOSE_MOUNT" && verbose=v + check_boolean "$DO_OVERLAY_MOUNTS" && overlay=O + + zfs_action "Mounting ZFS filesystem(s)" \ + "$ZFS" mount -a$verbose$overlay "$MOUNT_EXTRA_OPTIONS" + + # Require each volume/filesystem to have 'noauto' and no fsck + # option. This shouldn't really be necessary, as long as one + # can get zfs-import to run sufficiently early on in the boot + # process - before local mounts. This is just here in case/if + # this isn't possible. + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_begin_msg "Mounting volumes and filesystems registered in fstab" + + read_mtab "^/dev/(zd|zvol)" + read_fstab "^/dev/(zd|zvol)" + i=0; var=$(eval echo FSTAB_$i) + while [ -n "$(eval echo "$""$var")" ] + do + mntpt=$(eval echo "$""$var") + dev=$(eval echo "$"FSTAB_dev_$i) + if ! in_mtab "$mntpt" && ! is_mounted "$mntpt" && [ -e "$dev" ] + then + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_progress_msg "$mntpt " + fsck "$dev" && mount "$mntpt" + fi + + i=$((i + 1)) + var=$(eval echo FSTAB_$i) + done + + read_mtab "[[:space:]]zfs[[:space:]]" + read_fstab "[[:space:]]zfs[[:space:]]" + i=0; var=$(eval echo FSTAB_$i) + while [ -n "$(eval echo "$""$var")" ] + do + mntpt=$(eval echo "$""$var") + if ! in_mtab "$mntpt" && ! is_mounted "$mntpt" + then + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_progress_msg "$mntpt " + mount "$mntpt" + fi + + i=$((i + 1)) + var=$(eval echo FSTAB_$i) + done + check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 0 + + return 0 +} + +# Unmount all filesystems +do_unmount() +{ + local i var mntpt + + # This shouldn't really be necessary, as long as one can get + # zfs-import to run sufficiently late in the shutdown/reboot process + # - after unmounting local filesystems. This is just here in case/if + # this isn't possible. + zfs_action "Unmounting ZFS filesystems" "$ZFS" unmount -a + + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_begin_msg "Unmounting volumes and filesystems registered in fstab" + + read_mtab "^/dev/(zd|zvol)" + read_fstab "^/dev/(zd|zvol)" + i=0; var=$(eval echo FSTAB_$i) + while [ -n "$(eval echo "$""$var")" ] + do + mntpt=$(eval echo "$""$var") + dev=$(eval echo "$"FSTAB_dev_$i) + if in_mtab "$mntpt" + then + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_progress_msg "$mntpt " + umount "$mntpt" + fi + + i=$((i + 1)) + var=$(eval echo FSTAB_$i) + done + + read_mtab "[[:space:]]zfs[[:space:]]" + read_fstab "[[:space:]]zfs[[:space:]]" + i=0; var=$(eval echo FSTAB_$i) + while [ -n "$(eval echo "$""$var")" ] + do + mntpt=$(eval echo "$""$var") + if in_mtab "$mntpt"; then + check_boolean "$VERBOSE_MOUNT" && \ + zfs_log_progress_msg "$mntpt " + umount "$mntpt" + fi + + i=$((i + 1)) + var=$(eval echo FSTAB_$i) + done + check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 0 + + return 0 +} + +do_start() +{ + check_boolean "$ZFS_MOUNT" || exit 0 + + check_module_loaded "zfs" || exit 0 + + # Ensure / exists in /proc/self/mounts. + # This should be handled by rc.sysinit but lets be paranoid. + if ! chkroot + then + mount -f / + fi + + do_mount +} + +do_stop() +{ + check_boolean "$ZFS_UNMOUNT" || exit 0 + + check_module_loaded "zfs" || exit 0 + + do_unmount +} + +# ---------------------------------------------------- + +if [ ! -e /sbin/openrc-run ] +then + case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + force-reload|condrestart|reload|restart|status) + # no-op + ;; + *) + [ -n "$1" ] && echo "Error: Unknown command $1." + echo "Usage: $0 {start|stop}" + exit 3 + ;; + esac + + exit $? +else + # Create wrapper functions since Gentoo don't use the case part. + depend() { do_depend; } + start() { do_start; } + stop() { do_stop; } +fi diff --git a/init.d/zfs-share b/init.d/zfs-share new file mode 100755 index 0000000..3fbe0ec --- /dev/null +++ b/init.d/zfs-share @@ -0,0 +1,85 @@ +#!/bin/sh +# +# zfs-share This script will network share zfs filesystems and volumes. +# +# chkconfig: 2345 30 99 +# description: Run the `zfs share -a` or `zfs unshare -a` commands +# for controlling iSCSI, NFS, or CIFS network shares. +# probe: true +# +### BEGIN INIT INFO +# Provides: zfs-share +# Required-Start: $local_fs $network $remote_fs zfs-mount +# Required-Stop: $local_fs $network $remote_fs zfs-mount +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Should-Start: iscsi iscsitarget istgt scst nfs-kernel-server samba samba4 zfs-mount zfs-zed +# Should-Stop: iscsi iscsitarget istgt scst nfs-kernel-server samba samba4 zfs-mount zfs-zed +# Short-Description: Network share ZFS datasets and volumes. +# Description: Run the `zfs share -a` or `zfs unshare -a` commands +# for controlling iSCSI, NFS, or CIFS network shares. +### END INIT INFO +# +# Released under the 2-clause BSD license. +# +# The original script that acted as a template for this script came from +# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a +# licensing stansa) in the commit dated Mar 24, 2011: +# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a + +# Source the common init script +. /etc/zfs/zfs-functions + +# ---------------------------------------------------- + +do_depend() +{ + after sysfs zfs-mount zfs-zed + keyword -lxc -openvz -prefix -vserver +} + +do_start() +{ + check_boolean "$ZFS_SHARE" || exit 0 + + check_module_loaded "zfs" || exit 0 + + zfs_action "Sharing ZFS filesystems" "$ZFS" share -a +} + +do_stop() +{ + check_boolean "$ZFS_UNSHARE" || exit 0 + + check_module_loaded "zfs" || exit 0 + + zfs_action "Unsharing ZFS filesystems" "$ZFS" unshare -a +} + +# ---------------------------------------------------- + +if [ ! -e /sbin/openrc-run ]; then + case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + force-reload|reload|restart|status) + # no-op + ;; + *) + [ -n "$1" ] && echo "Error: Unknown command $1." + echo "Usage: $0 {start|stop}" + exit 3 + ;; + esac + + exit $? +else + # Create wrapper functions since Gentoo don't use the case part. + depend() { do_depend; } + start() { do_start; } + stop() { do_stop; } +fi diff --git a/init.d/zfs-zed b/init.d/zfs-zed new file mode 100755 index 0000000..f5c2058 --- /dev/null +++ b/init.d/zfs-zed @@ -0,0 +1,134 @@ +#!/bin/sh +# +# zfs-zed +# +# chkconfig: 2345 29 99 +# description: This script will start and stop the ZFS Event Daemon. +# probe: true +# +### BEGIN INIT INFO +# Provides: zfs-zed +# Required-Start: zfs-mount +# Required-Stop: zfs-mount +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# X-Stop-After: zfs-share +# Short-Description: ZFS Event Daemon +# Description: zed monitors ZFS events. When a zevent is posted, zed +# will run any scripts that have been enabled for the +# corresponding zevent class. +### END INIT INFO +# +# Released under the 2-clause BSD license. +# +# The original script that acted as a template for this script came from +# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a +# licensing stansa) in the commit dated Mar 24, 2011: +# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a + +# Source the common init script +. /etc/zfs/zfs-functions + +ZED_NAME="zed" +ZED_PIDFILE="/var/run/$ZED_NAME.pid" + +extra_started_commands="reload" + +# Exit if the package is not installed +[ -x "$ZED" ] || exit 0 + +# ---------------------------------------------------- + +do_depend() +{ + after zfs-mount localmount +} + +do_start() +{ + check_module_loaded "zfs" || exit 0 + + ZED_ARGS="$ZED_ARGS -p $ZED_PIDFILE" + + zfs_action "Starting ZFS Event Daemon" zfs_daemon_start \ + "$ZED_PIDFILE" "$ZED" "$ZED_ARGS" + return "$?" +} + +do_stop() +{ + local pools RET + check_module_loaded "zfs" || exit 0 + + zfs_action "Stopping ZFS Event Daemon" zfs_daemon_stop \ + "$ZED_PIDFILE" "$ZED" "$ZED_NAME" + if [ "$?" -eq "0" ] + then + # Let's see if we have any pools imported + pools=$("$ZPOOL" list -H -oname) + if [ -z "$pools" ] + then + # No pools imported, it is/should be safe/possible to + # unload modules. + zfs_action "Unloading modules" rmmod zfs zunicode \ + zavl zcommon znvpair zlua spl + return "$?" + fi + else + return "$?" + fi +} + +do_status() +{ + check_module_loaded "zfs" || exit 0 + + zfs_daemon_status "$ZED_PIDFILE" "$ZED" "$ZED_NAME" + return "$?" +} + +do_reload() +{ + check_module_loaded "zfs" || exit 0 + + zfs_action "Reloading ZFS Event Daemon" zfs_daemon_reload \ + "$ZED_PIDFILE" "$ZED_NAME" + return "$?" +} + +# ---------------------------------------------------- + +if [ ! -e /sbin/openrc-run ]; then + case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + status) + do_status + ;; + reload|force-reload) + do_reload + ;; + restart) + do_stop + do_start + ;; + *) + [ -n "$1" ] && echo "Error: Unknown command $1." + echo "Usage: $0 {start|stop|status|reload|restart}" + exit 1 + ;; + esac + + exit $? +else + # Create wrapper functions since Gentoo don't use the case part. + depend() { do_depend; } + start() { do_start; } + stop() { do_stop; } + status() { do_status; } + reload() { do_reload; } +fi diff --git a/init/ulogd2.conf b/init/ulogd2.conf deleted file mode 100644 index e0ddf04..0000000 --- a/init/ulogd2.conf +++ /dev/null @@ -1,13 +0,0 @@ -# ulogd2 - Netfilter Userspace Logging Daemon -# -# ulogd is an advanced netfilter logging daemon. - -description "Netfilter Userspace Logging Daemon" - -start on runlevel [2345] -stop on runlevel [!2345] - -expect fork -respawn - -exec /usr/sbin/ulogd --daemon --uid ulog diff --git a/issue b/issue index a1723d8..16c78de 100644 --- a/issue +++ b/issue @@ -1,2 +1,2 @@ -Linux Mint 19.3 Tricia \n \l +Linux Mint 20 Ulyana \n \l diff --git a/issue.net b/issue.net index 5d74d82..1cbe582 100644 --- a/issue.net +++ b/issue.net @@ -1 +1 @@ -Linux Mint 19.3 Tricia +Linux Mint 20 Ulyana diff --git a/lintianrc b/lintianrc index 76f781e..c9c41f6 100644 --- a/lintianrc +++ b/lintianrc @@ -10,6 +10,8 @@ # VAR=text # or # VAR="text" +# or +# VAR = text # It is allowed to use `~' and `$HOME' in the variables, but not other # shell/environment variables. @@ -46,6 +48,9 @@ # Suppress the listed tags (--suppress-tags) #suppress-tags = debian-watch-does-not-check-gpg-signature + +# Suppress the tags listed in the specified file (--suppress-tags-from-file) +#suppress-tags-from-file = /path/to/file.txt # Specify "tag per package" display limit (--tag-display-limit) #tag-display-limit = 42 diff --git a/logcheck/ignore.d.paranoid/mariadb-server-10_3 b/logcheck/ignore.d.paranoid/mariadb-server-10_3 new file mode 100644 index 0000000..00cc5c3 --- /dev/null +++ b/logcheck/ignore.d.paranoid/mariadb-server-10_3 @@ -0,0 +1,9 @@ +/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ +/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ +/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ +mysqld\[[0-9]+\]: $ +mysqld\[[0-9]+\]: Version: .* socket: '/var/run/mysqld/mysqld.sock' port: 3306$ +mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ +mysqld_safe\[[0-9]+\]: started$ +usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ +usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.server/mariadb-server-10_3 b/logcheck/ignore.d.server/mariadb-server-10_3 new file mode 100644 index 0000000..d6e7f90 --- /dev/null +++ b/logcheck/ignore.d.server/mariadb-server-10_3 @@ -0,0 +1,32 @@ +/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ +/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ +/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ +/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ +mysqld\[[0-9]+\]: ?$ +mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed +mysqld\[[0-9]+\]: .*InnoDB: Started; +mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$ +mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$ +mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$ +mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$ +mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$ +mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$ +mysqld\[[0-9]+\]: Version: .* socket +mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ +mysqld_safe\[[0-9]+\]: ?$ +mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$ +mysqld_safe\[[0-9]+\]: ended$ +mysqld_safe\[[0-9]+\]: http://www.mysql.com$ +mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ +mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ +mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ +mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ +mysqld_safe\[[0-9]+\]: started$ +mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at http://mariadb.org/jira$ +mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$ +mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$ +mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$ +mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$ +mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$ +usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ +usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logcheck/ignore.d.workstation/mariadb-server-10_3 b/logcheck/ignore.d.workstation/mariadb-server-10_3 new file mode 100644 index 0000000..a0b4792 --- /dev/null +++ b/logcheck/ignore.d.workstation/mariadb-server-10_3 @@ -0,0 +1,32 @@ +/etc/init.d/mysql\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ +/etc/init.d/mysql\[[0-9]+\]: Check that mysqld is running and that the socket: '/var/run/mysqld/mysqld.sock' exists\!$ +/etc/init.d/mysql\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$ +/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$ +mysqld\[[0-9]+\]: ?$ +mysqld\[[0-9]+\]: .*InnoDB: Shutdown completed +mysqld\[[0-9]+\]: .*InnoDB: Started; +mysqld\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$ +mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Normal shutdown$ +mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: ready for connections\.$ +mysqld\[[0-9]+\]: .*\[Note\] /usr/sbin/mysqld: Shutdown complete$ +mysqld\[[0-9]+\]: /usr/sbin/mysqld: ready for connections\.$ +mysqld\[[0-9]+\]: .*/usr/sbin/mysqld: Shutdown Complete$ +mysqld\[[0-9]+\]: Version: .* socket +mysqld\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$ +mysqld_safe\[[0-9]+\]: ?$ +mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$ +mysqld_safe\[[0-9]+\]: ended$ +mysqld_safe\[[0-9]+\]: http://www.mysql.com$ +mysqld_safe\[[0-9]+\]: NOTE: If you are upgrading from a MySQL <= 3.22.10 you should run$ +mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$ +mysqld_safe\[[0-9]+\]: Please report any problems at http://mariadb.org/jira$ +mysqld_safe\[[0-9]+\]: See the manual for more instructions.$ +mysqld_safe\[[0-9]+\]: started$ +mysqld_safe\[[0-9]+\]: Support MySQL by buying support/licenses at https://order.mysql.com$ +mysqld_safe\[[0-9]+\]: The latest information about MySQL is available on the web at$ +mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$ +mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$ +mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$ +mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$ +usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$ +usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$ diff --git a/logrotate.d/bootlog b/logrotate.d/bootlog new file mode 100644 index 0000000..9be1a64 --- /dev/null +++ b/logrotate.d/bootlog @@ -0,0 +1,8 @@ +/var/log/boot.log +{ + missingok + daily + copytruncate + rotate 7 + notifempty +} diff --git a/logrotate.d/ulogd2 b/logrotate.d/ulogd2 index 56c691e..4d03ba9 100644 --- a/logrotate.d/ulogd2 +++ b/logrotate.d/ulogd2 @@ -1,9 +1,14 @@ /var/log/ulog/*.log /var/log/ulog/*.pcap { missingok compress + delaycompress sharedscripts create 640 ulog adm postrotate - invoke-rc.d ulogd2 reload > /dev/null + if [ -d /run/systemd/system ] && command systemctl >/dev/null 2>&1 && systemctl is-active --quiet ulogd2.service; then + systemctl kill --kill-who main --signal=SIGHUP ulogd2.service + else + invoke-rc.d ulogd2 reload > /dev/null + fi endscript } diff --git a/lsb-release b/lsb-release index fca1def..c27d35f 100644 --- a/lsb-release +++ b/lsb-release @@ -1,4 +1,4 @@ DISTRIB_ID=LinuxMint -DISTRIB_RELEASE=19.3 -DISTRIB_CODENAME=tricia -DISTRIB_DESCRIPTION="Linux Mint 19.3 Tricia" +DISTRIB_RELEASE=20 +DISTRIB_CODENAME=ulyana +DISTRIB_DESCRIPTION="Linux Mint 20 Ulyana" diff --git a/lvm/backup/vgdata b/lvm/backup/vgdata index f534250..fdbb7c8 100644 --- a/lvm/backup/vgdata +++ b/lvm/backup/vgdata @@ -1,12 +1,12 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Wed May 20 08:42:28 2020 +# Generated by LVM2 version 2.03.07(2) (2019-11-30): Tue Jul 21 12:02:01 2020 contents = "Text Format Volume Group" version = 1 description = "Created *after* executing 'vgcfgbackup'" -creation_host = "bruni" # Linux bruni 5.3.0-51-generic #44~18.04.2-Ubuntu SMP Thu Apr 23 14:27:18 UTC 2020 x86_64 -creation_time = 1589956948 # Wed May 20 08:42:28 2020 +creation_host = "bruni" # Linux bruni 5.3.0-62-generic #56~18.04.1-Ubuntu SMP Wed Jun 24 16:17:03 UTC 2020 x86_64 +creation_time = 1595325721 # Tue Jul 21 12:02:01 2020 vgdata { id = "9tIsKm-GYn0-Ghde-h9pl-vP4h-1uP3-JYs9yl" diff --git a/lvm/backup/vgroot b/lvm/backup/vgroot index e52ce42..e7eb838 100644 --- a/lvm/backup/vgroot +++ b/lvm/backup/vgroot @@ -1,12 +1,12 @@ -# Generated by LVM2 version 2.02.176(2) (2017-11-03): Wed May 20 08:42:28 2020 +# Generated by LVM2 version 2.03.07(2) (2019-11-30): Tue Jul 21 12:02:01 2020 contents = "Text Format Volume Group" version = 1 description = "Created *after* executing 'vgcfgbackup'" -creation_host = "bruni" # Linux bruni 5.3.0-51-generic #44~18.04.2-Ubuntu SMP Thu Apr 23 14:27:18 UTC 2020 x86_64 -creation_time = 1589956948 # Wed May 20 08:42:28 2020 +creation_host = "bruni" # Linux bruni 5.3.0-62-generic #56~18.04.1-Ubuntu SMP Wed Jun 24 16:17:03 UTC 2020 x86_64 +creation_time = 1595325721 # Tue Jul 21 12:02:01 2020 vgroot { id = "cmzWKh-2ZXl-hHKZ-lT3h-iwLR-eKCG-j1Tu9P" diff --git a/lvm/lvm.conf b/lvm/lvm.conf index a1d18e5..e3a4984 100644 --- a/lvm/lvm.conf +++ b/lvm/lvm.conf @@ -88,6 +88,22 @@ devices { # external_device_info_source = "none" + # Configuration option devices/hints. + # Use a local file to remember which devices have PVs on them. + # Some commands will use this as an optimization to reduce device + # scanning, and will only scan the listed PVs. Removing the hint file + # will cause lvm to generate a new one. Disable hints if PVs will + # be copied onto devices using non-lvm commands, like dd. + # + # Accepted values: + # all + # Use all hints. + # none + # Use no hints. + # + # This configuration option has an automatic default value. + # hints = "all" + # Configuration option devices/preferred_names. # Select which path name to display for a block device. # If multiple path names exist for a block device, and LVM needs to @@ -123,11 +139,10 @@ devices { # then the device is accepted. Be careful mixing 'a' and 'r' patterns, # as the combination might produce unexpected results (test changes.) # Run vgscan after changing the filter to regenerate the cache. - # See the use_lvmetad comment for a special case regarding filters. # # Example # Accept every block device: - # filter = [ "a|.*/|" ] + # filter = [ "a|.*|" ] # Reject the cdrom drive: # filter = [ "r|/dev/cdrom|" ] # Work with just loopback devices, e.g. for testing: @@ -135,38 +150,20 @@ devices { # Accept all loop devices and ide drives except hdc: # filter = [ "a|loop|", "r|/dev/hdc|", "a|/dev/ide|", "r|.*|" ] # Use anchors to be very specific: - # filter = [ "a|^/dev/hda8$|", "r|.*/|" ] + # filter = [ "a|^/dev/hda8$|", "r|.*|" ] # # This configuration option has an automatic default value. - # filter = [ "a|.*/|" ] + # filter = [ "a|.*|" ] # Configuration option devices/global_filter. # Limit the block devices that are used by LVM system components. # Because devices/filter may be overridden from the command line, it is - # not suitable for system-wide device filtering, e.g. udev and lvmetad. + # not suitable for system-wide device filtering, e.g. udev. # Use global_filter to hide devices from these LVM system components. # The syntax is the same as devices/filter. Devices rejected by # global_filter are not opened by LVM. # This configuration option has an automatic default value. - # global_filter = [ "a|.*/|" ] - - # Configuration option devices/cache_dir. - # Directory in which to store the device cache file. - # The results of filtering are cached on disk to avoid rescanning dud - # devices (which can take a very long time). By default this cache is - # stored in a file named .cache. It is safe to delete this file; the - # tools regenerate it. If obtain_device_list_from_udev is enabled, the - # list of devices is obtained from udev and any existing .cache file - # is removed. - cache_dir = "/run/lvm" - - # Configuration option devices/cache_file_prefix. - # A prefix used before the .cache file name. See devices/cache_dir. - cache_file_prefix = "" - - # Configuration option devices/write_cache_state. - # Enable/disable writing the cache file. See devices/cache_dir. - write_cache_state = 1 + # global_filter = [ "a|.*|" ] # Configuration option devices/types. # List of additional acceptable block device types. @@ -185,14 +182,53 @@ devices { # present on the system. sysfs must be part of the kernel and mounted.) sysfs_scan = 1 + # Configuration option devices/scan_lvs. + # Scan LVM LVs for layered PVs, allowing LVs to be used as PVs. + # When 1, LVM will detect PVs layered on LVs, and caution must be + # taken to avoid a host accessing a layered VG that may not belong + # to it, e.g. from a guest image. This generally requires excluding + # the LVs with device filters. Also, when this setting is enabled, + # every LVM command will scan every active LV on the system (unless + # filtered), which can cause performance problems on systems with + # many active LVs. When this setting is 0, LVM will not detect or + # use PVs that exist on LVs, and will not allow a PV to be created on + # an LV. The LVs are ignored using a built in device filter that + # identifies and excludes LVs. + scan_lvs = 0 + # Configuration option devices/multipath_component_detection. # Ignore devices that are components of DM multipath devices. multipath_component_detection = 1 # Configuration option devices/md_component_detection. - # Ignore devices that are components of software RAID (md) devices. + # Enable detection and exclusion of MD component devices. + # An MD component device is a block device that MD uses as part + # of a software RAID virtual device. When an LVM PV is created + # on an MD device, LVM must only use the top level MD device as + # the PV, and should ignore the underlying component devices. + # In cases where the MD superblock is located at the end of the + # component devices, it is more difficult for LVM to consistently + # identify an MD component, see the md_component_checks setting. md_component_detection = 1 + # Configuration option devices/md_component_checks. + # The checks LVM should use to detect MD component devices. + # MD component devices are block devices used by MD software RAID. + # + # Accepted values: + # auto + # LVM will skip scanning the end of devices when it has other + # indications that the device is not an MD component. + # start + # LVM will only scan the start of devices for MD superblocks. + # This does not incur extra I/O by LVM. + # full + # LVM will scan the start and end of devices for MD superblocks. + # This requires an extra read at the end of devices. + # + # This configuration option has an automatic default value. + # md_component_checks = "auto" + # Configuration option devices/fw_raid_component_detection. # Ignore devices that are components of firmware RAID devices. # LVM must use an external_device_info_source other than none for this @@ -200,19 +236,24 @@ devices { fw_raid_component_detection = 0 # Configuration option devices/md_chunk_alignment. - # Align PV data blocks with md device's stripe-width. + # Align the start of a PV data area with md device's stripe-width. # This applies if a PV is placed directly on an md device. + # default_data_alignment will be overriden if it is not aligned + # with the value detected for this setting. + # This setting is overriden by data_alignment_detection, + # data_alignment, and the --dataalignment option. md_chunk_alignment = 1 # Configuration option devices/default_data_alignment. - # Default alignment of the start of a PV data area in MB. - # If set to 0, a value of 64KiB will be used. - # Set to 1 for 1MiB, 2 for 2MiB, etc. + # Align the start of a PV data area with this number of MiB. + # Set to 1 for 1MiB, 2 for 2MiB, etc. Set to 0 to disable. + # This setting is overriden by data_alignment and the --dataalignment + # option. # This configuration option has an automatic default value. # default_data_alignment = 1 # Configuration option devices/data_alignment_detection. - # Detect PV data alignment based on sysfs device information. + # Align the start of a PV data area with sysfs io properties. # The start of a PV data area will be a multiple of minimum_io_size or # optimal_io_size exposed in sysfs. minimum_io_size is the smallest # request the device can perform without incurring a read-modify-write @@ -220,27 +261,29 @@ devices { # preferred unit of receiving I/O, e.g. MD stripe width. # minimum_io_size is used if optimal_io_size is undefined (0). # If md_chunk_alignment is enabled, that detects the optimal_io_size. - # This setting takes precedence over md_chunk_alignment. + # default_data_alignment and md_chunk_alignment will be overriden + # if they are not aligned with the value detected for this setting. + # This setting is overriden by data_alignment and the --dataalignment + # option. data_alignment_detection = 1 # Configuration option devices/data_alignment. - # Alignment of the start of a PV data area in KiB. - # If a PV is placed directly on an md device and md_chunk_alignment or - # data_alignment_detection are enabled, then this setting is ignored. - # Otherwise, md_chunk_alignment and data_alignment_detection are - # disabled if this is set. Set to 0 to use the default alignment or the - # page size, if larger. + # Align the start of a PV data area with this number of KiB. + # When non-zero, this setting overrides default_data_alignment. + # Set to 0 to disable, in which case default_data_alignment + # is used to align the first PE in units of MiB. + # This setting is overriden by the --dataalignment option. data_alignment = 0 # Configuration option devices/data_alignment_offset_detection. - # Detect PV data alignment offset based on sysfs device information. - # The start of a PV aligned data area will be shifted by the + # Shift the start of an aligned PV data area based on sysfs information. + # After a PV data area is aligned, it will be shifted by the # alignment_offset exposed in sysfs. This offset is often 0, but may # be non-zero. Certain 4KiB sector drives that compensate for windows # partitioning will have an alignment_offset of 3584 bytes (sector 7 # is the lowest aligned logical block, the 4KiB sectors start at # LBA -1, and consequently sector 63 is aligned on a 4KiB boundary). - # pvcreate --dataalignmentoffset will skip this detection. + # This setting is overriden by the --dataalignmentoffset option. data_alignment_offset_detection = 1 # Configuration option devices/ignore_suspended_devices. @@ -268,14 +311,6 @@ devices { # different way, making them a better choice for VG stacking. ignore_lvm_mirrors = 1 - # Configuration option devices/disable_after_error_count. - # Number of I/O errors after which a device is skipped. - # During each LVM operation, errors received from each device are - # counted. If the counter of a device exceeds the limit set here, - # no further I/O is sent to that device for the remainder of the - # operation. Setting this to 0 disables the counters altogether. - disable_after_error_count = 0 - # Configuration option devices/require_restorefile_with_uuid. # Allow use of pvcreate --uuid without requiring --restorefile. require_restorefile_with_uuid = 1 @@ -312,6 +347,12 @@ devices { # Enabling this setting allows the VG to be used as usual even with # uncertain devices. allow_changes_with_duplicate_pvs = 0 + + # Configuration option devices/allow_mixed_block_sizes. + # Allow PVs in the same VG with different logical block sizes. + # When allowed, the user is responsible to ensure that an LV is + # using PVs with matching block sizes when necessary. + allow_mixed_block_sizes = 0 } # Configuration section allocation. @@ -346,7 +387,7 @@ allocation { maximise_cling = 1 # Configuration option allocation/use_blkid_wiping. - # Use blkid to detect existing signatures on new PVs and LVs. + # Use blkid to detect and erase existing signatures on new PVs and LVs. # The blkid library can detect more signatures than the native LVM # detection code, but may take longer. LVM needs to be compiled with # blkid wiping support for this setting to apply. LVM native detection @@ -498,6 +539,154 @@ allocation { # Default physical extent size in KiB to use for new VGs. # This configuration option has an automatic default value. # physical_extent_size = 4096 + + # Configuration option allocation/vdo_use_compression. + # Enables or disables compression when creating a VDO volume. + # Compression may be disabled if necessary to maximize performance + # or to speed processing of data that is unlikely to compress. + # This configuration option has an automatic default value. + # vdo_use_compression = 1 + + # Configuration option allocation/vdo_use_deduplication. + # Enables or disables deduplication when creating a VDO volume. + # Deduplication may be disabled in instances where data is not expected + # to have good deduplication rates but compression is still desired. + # This configuration option has an automatic default value. + # vdo_use_deduplication = 1 + + # Configuration option allocation/vdo_use_metadata_hints. + # Enables or disables whether VDO volume should tag its latency-critical + # writes with the REQ_SYNC flag. Some device mapper targets such as dm-raid5 + # process writes with this flag at a higher priority. + # Default is enabled. + # This configuration option has an automatic default value. + # vdo_use_metadata_hints = 1 + + # Configuration option allocation/vdo_minimum_io_size. + # The minimum IO size for VDO volume to accept, in bytes. + # Valid values are 512 or 4096. The recommended and default value is 4096. + # This configuration option has an automatic default value. + # vdo_minimum_io_size = 4096 + + # Configuration option allocation/vdo_block_map_cache_size_mb. + # Specifies the amount of memory in MiB allocated for caching block map + # pages for VDO volume. The value must be a multiple of 4096 and must be + # at least 128MiB and less than 16TiB. The cache must be at least 16MiB + # per logical thread. Note that there is a memory overhead of 15%. + # This configuration option has an automatic default value. + # vdo_block_map_cache_size_mb = 128 + + # Configuration option allocation/vdo_block_map_period. + # The speed with which the block map cache writes out modified block map pages. + # A smaller era length is likely to reduce the amount time spent rebuilding, + # at the cost of increased block map writes during normal operation. + # The maximum and recommended value is 16380; the minimum value is 1. + # This configuration option has an automatic default value. + # vdo_block_map_period = 16380 + + # Configuration option allocation/vdo_check_point_frequency. + # The default check point frequency for VDO volume. + # This configuration option has an automatic default value. + # vdo_check_point_frequency = 0 + + # Configuration option allocation/vdo_use_sparse_index. + # Enables sparse indexing for VDO volume. + # This configuration option has an automatic default value. + # vdo_use_sparse_index = 0 + + # Configuration option allocation/vdo_index_memory_size_mb. + # Specifies the amount of index memory in MiB for VDO volume. + # The value must be at least 256MiB and at most 1TiB. + # This configuration option has an automatic default value. + # vdo_index_memory_size_mb = 256 + + # Configuration option allocation/vdo_slab_size_mb. + # Specifies the size in MiB of the increment by which a VDO is grown. + # Using a smaller size constrains the total maximum physical size + # that can be accommodated. Must be a power of two between 128MiB and 32GiB. + # This configuration option has an automatic default value. + # vdo_slab_size_mb = 2048 + + # Configuration option allocation/vdo_ack_threads. + # Specifies the number of threads to use for acknowledging + # completion of requested VDO I/O operations. + # The value must be at in range [0..100]. + # This configuration option has an automatic default value. + # vdo_ack_threads = 1 + + # Configuration option allocation/vdo_bio_threads. + # Specifies the number of threads to use for submitting I/O + # operations to the storage device of VDO volume. + # The value must be in range [1..100] + # Each additional thread after the first will use an additional 18MiB of RAM, + # plus 1.12 MiB of RAM per megabyte of configured read cache size. + # This configuration option has an automatic default value. + # vdo_bio_threads = 4 + + # Configuration option allocation/vdo_bio_rotation. + # Specifies the number of I/O operations to enqueue for each bio-submission + # thread before directing work to the next. The value must be in range [1..1024]. + # This configuration option has an automatic default value. + # vdo_bio_rotation = 64 + + # Configuration option allocation/vdo_cpu_threads. + # Specifies the number of threads to use for CPU-intensive work such as + # hashing or compression for VDO volume. The value must be in range [1..100] + # This configuration option has an automatic default value. + # vdo_cpu_threads = 2 + + # Configuration option allocation/vdo_hash_zone_threads. + # Specifies the number of threads across which to subdivide parts of the VDO + # processing based on the hash value computed from the block data. + # The value must be at in range [0..100]. + # vdo_hash_zone_threads, vdo_logical_threads and vdo_physical_threads must be + # either all zero or all non-zero. + # This configuration option has an automatic default value. + # vdo_hash_zone_threads = 1 + + # Configuration option allocation/vdo_logical_threads. + # Specifies the number of threads across which to subdivide parts of the VDO + # processing based on the hash value computed from the block data. + # A logical thread count of 9 or more will require explicitly specifying + # a sufficiently large block map cache size, as well. + # The value must be in range [0..100]. + # vdo_hash_zone_threads, vdo_logical_threads and vdo_physical_threads must be + # either all zero or all non-zero. + # This configuration option has an automatic default value. + # vdo_logical_threads = 1 + + # Configuration option allocation/vdo_physical_threads. + # Specifies the number of threads across which to subdivide parts of the VDO + # processing based on physical block addresses. + # Each additional thread after the first will use an additional 10MiB of RAM. + # The value must be in range [0..16]. + # vdo_hash_zone_threads, vdo_logical_threads and vdo_physical_threads must be + # either all zero or all non-zero. + # This configuration option has an automatic default value. + # vdo_physical_threads = 1 + + # Configuration option allocation/vdo_write_policy. + # Specifies the write policy: + # auto - VDO will check the storage device and determine whether it supports flushes. + # If it does, VDO will run in async mode, otherwise it will run in sync mode. + # sync - Writes are acknowledged only after data is stably written. + # This policy is not supported if the underlying storage is not also synchronous. + # async - Writes are acknowledged after data has been cached for writing to stable storage. + # Data which has not been flushed is not guaranteed to persist in this mode. + # This configuration option has an automatic default value. + # vdo_write_policy = "auto" + + # Configuration option allocation/vdo_max_discard. + # Specified te maximum size of discard bio accepted, in 4096 byte blocks. + # I/O requests to a VDO volume are normally split into 4096-byte blocks, + # and processed up to 2048 at a time. However, discard requests to a VDO volume + # can be automatically split to a larger size, up to 4096-byte blocks + # in a single bio, and are limited to 1500 at a time. + # Increasing this value may provide better overall performance, at the cost of + # increased latency for the individual discard requests. + # The default and minimum is 1. The maximum is UINT_MAX / 4096. + # This configuration option has an automatic default value. + # vdo_max_discard = 1 } # Configuration section log. @@ -588,7 +777,8 @@ log { # Configuration option log/indent. # Indent messages according to their severity. - indent = 1 + # This configuration option has an automatic default value. + # indent = 0 # Configuration option log/command_names. # Display the command name on each line of output. @@ -611,9 +801,23 @@ log { # Select log messages by class. # Some debugging messages are assigned to a class and only appear in # debug output if the class is listed here. Classes currently - # available: memory, devices, activation, allocation, lvmetad, + # available: memory, devices, io, activation, allocation, # metadata, cache, locking, lvmpolld. Use "all" to see everything. - debug_classes = [ "memory", "devices", "activation", "allocation", "lvmetad", "metadata", "cache", "locking", "lvmpolld", "dbus" ] + debug_classes = [ "memory", "devices", "io", "activation", "allocation", "metadata", "cache", "locking", "lvmpolld", "dbus" ] + + # Configuration option log/debug_file_fields. + # The fields included in debug output written to log file. + # Use "all" to include everything (the default). + # This configuration option is advanced. + # This configuration option has an automatic default value. + # debug_file_fields = [ "time", "command", "fileline", "message" ] + + # Configuration option log/debug_output_fields. + # The fields included in debug output written to stderr. + # Use "all" to include everything (the default). + # This configuration option is advanced. + # This configuration option has an automatic default value. + # debug_output_fields = [ "time", "command", "fileline", "message" ] } # Configuration section backup. @@ -677,8 +881,7 @@ global { # Configuration option global/units. # Default value for --units argument. - # units = "r" - units = "m" + units = "r" # Configuration option global/si_unit_consistency. # Distinguish between powers of 1024 and 1000 bytes. @@ -702,35 +905,6 @@ global { # the error messages. activation = 1 - # Configuration option global/fallback_to_lvm1. - # Try running LVM1 tools if LVM cannot communicate with DM. - # This option only applies to 2.4 kernels and is provided to help - # switch between device-mapper kernels and LVM1 kernels. The LVM1 - # tools need to be installed with .lvm1 suffices, e.g. vgscan.lvm1. - # They will stop working once the lvm2 on-disk metadata format is used. - # This configuration option has an automatic default value. - # fallback_to_lvm1 = 0 - - # Configuration option global/format. - # The default metadata format that commands should use. - # The -M 1|2 option overrides this setting. - # - # Accepted values: - # lvm1 - # lvm2 - # - # This configuration option has an automatic default value. - # format = "lvm2" - - # Configuration option global/format_libraries. - # Shared libraries that process different metadata formats. - # If support for LVM1 metadata was compiled as a shared library use - # format_libraries = "liblvm2format1.so" - # This configuration option does not have a default value defined. - - # Configuration option global/segment_libraries. - # This configuration option does not have a default value defined. - # Configuration option global/proc. # Location of proc filesystem. # This configuration option is advanced. @@ -740,57 +914,10 @@ global { # Location of /etc system configuration directory. etc = "/etc" - # Configuration option global/locking_type. - # Type of locking to use. - # - # Accepted values: - # 0 - # Turns off locking. Warning: this risks metadata corruption if - # commands run concurrently. - # 1 - # LVM uses local file-based locking, the standard mode. - # 2 - # LVM uses the external shared library locking_library. - # 3 - # LVM uses built-in clustered locking with clvmd. - # This is incompatible with lvmetad. If use_lvmetad is enabled, - # LVM prints a warning and disables lvmetad use. - # 4 - # LVM uses read-only locking which forbids any operations that - # might change metadata. - # 5 - # Offers dummy locking for tools that do not need any locks. - # You should not need to set this directly; the tools will select - # when to use it instead of the configured locking_type. - # Do not use lvmetad or the kernel device-mapper driver with this - # locking type. It is used by the --readonly option that offers - # read-only access to Volume Group metadata that cannot be locked - # safely because it belongs to an inaccessible domain and might be - # in use, for example a virtual machine image or a disk that is - # shared by a clustered machine. - # - locking_type = 1 - # Configuration option global/wait_for_locks. # When disabled, fail if a lock request would block. wait_for_locks = 1 - # Configuration option global/fallback_to_clustered_locking. - # Attempt to use built-in cluster locking if locking_type 2 fails. - # If using external locking (type 2) and initialisation fails, with - # this enabled, an attempt will be made to use the built-in clustered - # locking. Disable this if using a customised locking_library. - fallback_to_clustered_locking = 1 - - # Configuration option global/fallback_to_local_locking. - # Use locking_type 1 (local) if locking_type 2 or 3 fail. - # If an attempt to initialise type 2 or type 3 locking failed, perhaps - # because cluster components such as clvmd are not running, with this - # enabled, an attempt will be made to use local file-based locking - # (type 1). If this succeeds, only commands against local VGs will - # proceed. VGs marked as clustered will be ignored. - fallback_to_local_locking = 1 - # Configuration option global/locking_dir. # Directory to use for LVM command file locks. # Local non-LV directory that holds file-based locks while commands are @@ -811,24 +938,12 @@ global { # Search this directory first for shared libraries. # This configuration option does not have a default value defined. - # Configuration option global/locking_library. - # The external locking library to use for locking_type 2. - # This configuration option has an automatic default value. - # locking_library = "liblvm2clusterlock.so" - # Configuration option global/abort_on_internal_errors. # Abort a command that encounters an internal error. # Treat any internal errors as fatal errors, aborting the process that # encountered the internal error. Please only enable for debugging. abort_on_internal_errors = 0 - # Configuration option global/detect_internal_vg_cache_corruption. - # Internal verification of VG structures. - # Check if CRC matches when a parsed VG is used multiple times. This - # is useful to catch unexpected changes to cached VG structures. - # Please only enable for debugging. - detect_internal_vg_cache_corruption = 0 - # Configuration option global/metadata_read_only. # No operations that change on-disk metadata are permitted. # Additionally, read-only commands that encounter metadata in need of @@ -863,6 +978,16 @@ global { # mirror_segtype_default = "raid1" + # Configuration option global/support_mirrored_mirror_log. + # Enable mirrored 'mirror' log type for testing. + # + # This type is deprecated to create or convert to but can + # be enabled to test that activation of existing mirrored + # logs and conversion to disk/core works. + # + # Not supported for regular operation! + support_mirrored_mirror_log = 0 + # Configuration option global/raid10_segtype_default. # The segment type used by the -i -m combination. # The --type raid10|mirror option overrides this setting. @@ -911,41 +1036,20 @@ global { # This configuration option has an automatic default value. # lvdisplay_shows_full_device_path = 0 - # Configuration option global/use_lvmetad. - # Use lvmetad to cache metadata and reduce disk scanning. - # When enabled (and running), lvmetad provides LVM commands with VG - # metadata and PV state. LVM commands then avoid reading this - # information from disks which can be slow. When disabled (or not - # running), LVM commands fall back to scanning disks to obtain VG - # metadata. lvmetad is kept updated via udev rules which must be set - # up for LVM to work correctly. (The udev rules should be installed - # by default.) Without a proper udev setup, changes in the system's - # block device configuration will be unknown to LVM, and ignored - # until a manual 'pvscan --cache' is run. If lvmetad was running - # while use_lvmetad was disabled, it must be stopped, use_lvmetad - # enabled, and then started. When using lvmetad, LV activation is - # switched to an automatic, event-based mode. In this mode, LVs are - # activated based on incoming udev events that inform lvmetad when - # PVs appear on the system. When a VG is complete (all PVs present), - # it is auto-activated. The auto_activation_volume_list setting - # controls which LVs are auto-activated (all by default.) - # When lvmetad is updated (automatically by udev events, or directly - # by pvscan --cache), devices/filter is ignored and all devices are - # scanned by default. lvmetad always keeps unfiltered information - # which is provided to LVM commands. Each LVM command then filters - # based on devices/filter. This does not apply to other, non-regexp, - # filtering settings: component filters such as multipath and MD - # are checked during pvscan --cache. To filter a device and prevent - # scanning from the LVM system entirely, including lvmetad, use - # devices/global_filter. - use_lvmetad = 1 - - # Configuration option global/lvmetad_update_wait_time. - # Number of seconds a command will wait for lvmetad update to finish. - # After waiting for this period, a command will not use lvmetad, and - # will revert to disk scanning. - # This configuration option has an automatic default value. - # lvmetad_update_wait_time = 10 + # Configuration option global/event_activation. + # Activate LVs based on system-generated device events. + # When a device appears on the system, a system-generated event runs + # the pvscan command to activate LVs if the new PV completes the VG. + # Use auto_activation_volume_list to select which LVs should be + # activated from these events (the default is all.) + # When event_activation is disabled, the system will generally run + # a direct activation command to activate LVs in complete VGs. + event_activation = 1 + + # Configuration option global/use_aio. + # Use async I/O when reading and writing devices. + # This configuration option has an automatic default value. + # use_aio = 1 # Configuration option global/use_lvmlockd. # Use lvmlockd for locking among hosts using LVM on shared storage. @@ -1071,6 +1175,17 @@ global { # This configuration option has an automatic default value. # cache_repair_options = [ "" ] + # Configuration option global/vdo_format_executable. + # The full path to the vdoformat command. + # LVM uses this command to initial data volume for VDO type logical volume + # This configuration option has an automatic default value. + # vdo_format_executable = "autodetect" + + # Configuration option global/vdo_format_options. + # List of options passed added to standard vdoformat command. + # This configuration option has an automatic default value. + # vdo_format_options = [ "" ] + # Configuration option global/fsadm_executable. # The full path to the fsadm command. # LVM uses this command to help with lvresize -r operations. @@ -1128,6 +1243,16 @@ global { # When enabled, an LVM command that changes PVs, changes VG metadata, # or changes the activation state of an LV will send a notification. notify_dbus = 1 + + # Configuration option global/io_memory_size. + # The amount of memory in KiB that LVM allocates to perform disk io. + # LVM performance may benefit from more io memory when there are many + # disks or VG metadata is large. Increasing this size may be necessary + # when a single copy of VG metadata is larger than the current setting. + # This value should usually not be decreased from the default; setting + # it too low can result in lvm failing to read VGs. + # This configuration option has an automatic default value. + # io_memory_size = 8192 } # Configuration section activation. @@ -1444,6 +1569,33 @@ activation { # thin_pool_autoextend_percent = 20 + # Configuration option activation/vdo_pool_autoextend_threshold. + # Auto-extend a VDO pool when its usage exceeds this percent. + # Setting this to 100 disables automatic extension. + # The minimum value is 50 (a smaller value is treated as 50.) + # Also see vdo_pool_autoextend_percent. + # Automatic extension requires dmeventd to be monitoring the LV. + # + # Example + # Using 70% autoextend threshold and 20% autoextend size, when a 10G + # VDO pool exceeds 7G, it is extended to 12G, and when it exceeds + # 8.4G, it is extended to 14.4G: + # vdo_pool_autoextend_threshold = 70 + # + vdo_pool_autoextend_threshold = 100 + + # Configuration option activation/vdo_pool_autoextend_percent. + # Auto-extending a VDO pool adds this percent extra space. + # The amount of additional space added to a VDO pool is this + # percent of its current size. + # + # Example + # Using 70% autoextend threshold and 20% autoextend size, when a 10G + # VDO pool exceeds 7G, it is extended to 12G, and when it exceeds + # 8.4G, it is extended to 14.4G: + # This configuration option has an automatic default value. + # vdo_pool_autoextend_percent = 20 + # Configuration option activation/mlock_filter. # Do not mlock these memory areas. # While activating devices, I/O to devices being (re)configured is @@ -1589,13 +1741,19 @@ activation { # vgmetadatacopies = 0 # Configuration option metadata/pvmetadatasize. - # Approximate number of sectors to use for each metadata copy. - # VGs with large numbers of PVs or LVs, or VGs containing complex LV - # structures, may need additional space for VG metadata. The metadata - # areas are treated as circular buffers, so unused space becomes filled - # with an archive of the most recent previous versions of the metadata. - # This configuration option has an automatic default value. - # pvmetadatasize = 255 + # The default size of the metadata area in units of 512 byte sectors. + # The metadata area begins at an offset of the page size from the start + # of the device. The first PE is by default at 1 MiB from the start of + # the device. The space between these is the default metadata area size. + # The actual size of the metadata area may be larger than what is set + # here due to default_data_alignment making the first PE a MiB multiple. + # The metadata area begins with a 512 byte header and is followed by a + # circular buffer used for VG metadata text. The maximum size of the VG + # metadata is about half the size of the metadata buffer. VGs with large + # numbers of PVs or LVs, or VGs containing complex LV structures, may need + # additional space for VG metadata. The --metadatasize option overrides + # this setting. + # This configuration option does not have a default value defined. # Configuration option metadata/pvmetadataignore. # Ignore metadata areas on a new PV. @@ -1610,24 +1768,6 @@ activation { # This configuration option is advanced. # This configuration option has an automatic default value. # stripesize = 64 - - # Configuration option metadata/dirs. - # Directories holding live copies of text format metadata. - # These directories must not be on logical volumes! - # It's possible to use LVM with a couple of directories here, - # preferably on different (non-LV) filesystems, and with no other - # on-disk metadata (pvmetadatacopies = 0). Or this can be in addition - # to on-disk metadata areas. The feature was originally added to - # simplify testing and is not supported under low memory situations - - # the machine could lock up. Never edit any files in these directories - # by hand unless you are absolutely sure you know what you are doing! - # Use the supplied toolset to make changes (e.g. vgcfgrestore). - # - # Example - # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] - # - # This configuration option is advanced. - # This configuration option does not have a default value defined. # } # Configuration section report. @@ -2078,6 +2218,23 @@ dmeventd { # This configuration option has an automatic default value. # thin_command = "lvm lvextend --use-policies" + # Configuration option dmeventd/vdo_library. + # The library dmeventd uses when monitoring a VDO pool device. + # libdevmapper-event-lvm2vdo.so monitors the filling of a pool + # and emits a warning through syslog when the usage exceeds 80%. The + # warning is repeated when 85%, 90% and 95% of the pool is filled. + # This configuration option has an automatic default value. + # vdo_library = "libdevmapper-event-lvm2vdo.so" + + # Configuration option dmeventd/vdo_command. + # The plugin runs command with each 5% increment when VDO pool volume + # gets above 50%. + # Command which starts with 'lvm ' prefix is internal lvm command. + # You can write your own handler to customise behaviour in more details. + # User handler is specified with the full path starting with '/'. + # This configuration option has an automatic default value. + # vdo_command = "lvm lvextend --use-policies" + # Configuration option dmeventd/executable. # The full path to the dmeventd binary. # This configuration option has an automatic default value. diff --git a/lvm/profile/vdo-small.profile b/lvm/profile/vdo-small.profile new file mode 100644 index 0000000..2044fc2 --- /dev/null +++ b/lvm/profile/vdo-small.profile @@ -0,0 +1,24 @@ +# Demo configuration for 'VDO' using less memory. +# ~lvmconfig --type full | grep vdo + +allocation { + vdo_use_compression=1 + vdo_use_deduplication=1 + vdo_use_metadata_hints=1 + vdo_minimum_io_size=4096 + vdo_block_map_cache_size_mb=128 + vdo_block_map_period=16380 + vdo_check_point_frequency=0 + vdo_use_sparse_index=0 + vdo_index_memory_size_mb=256 + vdo_slab_size_mb=2048 + vdo_ack_threads=1 + vdo_bio_threads=1 + vdo_bio_rotation=64 + vdo_cpu_threads=2 + vdo_hash_zone_threads=1 + vdo_logical_threads=1 + vdo_physical_threads=1 + vdo_write_policy="auto" + vdo_max_discard=1 +} diff --git a/mailcap b/mailcap index 992f07d..bed444e 100644 --- a/mailcap +++ b/mailcap @@ -50,10 +50,10 @@ application/vnd.sun.xml.math; soffice --nologo --math '%s'; edit=soffice --nolog application/vnd.sun.xml.writer; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw application/vnd.sun.xml.writer.global; soffice --nologo --global '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Master Document"; nametemplate=%s.sxg application/vnd.sun.xml.writer.template; soffice --nologo --writer '%s'; edit=soffice --nologo --writer '%s'; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw -image/svg+xml; inkscape '%s'; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' '%s'; edit=inkscape '%s'; compose=inkscape '%s' -image/svg; inkscape '%s'; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' '%s'; edit=inkscape '%s'; compose=inkscape '%s' -image/svg+xml; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' '%s' -image/svg; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' '%s' +image/svg+xml; inkscape %s; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' %s; edit=inkscape %s; compose=inkscape %s +image/svg; inkscape %s; description="Scalable Vector Graphics"; test=test -n "$DISPLAY"; print=inkscape --print='|lp' %s; edit=inkscape %s; compose=inkscape %s +image/svg+xml; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' %s +image/svg; false; description="Scalable Vector Graphics"; test=test -z "$DISPLAY"; print=inkscape --print='|lp' %s video/mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY" video/x-mpeg; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY" video/mpeg-system; vlc %s; description="MPEG Video"; test=test -n "$DISPLAY" @@ -145,12 +145,54 @@ x-scheme-handler/telnet; ktelnetservice %s; test=test -n "$DISPLAY" x-scheme-handler/rlogin; ktelnetservice %s; test=test -n "$DISPLAY" x-scheme-handler/ssh; ktelnetservice %s; test=test -n "$DISPLAY" x-scheme-handler/apt; apturl %s; test=test -n "$DISPLAY" -x-content/software; caja-autorun-software %s; test=test -n "$DISPLAY" -inode/directory; caja --no-desktop %s; test=test -n "$DISPLAY" -application/x-mate-saved-search; caja --no-desktop %s; test=test -n "$DISPLAY" +x-content/software; /usr/bin/caja-autorun-software %s; test=test -n "$DISPLAY" +inode/directory; /usr/bin/caja --no-desktop %s; test=test -n "$DISPLAY" +application/x-mate-saved-search; /usr/bin/caja --no-desktop %s; test=test -n "$DISPLAY" image/png; drawing --edit-clipboard %s; test=test -n "$DISPLAY" image/bmp; drawing --edit-clipboard %s; test=test -n "$DISPLAY" image/jpeg; drawing --edit-clipboard %s; test=test -n "$DISPLAY" +image/avs; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/bie; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-ms-bmp; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/cmyk; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/dcx; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/eps; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/fax; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/fits; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/gif; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/gray; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/jpeg; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/pjpeg; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/miff; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/mono; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/mtv; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-portable-bitmap; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/pcd; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/pcx; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/pdf; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-portable-graymap; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/pict; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/png; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-portable-anymap; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-portable-pixmap; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/ps; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/rad; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-rgb; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/rgba; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/rla; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/rle; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/sgi; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/sun-raster; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/targa; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/tiff; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/uyvy; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/vid; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/viff; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-xbitmap; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-xpixmap; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-xwindowdump; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/x-icon; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" +image/yuv; /usr/bin/display-im6.q16 -nostdin %s; test=test -n "$DISPLAY" application/x-7z-compressed; engrampa %s; test=test -n "$DISPLAY" application/x-7z-compressed-tar; engrampa %s; test=test -n "$DISPLAY" application/x-ace; engrampa %s; test=test -n "$DISPLAY" @@ -221,28 +263,6 @@ x-scheme-handler/ftp; firefox -private-window %s; test=test -n "$DISPLAY" x-scheme-handler/chrome; firefox -private-window %s; test=test -n "$DISPLAY" video/webm; firefox -private-window %s; test=test -n "$DISPLAY" application/x-xpinstall; firefox -private-window %s; test=test -n "$DISPLAY" -application/vnd.iccprofile; /usr/bin/gcm-import %s; test=test -n "$DISPLAY" -application/pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs12+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs7-mime; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs7-mime+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs8; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs8+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkix-cert; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkix-cert+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkix-crl; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkix-crl+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-pem-file; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-pem-key; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-pkcs7-certificates; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-x509-ca-cert; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-x509-user-cert; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs10; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/pkcs10+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-spkac; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/x-spkac+base64; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" -application/vnd.debian.binary-package; gdebi-gtk %s; test=test -n "$DISPLAY" application/ogg; ghb %s; test=test -n "$DISPLAY" application/x-extension-mp4; ghb %s; test=test -n "$DISPLAY" application/x-flac; ghb %s; test=test -n "$DISPLAY" @@ -273,6 +293,28 @@ video/x-theora+ogg; ghb %s; test=test -n "$DISPLAY" x-content/video-dvd; ghb %s; test=test -n "$DISPLAY" x-content/video-vcd; ghb %s; test=test -n "$DISPLAY" x-content/video-svcd; ghb %s; test=test -n "$DISPLAY" +application/vnd.iccprofile; /usr/bin/gcm-import %s; test=test -n "$DISPLAY" +application/pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs12+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs7-mime; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs7-mime+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs8; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs8+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkix-cert; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkix-cert+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkix-crl; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkix-crl+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-pem-file; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-pem-key; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-pkcs7-certificates; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-x509-ca-cert; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-x509-user-cert; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs10; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/pkcs10+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-spkac; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/x-spkac+base64; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY" +application/vnd.debian.binary-package; gdebi-gtk %s; test=test -n "$DISPLAY" image/bmp; gimp-2.10 %s; test=test -n "$DISPLAY" image/g3fax; gimp-2.10 %s; test=test -n "$DISPLAY" image/gif; gimp-2.10 %s; test=test -n "$DISPLAY" @@ -313,15 +355,15 @@ application/x-raw-disk-image; gnome-disk-image-mounter %s; test=test -n "$DISPLA application/x-cd-image; gnome-disks --restore-disk-image %s; test=test -n "$DISPLAY" application/x-raw-disk-image; gnome-disks --restore-disk-image %s; test=test -n "$DISPLAY" application/x-raw-disk-image-xz-compressed; gnome-disks --restore-disk-image %s; test=test -n "$DISPLAY" -application/x-rpm; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/x-redhat-package-manager; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/x-deb; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/x-app-package; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/vnd.ms-cab-compressed; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/vnd.flatpak; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/vnd.flatpak.repo; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/vnd.flatpak.ref; gnome-software --local-filename=%s; test=test -n "$DISPLAY" -application/vnd.snap; gnome-software --local-filename=%s; test=test -n "$DISPLAY" +application/x-rpm; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/x-redhat-package-manager; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/x-deb; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/x-app-package; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/vnd.ms-cab-compressed; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/vnd.flatpak; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/vnd.flatpak.repo; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/vnd.flatpak.ref; gnome-software --local-filename %s; test=test -n "$DISPLAY" +application/vnd.snap; gnome-software --local-filename %s; test=test -n "$DISPLAY" x-scheme-handler/note; gnote %s; test=test -n "$DISPLAY" application/pdf; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY" application/rdf+xml; /usr/bin/google-chrome-stable --incognito %s; test=test -n "$DISPLAY" @@ -494,6 +536,8 @@ application/vnd.oasis.opendocument.text-flat-xml; libreoffice %s; test=test -n " application/vnd.oasis.opendocument.spreadsheet-flat-xml; libreoffice %s; test=test -n "$DISPLAY" application/vnd.oasis.opendocument.graphics-flat-xml; libreoffice %s; test=test -n "$DISPLAY" application/vnd.oasis.opendocument.presentation-flat-xml; libreoffice %s; test=test -n "$DISPLAY" +application/x-cd-image; mate-disk-image-mounter %s; test=test -n "$DISPLAY" +application/x-raw-disk-image; mate-disk-image-mounter %s; test=test -n "$DISPLAY" application/x-font-ttf; mate-font-viewer %s; test=test -n "$DISPLAY" application/x-font-pcf; mate-font-viewer %s; test=test -n "$DISPLAY" application/x-font-type1; mate-font-viewer %s; test=test -n "$DISPLAY" @@ -518,7 +562,6 @@ application/x-java-archive; cautious-launcher %s /usr/bin/java -jar; test=test - application/java-archive; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY" application/x-jar; cautious-launcher %s /usr/bin/java -jar; test=test -n "$DISPLAY" inode/directory; baobab %s; test=test -n "$DISPLAY" -text/calendar; gnome-calendar %s; test=test -n "$DISPLAY" image/bmp; eog %s; test=test -n "$DISPLAY" image/gif; eog %s; test=test -n "$DISPLAY" image/jpeg; eog %s; test=test -n "$DISPLAY" @@ -586,12 +629,20 @@ x-scheme-handler/webcal; evolution -c tasks %s; test=test -n "$DISPLAY" x-scheme-handler/calendar; evolution -c tasks %s; test=test -n "$DISPLAY" x-scheme-handler/task; evolution -c tasks %s; test=test -n "$DISPLAY" x-scheme-handler/memo; evolution -c tasks %s; test=test -n "$DISPLAY" +application/bzip2; file-roller %s; test=test -n "$DISPLAY" +application/gzip; file-roller %s; test=test -n "$DISPLAY" +application/vnd.android.package-archive; file-roller %s; test=test -n "$DISPLAY" +application/vnd.ms-cab-compressed; file-roller %s; test=test -n "$DISPLAY" +application/vnd.debian.binary-package; file-roller %s; test=test -n "$DISPLAY" application/x-7z-compressed; file-roller %s; test=test -n "$DISPLAY" application/x-7z-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-ace; file-roller %s; test=test -n "$DISPLAY" application/x-alz; file-roller %s; test=test -n "$DISPLAY" application/x-ar; file-roller %s; test=test -n "$DISPLAY" +application/x-archive; file-roller %s; test=test -n "$DISPLAY" application/x-arj; file-roller %s; test=test -n "$DISPLAY" +application/x-brotli; file-roller %s; test=test -n "$DISPLAY" +application/x-bzip-brotli-tar; file-roller %s; test=test -n "$DISPLAY" application/x-bzip; file-roller %s; test=test -n "$DISPLAY" application/x-bzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-bzip1; file-roller %s; test=test -n "$DISPLAY" @@ -601,6 +652,7 @@ application/x-cd-image; file-roller %s; test=test -n "$DISPLAY" application/x-compress; file-roller %s; test=test -n "$DISPLAY" application/x-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-cpio; file-roller %s; test=test -n "$DISPLAY" +application/x-chrome-extension; file-roller %s; test=test -n "$DISPLAY" application/x-deb; file-roller %s; test=test -n "$DISPLAY" application/x-ear; file-roller %s; test=test -n "$DISPLAY" application/x-ms-dos-executable; file-roller %s; test=test -n "$DISPLAY" @@ -619,7 +671,6 @@ application/x-lzma; file-roller %s; test=test -n "$DISPLAY" application/x-lzma-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-lzop; file-roller %s; test=test -n "$DISPLAY" application/x-lz4-compressed-tar; file-roller %s; test=test -n "$DISPLAY" -application/x-lzop-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-ms-wim; file-roller %s; test=test -n "$DISPLAY" application/x-rar; file-roller %s; test=test -n "$DISPLAY" application/x-rar-compressed; file-roller %s; test=test -n "$DISPLAY" @@ -629,30 +680,38 @@ application/x-rzip; file-roller %s; test=test -n "$DISPLAY" application/x-rzip-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-tar; file-roller %s; test=test -n "$DISPLAY" application/x-tarz; file-roller %s; test=test -n "$DISPLAY" +application/x-tzo; file-roller %s; test=test -n "$DISPLAY" application/x-stuffit; file-roller %s; test=test -n "$DISPLAY" application/x-war; file-roller %s; test=test -n "$DISPLAY" +application/x-xar; file-roller %s; test=test -n "$DISPLAY" application/x-xz; file-roller %s; test=test -n "$DISPLAY" application/x-xz-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-zip; file-roller %s; test=test -n "$DISPLAY" application/x-zip-compressed; file-roller %s; test=test -n "$DISPLAY" +application/x-zstd-compressed-tar; file-roller %s; test=test -n "$DISPLAY" application/x-zoo; file-roller %s; test=test -n "$DISPLAY" application/zip; file-roller %s; test=test -n "$DISPLAY" -application/x-archive; file-roller %s; test=test -n "$DISPLAY" -application/vnd.ms-cab-compressed; file-roller %s; test=test -n "$DISPLAY" -application/vnd.debian.binary-package; file-roller %s; test=test -n "$DISPLAY" -application/gzip; file-roller %s; test=test -n "$DISPLAY" +application/zstd; file-roller %s; test=test -n "$DISPLAY" application/x-font-ttf; gnome-font-viewer %s; test=test -n "$DISPLAY" application/x-font-pcf; gnome-font-viewer %s; test=test -n "$DISPLAY" application/x-font-type1; gnome-font-viewer %s; test=test -n "$DISPLAY" application/x-font-otf; gnome-font-viewer %s; test=test -n "$DISPLAY" font/ttf; gnome-font-viewer %s; test=test -n "$DISPLAY" font/otf; gnome-font-viewer %s; test=test -n "$DISPLAY" +font/ttf; font-manager %s; test=test -n "$DISPLAY" +font/ttc; font-manager %s; test=test -n "$DISPLAY" +font/otf; font-manager %s; test=test -n "$DISPLAY" +font/type1; font-manager %s; test=test -n "$DISPLAY" application/x-font-ttf; font-manager %s; test=test -n "$DISPLAY" application/x-font-type1; font-manager %s; test=test -n "$DISPLAY" application/x-font-otf; font-manager %s; test=test -n "$DISPLAY" -application/x-font-ttf; /usr/lib/x86_64-linux-gnu/font-manager/font-viewer %s; test=test -n "$DISPLAY" -application/x-font-type1; /usr/lib/x86_64-linux-gnu/font-manager/font-viewer %s; test=test -n "$DISPLAY" -application/x-font-otf; /usr/lib/x86_64-linux-gnu/font-manager/font-viewer %s; test=test -n "$DISPLAY" +font/ttf; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" +font/ttc; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" +font/otf; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" +font/type1; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" +application/x-font-ttf; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" +application/x-font-type1; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" +application/x-font-otf; /usr/libexec/font-manager/font-viewer %s; test=test -n "$DISPLAY" text/plain; gedit --new-document %s; test=test -n "$DISPLAY" application/vnd.geo+json; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY" x-scheme-handler/geo; gapplication launch org.gnome.Maps %s; test=test -n "$DISPLAY" @@ -1098,6 +1157,7 @@ application/x-cbz; xreader %s; test=test -n "$DISPLAY" application/x-cb7; xreader %s; test=test -n "$DISPLAY" application/x-cbt; xreader %s; test=test -n "$DISPLAY" application/vnd.comicbook+zip; xreader %s; test=test -n "$DISPLAY" +application/vnd.comicbook-rar; xreader %s; test=test -n "$DISPLAY" application/oxps; xreader %s; test=test -n "$DISPLAY" application/vnd.ms-xpsdocument; xreader %s; test=test -n "$DISPLAY" application/epub+zip; xreader %s; test=test -n "$DISPLAY" diff --git a/manpath.config b/manpath.config index 722a52d..7c2792e 100644 --- a/manpath.config +++ b/manpath.config @@ -69,6 +69,7 @@ MANDB_MAP /usr/local/man /var/cache/man/oldlocal MANDB_MAP /usr/local/share/man /var/cache/man/local MANDB_MAP /usr/X11R6/man /var/cache/man/X11R6 MANDB_MAP /opt/man /var/cache/man/opt +MANDB_MAP /snap/man /var/cache/man/snap # #--------------------------------------------------------- # Program definitions. These are commented out by default as the value diff --git a/mono/2.0/Browsers/Compat.browser b/mono/2.0/Browsers/Compat.browser index dcedf7f..9950c71 100644 --- a/mono/2.0/Browsers/Compat.browser +++ b/mono/2.0/Browsers/Compat.browser @@ -1,5 +1,5 @@ - - - + is provide browser definitions that might be referenced in App_Browser/*.browser files. +--> + + - - + + - - - + + + - - - + + + - - - + + + - - + + \ No newline at end of file diff --git a/mono/2.0/machine.config b/mono/2.0/machine.config index 9da7be9..2577c81 100644 --- a/mono/2.0/machine.config +++ b/mono/2.0/machine.config @@ -116,11 +116,8 @@ - + - - - diff --git a/mono/4.0/Browsers/Compat.browser b/mono/4.0/Browsers/Compat.browser index dcedf7f..9950c71 100644 --- a/mono/4.0/Browsers/Compat.browser +++ b/mono/4.0/Browsers/Compat.browser @@ -1,5 +1,5 @@ - - - + is provide browser definitions that might be referenced in App_Browser/*.browser files. +--> + + - - + + - - - + + + - - - + + + - - - + + + - - + + \ No newline at end of file diff --git a/mono/4.0/machine.config b/mono/4.0/machine.config index 12839c1..f3b71c4 100644 --- a/mono/4.0/machine.config +++ b/mono/4.0/machine.config @@ -133,11 +133,8 @@ - + - - - diff --git a/mono/4.5/Browsers/Compat.browser b/mono/4.5/Browsers/Compat.browser index dcedf7f..9950c71 100644 --- a/mono/4.5/Browsers/Compat.browser +++ b/mono/4.5/Browsers/Compat.browser @@ -1,5 +1,5 @@ - - - + is provide browser definitions that might be referenced in App_Browser/*.browser files. +--> + + - - + + - - - + + + - - - + + + - - - + + + - - + + \ No newline at end of file diff --git a/mono/4.5/machine.config b/mono/4.5/machine.config index 5faa6b4..4557095 100644 --- a/mono/4.5/machine.config +++ b/mono/4.5/machine.config @@ -11,11 +11,11 @@
-
+
@@ -136,11 +136,8 @@ - + - - - diff --git a/mono/config b/mono/config index a5c7495..9ce704c 100644 --- a/mono/config +++ b/mono/config @@ -6,19 +6,29 @@ - + + + + + + + + + + + diff --git a/mysql/debian-start b/mysql/debian-start index 40c248f..7de59ce 100755 --- a/mysql/debian-start +++ b/mysql/debian-start @@ -15,7 +15,8 @@ fi MYSQL="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf" MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf" -MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf" +# Don't run full mysql_upgrade on every server restart, use --version-check to do it only once +MYUPGRADE="/usr/bin/mysql_upgrade --defaults-extra-file=/etc/mysql/debian.cnf --version-check" MYCHECK="/usr/bin/mysqlcheck --defaults-file=/etc/mysql/debian.cnf" MYCHECK_SUBJECT="WARNING: mysqlcheck has found corrupt tables" MYCHECK_PARAMS="--all-databases --fast --silent" diff --git a/mysql/mariadb.conf.d/50-server.cnf b/mysql/mariadb.conf.d/50-server.cnf index ee30148..e7e88ef 100644 --- a/mysql/mariadb.conf.d/50-server.cnf +++ b/mysql/mariadb.conf.d/50-server.cnf @@ -2,8 +2,7 @@ # These groups are read by MariaDB server. # Use it for options that only the server (but not clients) should see # -# See the examples of server my.cnf files in /usr/share/mysql/ -# +# See the examples of server my.cnf files in /usr/share/mysql # this is read by the standalone daemon and embedded servers [server] @@ -14,30 +13,30 @@ # # * Basic Settings # -user = mysql -pid-file = /var/run/mysqld/mysqld.pid -socket = /var/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /var/lib/mysql -tmpdir = /tmp -lc-messages-dir = /usr/share/mysql -skip-external-locking +user = mysql +pid-file = /run/mysqld/mysqld.pid +socket = /run/mysqld/mysqld.sock +#port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +#skip-external-locking # Instead of skip-networking the default is now to listen only on # localhost which is more compatible and is not less secure. -bind-address = 127.0.0.1 +bind-address = 127.0.0.1 # # * Fine Tuning # -key_buffer_size = 16M -max_allowed_packet = 16M -thread_stack = 192K -thread_cache_size = 8 +#key_buffer_size = 16M +#max_allowed_packet = 16M +#thread_stack = 192K +#thread_cache_size = 8 # This replaces the startup script and checks MyISAM tables if needed # the first time they are touched -myisam_recover_options = BACKUP +#myisam_recover_options = BACKUP #max_connections = 100 #table_cache = 64 #thread_concurrency = 10 @@ -45,7 +44,7 @@ myisam_recover_options = BACKUP # # * Query Cache Configuration # -query_cache_limit = 1M +#query_cache_limit = 1M query_cache_size = 16M # @@ -54,53 +53,47 @@ query_cache_size = 16M # Both location gets rotated by the cronjob. # Be aware that this log type is a performance killer. # As of 5.1 you can enable the log at runtime! -#general_log_file = /var/log/mysql/mysql.log -#general_log = 1 +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 # # Error log - should be very few entries. # log_error = /var/log/mysql/error.log # # Enable the slow query log to see queries with especially long duration -#slow_query_log_file = /var/log/mysql/mariadb-slow.log -#long_query_time = 10 -#log_slow_rate_limit = 1000 -#log_slow_verbosity = query_plan +#slow_query_log_file = /var/log/mysql/mariadb-slow.log +#long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan #log-queries-not-using-indexes # # The following can be used as easy to replay backup logs or for replication. # note: if you are setting up a replication slave, see README.Debian about # other settings you may need to change. -#server-id = 1 -#log_bin = /var/log/mysql/mysql-bin.log -expire_logs_days = 10 -max_binlog_size = 100M -#binlog_do_db = include_database_name -#binlog_ignore_db = exclude_database_name - -# -# * InnoDB -# -# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. -# Read the manual for more InnoDB related options. There are many! +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 10 +#max_binlog_size = 100M +#binlog_do_db = include_database_name +#binlog_ignore_db = exclude_database_name # # * Security Features # # Read the manual, too, if you want chroot! -# chroot = /var/lib/mysql/ +#chroot = /var/lib/mysql/ # # For generating SSL certificates you can use for example the GUI tool "tinyca". # -# ssl-ca=/etc/mysql/cacert.pem -# ssl-cert=/etc/mysql/server-cert.pem -# ssl-key=/etc/mysql/server-key.pem +#ssl-ca = /etc/mysql/cacert.pem +#ssl-cert = /etc/mysql/server-cert.pem +#ssl-key = /etc/mysql/server-key.pem # # Accept only connections using the latest and most secure TLS protocol version. # ..when MariaDB is compiled with OpenSSL: -# ssl-cipher=TLSv1.2 +#ssl-cipher = TLSv1.2 # ..when MariaDB is compiled with YaSSL (default in Debian): -# ssl=on +#ssl = on # # * Character sets @@ -111,6 +104,12 @@ max_binlog_size = 100M character-set-server = utf8mb4 collation-server = utf8mb4_general_ci +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! + # # * Unix socket authentication plugin is built-in since 10.0.22-6 # @@ -128,7 +127,7 @@ collation-server = utf8mb4_general_ci # you can put MariaDB-only options here [mariadb] -# This group is only read by MariaDB-10.1 servers. +# This group is only read by MariaDB-10.3 servers. # If you use the same .cnf file for MariaDB of different versions, # use this group for options that older servers don't understand -[mariadb-10.1] +[mariadb-10.3] diff --git a/nanorc b/nanorc index d343618..9104c9b 100644 --- a/nanorc +++ b/nanorc @@ -1,25 +1,27 @@ ## Sample initialization file for GNU nano. ## -## Please note that you must have configured nano with --enable-nanorc -## for this file to be read! Also note that this file should not be in -## DOS or Mac format, and that characters specially interpreted by the -## shell should not be escaped here. +## This file should not be in DOS or Mac format, and characters +## specially interpreted by the shell should not be escaped here. ## ## To make sure an option is disabled, use "unset