Include contact information in author and maintainer meta data

instead of having it split up in author-name and author-email /
maintainer-name and maintainer-email. The contact information is
enclosed in < > so can be easily extracted if desired. In case there
was both a author-email and a author-url field, author-email was used
as contact information and the author-url info was discarded.

tables/ar-ar-comp8.utb

@@ -25,8 +25,7 @@
 
 #-index-name: Arabic, computer
 #-display-name: Arabic computer braille
-#-author-name: Ikrami Ahmad
-#-author-email: [email protected]
+#-author: Ikrami Ahmad <[email protected]>
 # with assistance from Hatoon Felemban <[email protected]>
 
 #+language: ar

tables/ar-ar-g2.ctb

@@ -32,8 +32,7 @@
 # Marked as "direction:both" by Bue Vester-Andersen
 # as tests run both forward and backward
 #+direction: both
-#-author-name: Ikrami Ahmad
-#-author-email: [email protected]
+#-author: Ikrami Ahmad <[email protected]>
 
 include ar-ar-g1-core.uti
 

tables/bel-comp.utb

@@ -27,7 +27,7 @@
 # This is the Belarusian computer braille table.
 # It is based on the Russian computer braille.
 
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # As the definition of the grave accent sign in the Russian computer Braille conflicts with the Belarusian letter Ў, this definition should be changed.
 

tables/bel.utb

@@ -27,7 +27,7 @@
 #
 # Based on the Russian braille.
 
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # The Belarusian alphabet has 2 letters that are not in the Russian
 # alphabet, namely І and Ў. Like in ru-litbrl.ctb, the

tables/cop-eg-comp8.utb

@@ -21,8 +21,7 @@
 
 #-index-name: Coptic, computer 
 #-display-name: Coptic computer braille
-#-author-name: Ibraam Nasif 
-#-author-email: [email protected]
+#-author: Ibraam Nasif <[email protected]>
 
 #+language: cop
 #+type: computer

tables/el.ctb

@@ -18,9 +18,7 @@
 #-copyright: 2017, Dave Mielke
 #-license: LGPLv2.1
 #
-#-author-name: Dave Mielke
-#-author-email: [email protected]
-#-author-url: http://mielke.cc/
+#-author: Dave Mielke <[email protected]>
 # -----------
 #
 # Copyright (C) 2017 Dave Mielke: <[email protected]>, [http://mielke.cc/]

tables/gurumuki.cti

@@ -1,10 +1,8 @@
 # This table contains braille codes and rules for Gurumukhi script.
 
-#-author-name: Dipendra Manocha
-#-author-email: [email protected]
-#-author-name: Jake Kyle
-#-maintainer-name: Dipendra Manocha
-#-maintainer-email: [email protected]
+#-author: Dipendra Manocha <[email protected]>
+#-author: Jake Kyle
+#-maintainer: Dipendra Manocha <[email protected]>
 #-updated: 2022-05-23
 
 # Copyright (C) 2014,2022 National Institute for Visually Handicapped, 116, Rajpur Road, Dehradun, Uttrakhand, India

tables/he-IL-comp8.utb

@@ -31,12 +31,9 @@
 #  <http://www.gnu.org/licenses/>.
 #
 #-license: LGPLv2.1
-#-author-name: Adi Kushnir
-#-author-email: [email protected]
-#-author-name: Pavel Kaplan
-#-author-email: [email protected]
-#-author-name: Erez Kugler
-#-author-email: [email protected]
+#-author: Adi Kushnir <[email protected]>
+#-author: Pavel Kaplan <[email protected]>
+#-author: Erez Kugler <[email protected]>
 #
 #
 # This table is the official Hebrew computer Braille table for Israel,

tables/he-IL.utb

@@ -38,10 +38,8 @@
 # assistance of BAUM Engineering.
 
 #-license: LGPLv2.1
