X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fgenerate_contributions.py;h=989dcb34bcb2c81cded9f5be66d2764a444f8279;hb=eb70feb21e37d66437bbd00d10949c18a68814e9;hp=97ce4c1a048f5260fa91cc17b423f488b8535577;hpb=bd23e7228ba650a1c750bff7240d0af439e6ac96;p=lyx.git

diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 97ce4c1a04..989dcb34bc 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -10,13 +10,13 @@ author Angus Leeming
 Full author contact details are available in file CREDITS
 
 This script both stores and manipulates the raw data needed to
-create CREDITS, credits.php and blanket-permission.php
+create CREDITS, credits.inc and blanket-permission.inc
 
 Usage:
 $ python generate_contributions.py \
   CREDITS \
-  credits.php \
-  blanket-permission.php
+  credits.inc \
+  blanket-permission.inc
 
 where the arguments are the names of the generated files.
 '''
@@ -55,17 +55,14 @@ class contributer:
                if self.contact.find("http") != -1:
                     result.append('@i%s\n' % self.contact)
                else:
-                    ename, address = self.contact.split(" () ", 1)
-                    address = address.replace(" ! ", ".")
-                    contact = "%s@%s" % (ename, address)
-                    result.append('@iE-mail: %s\n' % contact)
+                    result.append('@iE-mail: %s\n' % self.contact)
           result.append('   %s\n' % self.credit.replace('\n', '\n   '))
           return "".join(result)
 
 
      def as_php_credits(self, wrapper):
           return '''
