Revert 051de65db and implement alternative fix for remainder of #11115.

[lyx.git] / lib / generate_contributions.py

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 822e023c1c31c9c6b777e6888e7cb965cfb7d91b..617c26d91eec8e10ffb999ba161028780a0b4535 100755 (executable)
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3

 # -*- coding: utf-8 -*-
 
 '''
 # -*- coding: utf-8 -*-
 
 '''


@@ -53,7 +53,7 @@ class contributor:
      def as_txt_credits(self):
           result = [ '@b%s\n' % self.name ]
           if len(self.contact) != 0:
      def as_txt_credits(self):
           result = [ '@b%s\n' % self.name ]
           if len(self.contact) != 0:

-               if self.contact.find("http") != -1:
+               if self.contact.find("https") != -1:

                     result.append('@i%s\n' % self.contact)
                else:
                     result.append('@iE-mail: %s\n' % self.contact)
                     result.append('@i%s\n' % self.contact)
                else:
                     result.append('@iE-mail: %s\n' % self.contact)


@@ -163,7 +163,7 @@ $email = str_replace(' () ', '@', $email);
 $email = str_replace(' ! ', '.', $email);
 
 if (isset($email) && $email != "") {
 $email = str_replace(' ! ', '.', $email);
 
 if (isset($email) && $email != "") {

-        if (strncasecmp($email,"http",4) == 0)
+        if (strncasecmp($email,"https",4) == 0)

             $output =$output. "<dt><b>[[${email} | ${name}]]</b>";
          else
             $output=$output. "<dt><b>[[mailto:${email} | ${name}]]</b>";
             $output =$output. "<dt><b>[[${email} | ${name}]]</b>";
          else
             $output=$output. "<dt><b>[[mailto:${email} | ${name}]]</b>";


@@ -234,7 +234,7 @@ $output=$output. "
 
 if (isset($msg_ref) && $msg_ref != "") {
         $msg_ref = htmlspecialchars("$msg_ref");
 
 if (isset($msg_ref) && $msg_ref != "") {
         $msg_ref = htmlspecialchars("$msg_ref");

-        $output=$output. "[[http://marc.info/?l=lyx-devel&amp;" . ${msg_ref} . "|" . ${msg_title} . "]]";
+        $output=$output. "[[https://marc.info/?l=lyx-devel&amp;" . ${msg_ref} . "|" . ${msg_title} . "]]";

 } else {
         $output=$output. "${msg_title}";
 }
 } else {
         $output=$output. "${msg_title}";
 }


@@ -251,7 +251,7 @@ function blanket_output() {
 $output=$output."<p>
      The following people hereby grant permission to license their
      contributions to LyX under the
 $output=$output."<p>
      The following people hereby grant permission to license their
      contributions to LyX under the

-     [[http://www.opensource.org/licenses/gpl-license.php |
+     [[https://opensource.org/licenses/gpl-license |

      Gnu General Public License]], version 2 or later.
 </p>
 
      Gnu General Public License]], version 2 or later.
 </p>
 


@@ -269,7 +269,7 @@ $output=$output."
 <p>
      The following people hereby grant permission to license their
      contributions to LyX under the
 <p>
      The following people hereby grant permission to license their
      contributions to LyX under the

-     [[http://www.opensource.org/licenses/artistic-license-2.0.php |
+     [[https://opensource.org/licenses/Artistic-2.0 |

      Artistic License 2]].
 </p>
 
      Artistic License 2]].
 </p>
 


@@ -296,20 +296,32 @@ def main(argv, contributors):
      if len(argv) != 4:
           error(usage(argv[0]))
 
      if len(argv) != 4:
           error(usage(argv[0]))
 

-     txt_credits_data = unicode(as_txt_credits(contributors)).encode("utf-8")
-     txt_credits = open(argv[1], "w")
+     if sys.version_info[0] < 3:
+         txt_credits_data = unicode(as_txt_credits(contributors)).encode("utf-8")
+     else:
+         txt_credits_data = str(as_txt_credits(contributors)).encode("utf-8")
+     txt_credits = open(argv[1], "wb")

      txt_credits.write(txt_credits_data)
 
      txt_credits.write(txt_credits_data)
 

-     php_credits_data = unicode(as_php_credits(contributors, argv[2])).encode("utf-8")
-     php_credits = open(argv[2], "w")
+     if sys.version_info[0] < 3:
+         php_credits_data = unicode(as_php_credits(contributors, argv[2])).encode("utf-8")
+     else:
+         php_credits_data = str(as_php_credits(contributors, argv[2])).encode("utf-8")
+     php_credits = open(argv[2], "wb")

      php_credits.write(php_credits_data)
 
      php_credits.write(php_credits_data)
 

-     php_blanket_data = unicode(as_php_blanket(contributors, argv[3])).encode("utf-8")
-     php_blanket = open(argv[3], "w")
+     if sys.version_info[0] < 3:
+         php_blanket_data = unicode(as_php_blanket(contributors, argv[3])).encode("utf-8")
+     else:
+         php_blanket_data = str(as_php_blanket(contributors, argv[3])).encode("utf-8")
+     php_blanket = open(argv[3], "wb")

      php_blanket.write(php_blanket_data)
 
      php_blanket.write(php_blanket_data)
 

-     warning_data =  unicode(collate_incomplete(contributors) + '\n').encode("utf-8")
-     sys.stderr.write(warning_data)
+     if sys.version_info[0] < 3:
+         warning_data =  unicode(collate_incomplete(contributors) + '\n').encode("utf-8")
+     else:
+         warning_data =  str(collate_incomplete(contributors) + '\n').encode("utf-8")
+     sys.stderr.write(warning_data.decode('utf-8'))

 
 
 # Store the raw data.
 
 
 # Store the raw data.


@@ -457,7 +469,7 @@ contributors = [
                  "The LyX licence",
                  "m=123100818303101",
                  "3 January 2009",
                  "The LyX licence",
                  "m=123100818303101",
                  "3 January 2009",

-                 u"small bugfixes, CMake build system, Slovak translation"),
+                 u"CMake build system, Slovak translation, Advanced search with format"),

 
      contributor(u"Jacob Bishop",
                  "bishop.jacob () gmail ! com",
 
      contributor(u"Jacob Bishop",
                  "bishop.jacob () gmail ! com",


@@ -499,6 +511,14 @@ contributors = [
                  "24 February 2005",
                  u"A (pseudo) threaded graphics loader queue, lots of fixes, etc."),
 
                  "24 February 2005",
                  u"A (pseudo) threaded graphics loader queue, lots of fixes, etc."),
 

+     contributor(u"Martin A. Brown",
+                 "martin () linux-ip ! net",
+                 "GPL",
+                 "Re: public identifier for DocBook XML export",
+                 "m=148391461928571",
+                 "8 January 2017",
+                 u"Docbook fixes"),
+

      contributor(u"Christian Buescher",
                  "christian.buescher () uni-bielefeld ! de",
                  "",
      contributor(u"Christian Buescher",
                  "christian.buescher () uni-bielefeld ! de",
                  "",


@@ -627,6 +647,14 @@ contributors = [
                  "27 April 2014",
                  u"Chinese (simplified) translations"),
 
                  "27 April 2014",
                  u"Chinese (simplified) translations"),
 

+     contributor(u"Alexander Dunlap",
+                 "alexander.dunlap () gmail ! com",
+                 "GPL",
+                 "licensing statement",
+                 "m=151914230920804",
+                 "20 February 2018",
+                 u"Improvement to recent files support"),
+

      contributor(u"Anders Ekberg",
                  "anek () chalmers ! se",
                  "GPL",
      contributor(u"Anders Ekberg",
                  "anek () chalmers ! se",
                  "GPL",


@@ -715,6 +743,14 @@ contributors = [
                  "16 June 2005",
                  u"Italian translations, many bug fixes and features"),
 
                  "16 June 2005",
                  u"Italian translations, many bug fixes and features"),
 

+     contributor(u"Gilbert J. M. Forkel",
+                 "gilbert () erlangen ! ccc ! de",
+                 "GPL",
+                 "GPL",
+                 "m=153286983821872",
+                 "29 July 2018",
+                 u"Bug fixes"),
+

      contributor(u"Eitan Frachtenberg",
                  "sky8an () gmail ! com",
                  "GPL",
      contributor(u"Eitan Frachtenberg",
                  "sky8an () gmail ! com",
                  "GPL",


@@ -779,6 +815,14 @@ contributors = [
                  "25 April 2016",
                  u"Mingw-w64 build fixes"),
 
                  "25 April 2016",
                  u"Mingw-w64 build fixes"),
 

+     contributor(u"D. Gloger",
+                 "2wochenurlaub () gloger ! biz",
+                 "GPL",
+                 "Re: external material template: SVG -> PDF/PS with LaTeX",
+                 "m=151298047124676",
+                 "11 December 2017",
+                 u"Inkscape External Template"),
+

      contributor(u"Hartmut Goebel",
                  "h.goebel () crazy-compilers ! com",
                  "GPL",
      contributor(u"Hartmut Goebel",
                  "h.goebel () crazy-compilers ! com",
                  "GPL",


@@ -835,8 +879,16 @@ contributors = [
                  "9 June 2015",
                  u"Haiku OS support"),
 
                  "9 June 2015",
                  u"Haiku OS support"),
 

-     contributor(u"Richard Heck",
-                 "rgheck () comcast ! net",
+     contributor(u"Jan Niklas Hasse",
+                 "jhasse () bixense ! com",
+                 "GPL",
+                 "Re: Patch to make it possible to open empty files",
+                 "m=148163124122780",
+                 "23 December 2016",
+                 u"File opening enhancement"),
+
+     contributor(u"Richard Kimberly Heck",
+                 "rikiheck () lyx ! org",

                  "GPL",
                  "GPL Statement",
                  "m=117501689204059",
                  "GPL",
                  "GPL Statement",
                  "m=117501689204059",


@@ -891,6 +943,22 @@ contributors = [
                  "6 October 2013",
                  u"Dialog usability fix"),
 
                  "6 October 2013",
                  u"Dialog usability fix"),
 

+     contributor(u"Winfred Huang",
+                 "tone90999 () hotmail ! com",
+                 "GPL",
+                 "License for Chinese translation",
+                 "m=153274007430136",
+                 "28 July 2018",
+                 u"Simplified Chinese Localization"),
+
+     contributor(u"John Hudson",
+                 "j.r.hudson () virginmedia ! com",
+                 "GPL",
+                 "Contributions",
+                 "m=146722333213915",
+                 "29 June 2016",
+                 u"Documentation updates"),
+

      contributor(u"Bernard Hurley",
                  "bernard () fong-hurley ! org ! uk",
                  "GPL",
      contributor(u"Bernard Hurley",
                  "bernard () fong-hurley ! org ! uk",
                  "GPL",


@@ -947,6 +1015,14 @@ contributors = [
                  "22 February 2005",
                  u"Public relations, feedback, documentation and support"),
 
                  "22 February 2005",
                  u"Public relations, feedback, documentation and support"),
 

+     contributor(u"Joice Joseph",
+                 "joicey () yandex ! com",
+                 "GPL",
+                 "Re: patch: added document language malayalam",
+                 "m=155214496414909",
+                 "9 March 2019",
+                 u"Support for Malayalam"),
+

      contributor(u"Robert van der Kamp",
                  "robnet () wxs ! nl",
                  "GPL",
      contributor(u"Robert van der Kamp",
                  "robnet () wxs ! nl",
                  "GPL",


@@ -980,7 +1056,7 @@ contributors = [
                  u"Original name that is now two characters shorter"),
 
      contributor(u"KDE Artists",
                  u"Original name that is now two characters shorter"),
 
      contributor(u"KDE Artists",

-                 "http://artist.kde.org/",
+                 "",

                  "",
                  "",
                  "",
                  "",
                  "",
                  "",


@@ -1067,6 +1143,14 @@ contributors = [
                  "25 February 2005",
                  u"Initial version of the koma-script textclasses"),
 
                  "25 February 2005",
                  u"Initial version of the koma-script textclasses"),
 

+     contributor(u"Joel Kulesza",
+                 "jkulesza () gmail ! com>",
+                 "GPL",
+                 "License to Publish Work",
+                 "m=147735429207382",
+                 "25 October 2016",
+                 u"User interface improvements"),
+

      contributor(u"Felix Kurth",
                  "felix () fkurth ! de",
                  "GPL",
      contributor(u"Felix Kurth",
                  "felix () fkurth ! de",
                  "GPL",


@@ -1132,7 +1216,7 @@ contributors = [
                  u"Added native support for \makebox to mathed. Several bug fixes, both to the source code and to the llncs layout file"),
 
      contributor(u"LibreOffice Team",
                  u"Added native support for \makebox to mathed. Several bug fixes, both to the source code and to the llncs layout file"),
 
      contributor(u"LibreOffice Team",

-                 "http://www.libreoffice.org/",
+                 "https://www.libreoffice.org/",

                  "LGPL",
                  "",
                  "",
                  "LGPL",
                  "",
                  "",


@@ -1259,8 +1343,8 @@ contributors = [
                  "20 October 2014",
                  u"New lfun server-get-statistics"),
 
                  "20 October 2014",
                  u"New lfun server-get-statistics"),
 

-     contributor(u"Guillaume Munch>",
-                 "gadmm () free ! fr",
+     contributor(u"Guillaume Munch",
+                 "gm () lyx ! org",

                  "GPL",
                  "Re: -std=c++11 and [PATCH] Improve the display of the source (bugs #6501,#7359)",
                  "m=143890980923229",
                  "GPL",
                  "Re: -std=c++11 and [PATCH] Improve the display of the source (bugs #6501,#7359)",
                  "m=143890980923229",


@@ -1316,7 +1400,7 @@ contributors = [
                  u"Improvements to the outliner."),
 
      contributor(u"Oxygen Team",
                  u"Improvements to the outliner."),
 
      contributor(u"Oxygen Team",

-                 "http://www.oxygen-icons.org/",
+                 "https://techbase.kde.org/Projects/Oxygen",

                  "LGPL",
                  "",
                  "",
                  "LGPL",
                  "",
                  "",


@@ -1331,6 +1415,14 @@ contributors = [
                  "30 March 2005",
                  u"Support for two-column figure (figure*) and table (table*) environments.  Fixed minibuffer entry of floats."),
 
                  "30 March 2005",
                  u"Support for two-column figure (figure*) and table (table*) environments.  Fixed minibuffer entry of floats."),
 

+     contributor(u"Isaac Oscar Gariano",
+                 "isaacOscar () hotmail ! com",
+                 "GPL",
+                 "Re: [PATCH] Make math autocorrrect work with more than 2 chars",
+                 "m=155874284418501",
+                 "25 May 2019",
+                 u"Improvements to math autocorrect"),
+

      contributor(u"Gilad Orr",
                  "giladorr () gmail ! com",
                  "GPL",
      contributor(u"Gilad Orr",
                  "giladorr () gmail ! com",
                  "GPL",


@@ -1363,6 +1455,14 @@ contributors = [
                  "9 March 2014",
                  u"Korean translation"),
 
                  "9 March 2014",
                  u"Korean translation"),
 

+     contributor(u'Andrew Parsloe',
+                 "aparsloe () clear ! net ! nz",
+                 "GPL",
+                 "GPL declaration",
+                 "m=147941540519608",
+                 "17 November 2016",
+                 u"Module updates"),
+

      contributor(u'Bo Peng',
                  "ben.bob () gmail ! com",
                  "GPL",
      contributor(u'Bo Peng',
                  "ben.bob () gmail ! com",
                  "GPL",


@@ -1459,6 +1559,14 @@ contributors = [
                  "6 April 2005",
                  u"initial configure script"),
 
                  "6 April 2005",
                  u"initial configure script"),
 

+     contributor(u"Zheru Qiu",
+                 "qzr () mail ! ustc ! edu ! cn",
+                 "GPL",
+                 "Fwd: Permission of using my translation under GPL",
+                 "m=148702600212546",
+                 "5 February 2017",
+                 u"Chinese localisation"),
+

      contributor(u"Allan Rae",
                  "rae () itee ! uq ! edu ! au",
                  "GPL",
      contributor(u"Allan Rae",
                  "rae () itee ! uq ! edu ! au",
                  "GPL",


@@ -1466,7 +1574,7 @@ contributors = [
                  "m=110905169512662",
                  "21 February 2005",
                  u"GUI-I architect, LyX PR head, LDN, bug reports/fixes, Itemize Bullet Selection, xforms-0.81 + gcc-2.6.3 compatibility"),
                  "m=110905169512662",
                  "21 February 2005",
                  u"GUI-I architect, LyX PR head, LDN, bug reports/fixes, Itemize Bullet Selection, xforms-0.81 + gcc-2.6.3 compatibility"),

-     
+

      contributor(u"Manoj Rajagopalan",
                  "rmanoj () umich ! edu", 
                  "GPL", 
      contributor(u"Manoj Rajagopalan",
                  "rmanoj () umich ! edu", 
                  "GPL", 


@@ -1474,7 +1582,15 @@ contributors = [
                  "m=123506398801004", 
                  "Feb 19 2009", 
                  u"reference dialog tweaks"),
                  "m=123506398801004", 
                  "Feb 19 2009", 
                  u"reference dialog tweaks"),

-     
+
+     contributor(u"Daniel Ramöller",
+                 "d.lyx () web ! de", 
+                 "GPL", 
+                 "Permission", 
+                 "m=147578627921242", 
+                 "Oct 6 2016", 
+                 u"UI improvements"),
+

      contributor(u"Vincent van Ravesteijn",
                  "V.F.vanRavesteijn () tudelft ! nl",
                  "GPL",
      contributor(u"Vincent van Ravesteijn",
                  "V.F.vanRavesteijn () tudelft ! nl",
                  "GPL",


@@ -1579,6 +1695,14 @@ contributors = [
                  "25 September 2007",
                  u"Major rework of the AMS classes"),
 
                  "25 September 2007",
                  u"Major rework of the AMS classes"),
 

+     contributor(u"Dima Ruinskiy",
+                 "dima.ruinskiy () outlook ! com",
+                 "GPL",
+                 "Joining LyX development team",
+                 "m=146687842921797",
+                 "24 June 2016",
+                 u"Reintroduction of Windows Vista support (bug 10186)"),
+

      contributor(u"Guy Rutenberg",
                  "guyrutenberg () gmail ! com",
                  "GPL",
      contributor(u"Guy Rutenberg",
                  "guyrutenberg () gmail ! com",
                  "GPL",


@@ -1699,6 +1823,14 @@ contributors = [
                  "Mar 2 2009",
                  u"Indonesian translation"),
 
                  "Mar 2 2009",
                  u"Indonesian translation"),
 

+     contributor(u"Yuriy Skalko",
+                 "yuriy.skalko () gmail ! com",
+                 "GPL",
+                 "Re: Updated Russian translation",
+                 "m=151306079714476",
+                 "12 December 2017",
+                 u"Russian translation of the user interface"),
+     

      contributor(u"Giovanni Sora",
                  "g.sora () tiscali ! it",
                  "GPL",
      contributor(u"Giovanni Sora",
                  "g.sora () tiscali ! it",
                  "GPL",


@@ -1859,6 +1991,14 @@ contributors = [
                  "22 February 2005",
                  u"support for optional argument in sections/captions svjour/svjog, egs and llncs document classes. Lot of bug hunting (and fixing!)"),
 
                  "22 February 2005",
                  u"support for optional argument in sections/captions svjour/svjog, egs and llncs document classes. Lot of bug hunting (and fixing!)"),
 

+     contributor(u"Veselin",
+                 "vveesskkoo () gmail ! com",
+                 "GPL",
+                 "Re: po/bg.po update",
+                 "m=155531922001223",
+                 "15 April 2019",
+                 u"Bulgarian localization"),
+

      contributor(u"Jürgen Vigna",
                  "jug () lyx ! org",
                  "GPL",
      contributor(u"Jürgen Vigna",
                  "jug () lyx ! org",
                  "GPL",


@@ -1939,12 +2079,12 @@ contributors = [
                  "",
                  u"Maintainer of the @lists.lyx.org mailing-lists"),
 
                  "",
                  u"Maintainer of the @lists.lyx.org mailing-lists"),
 

-     contributor(u"Serge Winitzki",
-                 "winitzki () erebus ! phys ! cwru ! edu",
-                 "",
-                 "",
-                 "",
-                 "",
+     contributor(u"Sergei Winitzki",
+                 "winitzki () gmail ! com",
+                 "GPL",
+                 "Re: patch to include latest supported programming languages in listings.tex",
+                 "m=155530602429557",
+                 "15 April 2019",

                  u"updates to the Scientific Word bindings"),
 
      contributor(u"Stephan Witt",
                  u"updates to the Scientific Word bindings"),
 
      contributor(u"Stephan Witt",


@@ -1955,6 +2095,14 @@ contributors = [
                  "22 February 2005",
                  u"support for CVS revision control, native spell checker interface for Mac OS"),
 
                  "22 February 2005",
                  u"support for CVS revision control, native spell checker interface for Mac OS"),
 

+     contributor(u"Jürgen Womser-Schütz",
+                 "jws1954 () gmx ! de",
+                 "GPL",
+                 "Re: Bug #11484",
+                 "m=154990590319314",
+                 "11 February 2019",
+                 u"Improvements to the Include File dialog"),
+

      contributor(u"Russ Woodroofe",
                  "paranoia () math ! cornell ! edu",
                  "GPL",
      contributor(u"Russ Woodroofe",
                  "paranoia () math ! cornell ! edu",
                  "GPL",