-#-author-name: BAUM Engineering
-#-author-email: [email protected]
-#-author-name: Erez Kugler
-#-author-email: [email protected]
+#-author: BAUM Engineering <[email protected]>
+#-author: Erez Kugler <[email protected]>
 
 # The 4 most used languages in Israel are Hebrew, Arabic, Russian and
 # English. This table supports 3 of them: Hebrew, Arabic and

tables/ja-kantenji.utb

@@ -12,9 +12,8 @@
 
 #-copyright: 2021, Kensaku Y.
 #-license: LGPLv2.1
-#-author-name: Kensaku Y.
-#-maintainer-name: Kensaku Y.
-#-maintainer-email: [email protected]
+#-author: Kensaku Y. <[email protected]>
+#-maintainer: Kensaku Y. <[email protected]>
 
 # Copyright (C) 2021, Kensaku Y.
 # Created by Kensaku Y. <[email protected]>

tables/kk.utb

@@ -27,7 +27,7 @@
 #
 # Based on the Russian braille.
 
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # The Kazakh alphabet has 9 letters that are not in the Russian
 # alphabet, namely Ә, Ғ, Қ, Ң, Ө, Ұ, Ү, Һ and І. Like in ru-litbrl.ctb, the

tables/km-g1.utb

@@ -34,8 +34,7 @@
 # with help from Khemara Ly from Myanmar
 #
 #-author: Dang Hoai Phúc <[email protected]>
-#-maintainer-name: Dang Hoai Phuc
-#-maintainer-email: [email protected]
+#-maintainer: Dang Hoai Phuc <[email protected]>
 #
 #-updated: 2020-11-17
 #

tables/kmr.tbl

@@ -11,9 +11,8 @@
 #+grade:0
 
 # This table was created by Imam Kahraman <[email protected]>
-#-author-name: Imam Kahraman
-#-maintainer-name: Imam Kahraman
-#-maintainer-email: [email protected]
+#-author: Imam Kahraman <[email protected]>
+#-maintainer: Imam Kahraman <[email protected]>
 
 #-copyright: 2021, Imam Kahraman
 #-license: LGPLv2.1

tables/my-g1.utb

@@ -33,8 +33,7 @@
 # Created and maintained by: Dang Hoai Phuc <[email protected]>
 # with help from Benedict and Pyae Phyopaing from Myanmar
 #
-#-maintainer-name: Dang Hoai Phuc
-#-maintainer-email: [email protected]
+#-maintainer: Dang Hoai Phuc <[email protected]>
 #-author: Dang Hoai Phúc <[email protected]>
 #
 #-updated: 2020-11-17

tables/my-g2.ctb

@@ -34,8 +34,7 @@
 # with help from Benedict and Pyae Phyopaing from Myanmar
 #
 #-author: Dang Hoai Phúc <[email protected]>
-#-maintainer-name: Dang Hoai Phuc
-#-maintainer-email: [email protected]
+#-maintainer: Dang Hoai Phuc <[email protected]>
 #
 #-updated: 2020-11-17
 #

tables/no-no-8dot-fallback-6dot-g0.utb

@@ -23,13 +23,8 @@
 #
 # Created August 2015 by Jostein Austvik Jacobsen <[email protected]> and Ammar Usama <[email protected]>
 #
-#-author-name: Jostein Austvik Jacobsen
-#-author-email: [email protected]
-#-author-url: https://github.com/josteinaj
-#
-#-author-name: Ammar Usama
-#-author-email: [email protected]
-#-author-url: https://github.com/usama49
+#-author: Jostein Austvik Jacobsen <[email protected]>
+#-author: Ammar Usama <[email protected]>
 #
 # Official norwegian braille specifications are collected here:
 # http://liblouis.org/braille-specs/norwegian

tables/no-no-8dot.utb

@@ -17,13 +17,8 @@
 #
 # Created August 2015 by Jostein Austvik Jacobsen <[email protected]> and Ammar Usama <[email protected]>
 #