-contrib("%s",
+$output=$output.credits_contrib("%s",
         "%s",
         "%s");
 ''' % ( xml_escape(self.name),
@@ -75,7 +72,7 @@ contrib("%s",
 
      def as_php_blanket(self):
           return '''
-contrib("%s",
+$output=$output.blanket_contrib("%s",
         "%s",
         "%s",
         "%s",
@@ -133,69 +130,58 @@ just drop some e-mail to lyx@lyx.org. Thanks.
      return "".join(results)
 
 
-def header(title, file):
+def header():
      return '''<?php
 // WARNING! This file is autogenerated.
 // Any changes to it will be lost.
 // Please modify generate_contributions.py direct.
-
-// What's the title of the page?
-$title = "%s";
-// Who is the author?
-$author="lyx-devel@lists.lyx.org";
-// Full name of this file (relative path from LyX home page)
-$file_full="about/%s";
-
-include("start.php");
-?>
-''' % ( title, file )
+'''
 
 
 def footer():
      return '''
-<?php
-include("end.php");
-?>
 '''
 
 def as_php_credits(contributers, file):
      results = []
 
-     results.append(header("CREDITS", file))
+     results.append(header())
 
      results.append('''
-<?
-function contrib($name, $email, $msg) {
 
-echo "
+function credits_contrib($name, $email, $msg) {
 
- <dt>
-  <b>${name}</b>
-";
+$email = str_replace(' () ', '@', $email);
+$email = str_replace(' ! ', '.', $email);
 
 if (isset($email) && $email != "")
-        echo "  <i>&lt;${email}&gt;</i>";
+        $output=$output. "<dt><b>[[mailto:${email} | ${name}]]</b>";
+else
+        $output=$output. "<dt><b>${name}</b>";
 
 $msg = ereg_replace("\\n *", "\\n  ", ltrim($msg));
 
-echo "
+$output=$output. "
  </dt>
  <dd>
   ${msg}
  </dd>";
+ 
+return $output;
 }
 
-?>
+function credits_output() {
 
-<p>
+$output=$output."<p>
      If your name doesn't appear here although you've done
      something for LyX, or your entry is wrong or incomplete,
      just drop an e-mail to the
-     <a href="mailto:lyx-devel@lists.lyx.org">lyx-devel</a>
+     [[mailto:lyx-devel@lists.lyx.org | lyx-devel]]
      mailing list. Thanks.
 </p>
 
-<dl><?php''')
+<dl>";
+''')
 
      wrapper = textwrap.TextWrapper(width=60, subsequent_indent="         ")
 
@@ -203,9 +189,12 @@ echo "
           if len(contributer.credit) != 0:
                results.append(contributer.as_php_credits(wrapper))
 
-     results.append('''?>
+     results.append('''
+$output=$output."</dl>";
 
-</dl>
+return $output;
+
+}
 ''')
      results.append(footer())
      return "".join(results)
@@ -214,17 +203,19 @@ echo "
 def as_php_blanket(contributers, file):
      results = []
 
-     results.append(header("Permissions", file))
+     results.append(header())
 
      results.append('''
-<?
-function contrib($name, $email, $msg_title, $msg_ref, $date) {
 
-echo "
+function blanket_contrib($name, $email, $msg_title, $msg_ref, $date) {
+
+$email = str_replace(' () ', '@', $email);
+$email = str_replace(' ! ', '.', $email);
+
+$output=$output. "
 
  <dt>
-  <b>${name}</b>
-  <i>&lt;${email}&gt;</i>
+  <b>[[mailto:${email} | ${name}]]</b>
  </dt>
  <dd>
   See the lyx-devel mailing list message
@@ -232,50 +223,58 @@ echo "
 
 if (isset($msg_ref) && $msg_ref != "") {
         $msg_ref = htmlspecialchars("$msg_ref");
-        echo "<a href=\\"http://marc.info/?l=lyx-devel&amp;${msg_ref}\\">${msg_title}</a>";
+        $output=$output. "[[http://marc.info/?l=lyx-devel&amp;" . ${msg_ref} . "|" . ${msg_title} . "]]";
 } else {
-        echo "${msg_title}";
+        $output=$output. "${msg_title}";
 }
 
-echo "&quot;
+$output=$output. "&quot;
   of $date.
  </dd>";
+ 
+return $output;
 }
 
-?>
+function blanket_output() {
 
-<p>
-     The following people hereby grant permission to licence their
+$output=$output."<p>
+     The following people hereby grant permission to license their
      contributions to LyX under the
-     <a href="http://www.opensource.org/licenses/gpl-license.php">
-     Gnu General Public Licence</a>, version 2 or later.
+     [[http://www.opensource.org/licenses/gpl-license.php |
+     Gnu General Public License]], version 2 or later.
 </p>
 
-<dl><?php''')
+<dl>";
+''')
 
      for contributer in contributers:
           if contributer.licence == "GPL":
                results.append(contributer.as_php_blanket())
 
-     results.append('''?>
-</dl>
+     results.append('''
+$output=$output."</dl>";
 
+$output=$output."
 <p>
-     The following people hereby grant permission to licence their
+     The following people hereby grant permission to license their
      contributions to LyX under the
-     <a href="http://www.opensource.org/licenses/artistic-license.php">
-     Artistic Licence</a>.
+     [[http://www.opensource.org/licenses/artistic-license.php |
+     Artistic License]].
 </p>
 
-<dl>
-<?php''')
+<dl>";
+''')
 
      for contributer in contributers:
           if contributer.licence == "Artistic":
                results.append(contributer.as_php_blanket())
 
-     results.append('''?>
-</dl>
+     results.append('''
+$output=$output."</dl>";
+
+return $output;
+
+}
 ''')
 
      results.append(footer())
@@ -537,6 +536,14 @@ contributers = [
                  "",
                  u"Bug fix to the spellchecker"),
 
+     contributer(u"Nicola Focci",
+                 "nicola.focci () gmail ! com",
+                 "GPL",
+                 "Permission",
+                 "m=120946605432341",
+                 "29 April 2008",
+                 u"Italian translation of documentations"),
+
      contributer(u"Enrico Forestieri",
                  "forenr () tlc ! unipr ! it",
                  "GPL",
@@ -616,14 +623,14 @@ contributers = [
                  "m=110916171925288",
                  "23 February 2005",
                  u"Norwegian documentation and localization"),
-		 
+         
      contributer(u"Richard Heck",
                  "rgheck () brown ! edu",
                  "GPL",
                  "GPL Statement",
                  "m=117501689204059",
                  "27 March 2007",
-                 u"Bug fixes"),
+                 u"Bug fixes, layout modules, BibTeX code"),
 
      contributer(u"Bennett Helm",
                  "bennett.helm () fandm ! edu",
@@ -975,7 +982,7 @@ contributers = [
                  "Re: Python version of configure script (preview version)",
                  "m=112681895510418",
                  "15 September 2005",
-                 u"Conversion of all shell scripts to Python, session, view-source, auto-view features and scons build system."),
+                 u"Conversion of all shell scripts to Python, shortcuts dialog, session, view-source, auto-view, embedding features and scons build system."),
 
      contributer(u"Joacim Persson",
                  "sp2joap1 () ida ! his ! se",
@@ -1433,6 +1440,14 @@ contributers = [
                  "22 February 2005",
                  u"rotation of wysiwyg figures"),
 
+     contributer(u"Horst Schirmeier",
+                 "horst () schirmeier ! com",
+                 "GPL",
+                 "Re: [patch] reordering capabilities for GuiBibtex",
+                 "m=120009631506298",
+                 "12 January 2008",
+                 u"small fixes"),
+
      contributer(u"Xiaokun Zhu",
                  "xiaokun () aero ! gla ! ac ! uk",
                  "",
@@ -1441,5 +1456,7 @@ contributers = [
                  "",
                  u"bug reports and small fixes") ]
 
+
 if __name__ == "__main__":
      main(sys.argv, contributers)
+