-#-author-name: Jostein Austvik Jacobsen
-#-author-email: [email protected]
-#-author-url: https://github.com/josteinaj
-#
-#-author-name: Ammar Usama
-#-author-email: [email protected]
-#-author-url: https://github.com/usama49
+#-author: Jostein Austvik Jacobsen <[email protected]>
+#-author: Ammar Usama <[email protected]>
 #
 # Official norwegian braille specifications are collected here:
 # http://liblouis.org/braille-specs/norwegian

tables/no-no-chardefs6.uti

@@ -15,21 +15,10 @@
 # Updated June 2009 by Lars Bjørndal <[email protected]>
 # Updated April 2015 by Jostein Austvik Jacobsen <[email protected]> and Ammar Usama <[email protected]>
 #
-#-author-name: Leon Ungier
-#-author-email: [email protected]
-#-author-url: www.viewplus.com
-#
-#-author-name: Lars Bjørndal
-#-author-email: [email protected]
-#-author-url: https://github.com/larsbjorndal
-#
-#-author-name: Jostein Austvik Jacobsen
-#-author-email: [email protected]
-#-author-url: https://github.com/josteinaj
-#
-#-author-name: Ammar Usama
-#-author-email: [email protected]
-#-author-url: https://github.com/usama49
+#-author: Leon Ungier <[email protected]>
+#-author: Lars Bjørndal <[email protected]>
+#-author: Jostein Austvik Jacobsen <[email protected]>
+#-author: Ammar Usama <[email protected]>
 #
 #  This file is part of liblouis.
 #

tables/no-no-comp8.ctb

@@ -27,13 +27,8 @@
 #
 # Updated August 2015 by Jostein Austvik Jacobsen <[email protected]> and Ammar Usama <[email protected]>
 #
-#-author-name: Jostein Austvik Jacobsen
-#-author-email: [email protected]
-#-author-url: https://github.com/josteinaj
-#
-#-author-name: Ammar Usama
-#-author-email: [email protected]
-#-author-url: https://github.com/usama49
+#-author: Jostein Austvik Jacobsen <[email protected]>
+#-author: Ammar Usama <[email protected]>
 #
 # Based on the braille contraction modules in BRLTTY
 #

tables/no-no-g0.utb

@@ -27,21 +27,10 @@
 # Updated June 2009 by Lars Bjørndal <[email protected]>
 # Updated April 2015 by Jostein Austvik Jacobsen <[email protected]> and Ammar Usama <[email protected]>
 #
-#-author-name: Leon Ungier
-#-author-email: [email protected]
-#-author-url: www.viewplus.com
-#
-#-author-name: Lars Bjørndal
-#-author-email: [email protected]
-#-author-url: https://github.com/larsbjorndal
-#
-#-author-name: Jostein Austvik Jacobsen
-#-author-email: [email protected]
-#-author-url: https://github.com/josteinaj
-#
-#-author-name: Ammar Usama
-#-author-email: [email protected]
-#-author-url: https://github.com/usama49
+#-author: Leon Ungier <[email protected]>
+#-author: Lars Bjørndal <[email protected]>
+#-author: Jostein Austvik Jacobsen <[email protected]>
+#-author: Ammar Usama <[email protected]>
 #
 # Official norwegian braille specifications are collected here:
 # http://liblouis.org/braille-specs/norwegian

tables/no-no-g1.ctb

@@ -25,13 +25,8 @@
 # Modified Sep 30, 2005 by LU
 # Heavily overworked by [email protected], 2009.
 #
-#-author-name: Leon Ungier
-#-author-email: [email protected]
-#-author-url: www.viewplus.com
-#
-#-author-name: Lars Bjørndal
-#-author-email: [email protected]
-#-author-url: https://github.com/larsbjorndal
+#-author: Leon Ungier <[email protected]>
+#-author: Lars Bjørndal <[email protected]>
 #
 # Official norwegian braille specifications are collected here:
 # http://liblouis.org/braille-specs/norwegian

tables/no-no-g2.ctb

@@ -25,13 +25,8 @@
 # Modified Sep 30, 2005 by LU
 # Heavily overworked by [email protected], 2009.
 #
-#-author-name: Leon Ungier
-#-author-email: [email protected]
-#-author-url: www.viewplus.com
-#
-#-author-name: Lars Bjørndal
-#-author-email: [email protected]
-#-author-url: https://github.com/larsbjorndal
+#-author: Leon Ungier <[email protected]>
+#-author: Lars Bjørndal <[email protected]>
 #
 # Official norwegian braille specifications are collected here:
 # http://liblouis.org/braille-specs/norwegian

tables/no-no-g3.ctb

@@ -26,13 +26,8 @@
 # Modified October 25, 2005
 # Last modified July 2012, by [email protected]
 #
-#-author-name: Leon Ungier
-#-author-email: [email protected]
-#-author-url: www.viewplus.com
-#
-#-author-name: Lars Bjørndal
-#-author-email: [email protected]
-#-author-url: https://github.com/larsbjorndal
+#-author: Leon Ungier <[email protected]>
+#-author: Lars Bjørndal <[email protected]>
 #
 # Official norwegian braille specifications are collected here:
 # http://liblouis.org/braille-specs/norwegian

tables/ru.ctb

@@ -62,7 +62,7 @@
 
 # Comments from Russians are very welcome.
 
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # General
 space \s 0		SPACE

tables/sah.utb

@@ -25,7 +25,7 @@
 #  License along with liblouis. If not, see
 #  <http://www.gnu.org/licenses/>.
 #
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # The Yakut braille code was created by Ivan Gorny (the real name is
 # Ivan Nikolaevich Egorov) and accepted in 1992. It was described in

tables/sot-za-g1.ctb

@@ -58,9 +58,8 @@
 #+direction: both
 
 # This table is Maintained by Christo de Klerk <[email protected]>
-#-author-name: Christo de Klerk
-#-maintainer-name: Christo de Klerk
-#-maintainer-email: [email protected]
+#-author: Christo de Klerk <[email protected]>
+#-maintainer: Christo de Klerk <[email protected]>
 
 # Apart from the addition of the letter š the grade 1 system is
 # identical to UEB.

tables/sot-za-g2.ctb

@@ -60,9 +60,8 @@
 #+direction: both
 
 # This table is maintained by Christo de Klerk <[email protected]>
-#-author-name: Christo de Klerk
-#-maintainer-name: Christo de Klerk
-#-maintainer-email: [email protected]
+#-author: Christo de Klerk <[email protected]>
+#-maintainer: Christo de Klerk <[email protected]>
 
 # Begin entries
 

tables/tt.utb

@@ -25,7 +25,7 @@
 #  License along with liblouis. If not, see
 #  <http://www.gnu.org/licenses/>.
 #
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # The Tatar braille code was created by Sharif Kalimullovich Enikeev
 # and accepted in 1939. It was described in "Braille codes of the

tables/uk-comp.utb

@@ -28,7 +28,7 @@
 # This is the Ukrainian computer braille table.
 # It is based on the Russian computer braille.
 
-#-maintainer-name: Andrey Yakuboy
+#-maintainer: Andrey Yakuboy
 
 # As some Russian punctuation definitions conflict with Ukrainian letters, these definitions should be changed.
 

tables/uk.utb

@@ -36,8 +36,7 @@
 
 # Maintained by Sergiy Moskalets.
 
-#-maintainer-name: Sergiy Moskalets
-#-maintainer-url: www.trosti.com.ua
+#-maintainer: Sergiy Moskalets <www.trosti.com.ua>
 
 # -----------------
 

tables/uz-g1.utb

@@ -28,8 +28,7 @@
 #+direction:forward
 
 #-license: LGPLv2.1
-#-author-name: BAUM Engineering
-#-author-email: [email protected]
+#-author: BAUM Engineering <[email protected]>
 
 include ru-unicode.dis