From: Pierre Habouzit (MadCoder <pierre.habouzit@m4x.org>
Date: Wed, 29 Dec 2004 15:07:46 +0000 (+0000)
Subject: new pdf
X-Git-Tag: xorg/old~573
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=32cd74839829ab459d16340543e4192cb26b9cc7;p=platal.git

new pdf

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-175
---

diff --git a/htdocs/carnet/mescontacts_pdf.php b/htdocs/carnet/mescontacts_pdf.php
index c5955fb..ba074c3 100644
--- a/htdocs/carnet/mescontacts_pdf.php
+++ b/htdocs/carnet/mescontacts_pdf.php
@@ -19,124 +19,30 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("xorg.inc.php");
+require_once('xorg.inc.php');
 new_skinned_page('index.tpl', AUTH_COOKIE);
-require_once("texify.inc.php");
-require_once("applis.func.inc.php");
-
-$sql = "SELECT  a.*,c.*,e.alias as epouse
-	  FROM  auth_user_md5 AS a
-    INNER JOIN  contacts      AS c ON ( a.user_id = c.contact )
-    LEFT  JOIN  aliases       AS e ON ( a.user_id = e.id and FIND_IN_SET('epouse',e.flags) )
-         WHERE  c.uid = ".Session::getInt('uid');
-// choix de l'ordre des réponses (par promo ou par noms)
+require_once('contacts.pdf.inc.php');
+require_once('user.func.inc.php');
+
+$sql = "SELECT  a.alias
+          FROM  aliases       AS a
+    INNER JOIN  auth_user_md5 AS u ON ( a.id = u.user_id )
+    INNER JOIN  contacts      AS c ON ( a.id = c.contact )
+         WHERE  c.uid = {?} AND a.type='a_vie'";
 if (Get::get('order') == "promo") {
-    $sql .= " ORDER BY  a.promo, a.nom, a.prenom";
+    $sql .= " ORDER BY  u.promo, u.nom, u.prenom";
 } else {
-    $sql .= " ORDER BY  a.nom, a.prenom, a.promo";
+    $sql .= " ORDER BY  u.nom, u.prenom, u.promo";
 }
-$req = $globals->db->query($sql);
-
-// génération des en-têtes
-$texsrc = contacts_headers();
-
-// on traite ensuite les contacts un par un
-while ($myrow = mysql_fetch_array($req)) {
-
-    /* affichage de l'identité */
-    ereg( "[0-9]{2}([0-9]{2})-([0-9]{1,2})-([0-9]{1,2})", $myrow["date"], $regs );
-    $texsrc .= contact_tbl_hdr($myrow["prenom"], $myrow["nom"], $myrow["epouse"], $myrow["promo"], "$regs[3].$regs[2].$regs[1]");
-
 
-    /* affichage de l'école d'appli et de la post-appli */
-    $tmpreq=$globals->db->query(
-            "SELECT  applis_def.text,applis_def.url,applis_ins.type,applis_ins.ordre
-               FROM  applis_ins
-         INNER JOIN  applis_def ON applis_def.id=applis_ins.aid
-              WHERE  uid=".$myrow["user_id"]." ORDER by ordre"
-            );
-    while (list($rapp_txt,$rapp_url,$rapp_type,$rapp_ordre)=mysql_fetch_row($tmpreq)) {
-        if ($rapp_ordre==0) {
-            $texsrc .= contact_tbl_entry("Appli", applis_fmt($rapp_type,$rapp_txt,""));
-        } elseif ($rapp_ordre==1) {
-            $texsrc .= contact_tbl_entry("Post-appli", applis_fmt($rapp_type,$rapp_txt,""));
-        }
-    }
-    mysql_free_result($tmpreq);
+$citer = $globals->xdb->iterRow($sql, Session::getInt('uid'));
+$pdf   = new ContactsPDF();
 
-    /* affichage des différentes adresses persos */
-    $i = 0;
-    $tmpreq = $globals->db->query(
-            "SELECT  adr1,adr2,adr3,cp,ville,gp.pays,gr.name,tel,fax
-               FROM  adresses AS adr
-          LEFT JOIN  geoloc_pays AS gp ON(adr.pays=gp.a2)
-          LEFT JOIN  geoloc_region AS gr ON(adr.pays=gr.a2 AND adr.region=gr.region)
-              WHERE  adr.uid = ".$myrow["user_id"]
-            );
-    while (list($adr1,$adr2,$adr3,$cp,$ville,$pays,$region,$tel,$fax)
-            = mysql_fetch_row($tmpreq)) {
-        $i++;
-	$ch_adr = "";
-	if (!empty($adr1)) $ch_adr .= "\n$adr1";
-	if (!empty($adr2)) $ch_adr .= "\n$adr2";
-	if (!empty($adr3)) $ch_adr .= "\n$adr3";
-	if (!empty($cp) || ! empty($ville)) $ch_adr .= "\n$cp $ville";
-	if (!empty($region)) $ch_adr .= "\n$region, ";
-	elseif (! empty($pays)) $ch_adr .= "\n";
-	if (!empty($pays)) $ch_adr .= "$pays";
-	$texsrc .= contact_tbl_entry("Adresse $i", substr($ch_adr, 1));
-	if (!empty($tel)) $texsrc .= contact_tbl_entry("Téléphone $i", $tel);
-	if (!empty($fax)) $texsrc .= contact_tbl_entry("Fax $i", $fax);
-	
-    }
-    mysql_free_result($tmpreq);
-
-    /* affichage du téléphone mobile */
-    if ($myrow["mobile"])
-    	$texsrc .= contact_tbl_entry("Mobile", $myrow["mobile"]);
-
-    /* affichage des infos professionnelles (poste, adresse, tel) */
-    $res_pro = $globals->db->query(
-            "SELECT  entreprise, s.label, ss.label, f.fonction_fr, poste,
-                     adr1, adr2, adr3, cp, ville, gp.pays, gr.name, tel, fax
-               FROM  entreprises       AS e
-          LEFT JOIN  emploi_secteur    AS s  ON e.secteur = s.id
-          LEFT JOIN  emploi_ss_secteur AS ss ON (e.secteur = ss.secteur AND e.ss_secteur = ss.id)
-          LEFT JOIN  fonctions_def     AS f  ON f.id = e.fonction
-          LEFT JOIN  geoloc_pays       AS gp ON gp.a2 = e.pays
-         INNER JOIN  geoloc_region     AS gr ON (gr.a2 = e.pays AND gr.region = e.region)
-             WHERE e.uid = ".$myrow["user_id"]
-            );
-    while (list($entreprise, $secteur, $ss_secteur, $fonction, $poste, $adr1, $adr2, $adr3,
-                $cp, $ville, $pays, $region, $tel, $fax) = mysql_fetch_row($res_pro))
-    {
-        if (!empty($entreprise))
-    	    $texsrc .= contact_tbl_entry("Entreprise", $entreprise . ($secteur ? " ($secteur - $ss_secteur)" : ""));
-
-        if (!empty($poste))
-    	    $texsrc .= contact_tbl_entry("Poste / Fonction", $poste." / ".(($fonction) ? $fonction : "-"));
-	$ch_adr = "";
-	if (! empty($adr1)) $ch_adr .= "\n$adr1";
-	if (! empty($adr2)) $ch_adr .= "\n$adr2";
-	if (! empty($adr3)) $ch_adr .= "\n$adr3";
-	if (! empty($cp) || ! empty($ville)) $ch_adr .= "\n$cp $ville";
-	if (! empty($region)) $ch_adr .= "\n$region, ";
-	elseif (! empty($pays)) $ch_adr .= "\n";
-	if (! empty($pays)) $ch_adr .= "$pays";
-	$texsrc .= contact_tbl_entry("Adresse pro.", substr($ch_adr, 1));
-	if (! empty($tel)) $texsrc .= contact_tbl_entry("Téléphone pro.", $tel);
-	if (! empty($fax)) $texsrc .= contact_tbl_entry("Fax pro.", $fax);
-    }
-
-    /* fin du contact */
-    $texsrc .= contact_tbl_ftr();
+while (list($alias) = $citer->next()) {
+    $user = get_user_details($alias);
+    $pdf->addContact($user);
 }
 
-// enfin on rajoute le footer
-$texsrc .= contacts_footer();
-mysql_free_result($req);
-
-// puis on convertit le fichier tex en pdf !
-tex_to_pdf($texsrc);
+$pdf->Output();
 
 ?>
diff --git a/htdocs/getphoto.php b/htdocs/getphoto.php
index 9e37c8c..932be6d 100644
--- a/htdocs/getphoto.php
+++ b/htdocs/getphoto.php
@@ -21,7 +21,7 @@
 
 
 require_once('xorg.inc.php');
-new_skinned_page('login.tpl', AUTH_COOKIE);
+new_skinned_page('login.tpl', AUTH_PUBLIC);
 
 if (Env::has('x')) {
     if (Env::get('req') == "true") {
diff --git a/htdocs/images/logo.png b/htdocs/images/logo.png
new file mode 100644
index 0000000..b08c016
Binary files /dev/null and b/htdocs/images/logo.png differ
diff --git a/include/contacts.pdf.inc.php b/include/contacts.pdf.inc.php
new file mode 100644
index 0000000..ebce038
--- /dev/null
+++ b/include/contacts.pdf.inc.php
@@ -0,0 +1,258 @@
+<?php
+/***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program 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 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program 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 this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************/
+
+define ('FPDF_FONTPATH', dirname(__FILE__).'/fonts/');
+require_once('/usr/share/fpdf/fpdf.php');
+
+class ContactsPDF extends FPDF
+{
+    var $col = 0;
+    var $y0;
+
+    var $title = "Mes contacts sur Polytechnique.org";
+    var $broken = false;
+
+    function ContactsPDF()
+    {
+        parent::FPDF();
+        $this->AddFont('Vera Sans', '',  'Vera.php');
+        $this->AddFont('Vera Sans', 'I', 'VeraIt.php');
+        $this->AddFont('Vera Sans', 'B', 'VeraBd.php');
+        
+        $this->AddFont('Vera Mono', '',  'VeraMono.php');
+        
+        $this->SetTitle($this->title);
+        $this->SetCreator('Site Polytechnique.org');
+        $this->AddPage();
+    }
+
+    function Rotate($angle,$x=-1,$y=-1)
+    {
+        if($x==-1) {
+            $x = $this->x;
+        }
+        if($y==-1) {
+            $y=$this->y;
+        }
+        if($this->angle != 0) {
+            $this->_out('Q');
+        }
+        $this->angle = $angle;
+        if($angle != 0)
+        {
+            $angle*=M_PI/180;
+            $c  = cos($angle);
+            $s  = sin($angle);
+            $cx = $x*$this->k;
+            $cy = ($this->h-$y)*$this->k;
+            $this->_out(sprintf('q %.5f %.5f %.5f %.5f %.2f %.2f cm 1 0 0 1 %.2f %.2f cm',$c,$s,-$s,$c,$cx,$cy,-$cx,-$cy));
+        }
+    }
+    
+    function Header()
+    {
+
+        $this->SetFont('Vera Sans', 'B', 20);
+        $this->SetTextColor(230);
+        $this->Rotate(45,55,190);
+        $this->Text(55,190,"informations limitées à un usage");
+        $this->Text(40,210,"strictement personnel et non commercial");
+        $this->Rotate(0);
+        
+        $this->setLeftMargin(5);
+        $this->setRightMargin(5);
+        $this->SetFont('Vera Sans', 'B', 16);
+        $this->SetY(5);
+        $this->SetTextColor(51,102,153);
+        $this->SetDrawColor(102,153,204);
+        $this->SetLineWidth(0.2);
+        $this->SetFillColor(245, 248, 252);
+        $this->Cell(200, 10, $this->title, 1, 1, 'C', 1);
+        $this->Image(dirname(__FILE__).'/../htdocs/images/logo.png', 5, 5, 10, 10, 'png', 'https://www.polytechnique.org/');
+        
+        $this->Ln(10);
+        $this->y0 = $this->GetY();
+        $this->ColSetup(false);
+    }
+
+    function Footer()
+    {
+        $this->setLeftMargin(5);
+        $this->setRightMargin(5);
+        $this->SetY(-15);
+        $this->SetFont('Vera Sans','I',8);
+        $this->SetTextColor(128);
+        $this->Cell(0, 10, 'Page '.$this->PageNo(), 0, 0, 'C');
+    }
+
+    function ColSetup($col)
+    {
+        $this->col = $col;
+        $x = 10 + $this->col * 100;
+        $this->SetLeftMargin($x);
+        $this->SetRightMargin(120 - $x);
+        $this->SetX($x);
+        $this->SetY($this->y0);
+    }
+
+    function NextCol()
+    {
+        $this->ColSetup(1 - $this->col);
+        if ($this->col == 0) { $this->AddPage(); }
+    }
+
+    function AcceptPageBreak()
+    {
+        $this->broken = true;
+    }
+
+    function Space($before=0.5)
+    {
+        $x = $this->getX();
+        $y = $this->getY();
+
+        $this->SetLineWidth(0.1);
+        $this->Line($x, $y+$before, $x+90, $y+$before);
+        $this->setY($this->getY()+0.5+$before);
+    }
+
+    function TableRow($l, $r, $font = 'Sans')
+    {
+        $this->SetFont('Vera Sans', 'B', 8);
+        $y = $this->getY();
+        $x = $this->getX();
+        $this->MultiCell(25, 4, $l, '', 1);
+        $y1 = $this->getY();
+
+        $this->SetFont('Vera '.$font, '', 8);
+        $this->setY($y);
+        $first = 1;
+        
+        $this->setX($x+25);
+        $this->MultiCell(65, 4, $r, '', 1);
+        
+        if ($y1 > $this->getY()) { $this->setY($y1); }
+        $this->setX($x);
+    }
+
+    function Address($a)
+    {
+        $l = "adresse\n";
+        if ($a['active']) {
+            $l .= 'actuelle';
+        } elseif ($a['secondaire']) {
+            $l .= 'secondaire';
+        } else {
+            $l .= 'principale';
+        }
+
+        $r = '';
+        $r = trim("$r\n".$a['adr1']);
+        $r = trim("$r\n".$a['adr2']);
+        $r = trim("$r\n".$a['adr3']);
+        $r = trim("$r\n".trim($a['cp'].' '.$a['ville']));
+
+        $this->TableRow($l, $r);
+
+        if ($a['tel']) {
+            $this->TableRow('Téléphone', $a['tel'], 'Mono');
+        }
+        if ($a['fax']) {
+            $this->TableRow('Fax', $a['fax'], 'Mono');
+        }
+    }
+
+    function AddressPro($a)
+    {
+        if ($a['entreprise']) {
+            $this->TableRow('Entreprise', $a['entreprise']);
+        }
+        
+        if ($a['adr1'] || $a['adr2'] || $a['adr3'] || $a['cp'] || $a['ville']) {
+            $r = '';
+            $r = trim("$r\n".$a['adr1']);
+            $r = trim("$r\n".$a['adr2']);
+            $r = trim("$r\n".$a['adr3']);
+            $r = trim("$r\n".trim($a['cp'].' '.$a['ville']));
+            $this->TableRow('adresse pro', $r);
+        }
+
+        if ($a['tel']) {
+            $this->TableRow('Téléphone', $a['tel'], 'Mono');
+        }
+        if ($a['fax']) {
+            $this->TableRow('Fax', $a['fax'], 'Mono');
+        }
+    }
+
+    function AddContact($x)
+    {
+        global $globals;
+        /* infamous hack :
+           1- we store the current state.
+           2- at the end, we find out if we triggered the page break,
+              -> no ? ok
+              -> yes ? then we have to create a col, and add the contact again.
+        */
+        $old = $this;
+
+        $this->SetFont('Vera Sans', '', 10);
+        $this->SetDrawColor(0);
+        $this->SetFillColor(245, 248, 252);
+        $this->SetLineWidth(0.4);
+
+        $nom = $x['prenom'].' '.($x['epouse'] ? "{$x['epouse']} - née {$x['nom']}" : $x['nom'])." ({$x['promo']})";
+        $this->Cell(0, 6, $nom, "T", 1, 'C', 1, $globals->baseurl."/fiche.php?user={$x['forlife']}");
+        $this->Space(0);
+
+        if ($x['mobile']) {
+            $this->TableRow('mobile', $x['mobile'], 'Mono');
+            $this->Space();
+        }
+
+        foreach ($x['adr'] as $a) {
+            $this->Address($a);
+            $this->Space();
+        }
+        
+        foreach ($x['adr_pro'] as $a) {
+            if ( ! ($a['entreprise'] || $a['tel'] || $a['fax']
+                    || $a['adr1'] || $a['adr2'] || $a['adr3'] || $a['cp'] || $a['ville']) )
+            {
+                continue;
+            }
+            $this->AddressPro($a);
+            $this->Space();
+        }
+
+        $this->Ln();
+        $this->Ln();
+
+        if ($this->broken) {
+            $old->NextCol();
+            $old->AddContact($x);
+            $this = $old;
+        }
+    }
+
+}
+
+?>
diff --git a/include/fonts/README b/include/fonts/README
new file mode 100644
index 0000000..81d2df5
--- /dev/null
+++ b/include/fonts/README
@@ -0,0 +1,4 @@
+
+The files here have been generated with fpdf (http://www.fpdf.org/) font tools
+from ttf-bitstream-vera fonts.
+
diff --git a/include/fonts/Vera.php b/include/fonts/Vera.php
new file mode 100644
index 0000000..a220f2b
--- /dev/null
+++ b/include/fonts/Vera.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSans-Roman';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>32,'FontBBox'=>'[-183 -236 1287 928]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
+$up=-104;
+$ut=70;
+$cw=array(
+	chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+	chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>318,'!'=>401,'"'=>460,'#'=>838,'$'=>636,'%'=>950,'&'=>780,'\''=>275,'('=>390,')'=>390,'*'=>500,'+'=>838,
+	','=>318,'-'=>361,'.'=>318,'/'=>337,'0'=>636,'1'=>636,'2'=>636,'3'=>636,'4'=>636,'5'=>636,'6'=>636,'7'=>636,'8'=>636,'9'=>636,':'=>337,';'=>337,'<'=>838,'='=>838,'>'=>838,'?'=>531,'@'=>1000,'A'=>684,
+	'B'=>686,'C'=>698,'D'=>770,'E'=>632,'F'=>575,'G'=>775,'H'=>752,'I'=>295,'J'=>295,'K'=>656,'L'=>557,'M'=>863,'N'=>748,'O'=>787,'P'=>603,'Q'=>787,'R'=>695,'S'=>635,'T'=>611,'U'=>732,'V'=>684,'W'=>989,
+	'X'=>685,'Y'=>611,'Z'=>685,'['=>390,'\\'=>337,']'=>390,'^'=>838,'_'=>500,'`'=>500,'a'=>613,'b'=>635,'c'=>550,'d'=>635,'e'=>615,'f'=>352,'g'=>635,'h'=>634,'i'=>278,'j'=>278,'k'=>579,'l'=>278,'m'=>974,
+	'n'=>634,'o'=>612,'p'=>635,'q'=>635,'r'=>411,'s'=>521,'t'=>392,'u'=>634,'v'=>592,'w'=>818,'x'=>592,'y'=>592,'z'=>525,'{'=>636,'|'=>337,'}'=>636,'~'=>838,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>600,
+	chr(132)=>600,chr(133)=>600,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>600,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+	chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>318,chr(161)=>401,chr(162)=>636,chr(163)=>636,chr(164)=>636,chr(165)=>636,chr(166)=>635,chr(167)=>500,chr(168)=>521,chr(169)=>1000,chr(170)=>471,chr(171)=>612,chr(172)=>838,chr(173)=>361,chr(174)=>1000,chr(175)=>500,
+	chr(176)=>500,chr(177)=>838,chr(178)=>401,chr(179)=>401,chr(180)=>685,chr(181)=>636,chr(182)=>636,chr(183)=>318,chr(184)=>525,chr(185)=>401,chr(186)=>471,chr(187)=>612,chr(188)=>1070,chr(189)=>1023,chr(190)=>611,chr(191)=>531,chr(192)=>684,chr(193)=>684,chr(194)=>684,chr(195)=>684,chr(196)=>684,chr(197)=>684,
+	chr(198)=>974,chr(199)=>698,chr(200)=>632,chr(201)=>632,chr(202)=>632,chr(203)=>632,chr(204)=>295,chr(205)=>295,chr(206)=>295,chr(207)=>295,chr(208)=>775,chr(209)=>748,chr(210)=>787,chr(211)=>787,chr(212)=>787,chr(213)=>787,chr(214)=>787,chr(215)=>838,chr(216)=>787,chr(217)=>732,chr(218)=>732,chr(219)=>732,
+	chr(220)=>732,chr(221)=>611,chr(222)=>605,chr(223)=>630,chr(224)=>613,chr(225)=>613,chr(226)=>613,chr(227)=>613,chr(228)=>613,chr(229)=>613,chr(230)=>982,chr(231)=>550,chr(232)=>615,chr(233)=>615,chr(234)=>615,chr(235)=>615,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>612,chr(241)=>634,
+	chr(242)=>612,chr(243)=>612,chr(244)=>612,chr(245)=>612,chr(246)=>612,chr(247)=>838,chr(248)=>612,chr(249)=>634,chr(250)=>634,chr(251)=>634,chr(252)=>634,chr(253)=>592,chr(254)=>635,chr(255)=>592);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='Vera.z';
+$originalsize=65932;
+?>
diff --git a/include/fonts/Vera.z b/include/fonts/Vera.z
new file mode 100644
index 0000000..dc32a23
Binary files /dev/null and b/include/fonts/Vera.z differ
diff --git a/include/fonts/VeraBI.php b/include/fonts/VeraBI.php
new file mode 100644
index 0000000..357f626
--- /dev/null
+++ b/include/fonts/VeraBI.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSans-BoldOblique';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>96,'FontBBox'=>'[-278 -236 1401 928]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>600);
+$up=-111;
+$ut=126;
+$cw=array(
+	chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+	chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>348,'!'=>456,'"'=>521,'#'=>696,'$'=>696,'%'=>1002,'&'=>872,'\''=>306,'('=>457,')'=>457,'*'=>523,'+'=>838,
+	','=>380,'-'=>415,'.'=>380,'/'=>365,'0'=>696,'1'=>696,'2'=>696,'3'=>696,'4'=>696,'5'=>696,'6'=>696,'7'=>696,'8'=>696,'9'=>696,':'=>400,';'=>400,'<'=>838,'='=>838,'>'=>838,'?'=>580,'@'=>1000,'A'=>774,
+	'B'=>762,'C'=>734,'D'=>830,'E'=>683,'F'=>683,'G'=>821,'H'=>837,'I'=>372,'J'=>372,'K'=>775,'L'=>637,'M'=>995,'N'=>837,'O'=>850,'P'=>733,'Q'=>850,'R'=>770,'S'=>720,'T'=>682,'U'=>812,'V'=>774,'W'=>1103,
+	'X'=>771,'Y'=>724,'Z'=>725,'['=>457,'\\'=>365,']'=>457,'^'=>838,'_'=>500,'`'=>500,'a'=>675,'b'=>716,'c'=>593,'d'=>716,'e'=>678,'f'=>435,'g'=>716,'h'=>712,'i'=>343,'j'=>343,'k'=>665,'l'=>343,'m'=>1042,
+	'n'=>712,'o'=>687,'p'=>716,'q'=>716,'r'=>493,'s'=>595,'t'=>478,'u'=>712,'v'=>652,'w'=>924,'x'=>645,'y'=>652,'z'=>582,'{'=>712,'|'=>365,'}'=>712,'~'=>838,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>600,
+	chr(132)=>600,chr(133)=>600,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>600,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+	chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>348,chr(161)=>456,chr(162)=>696,chr(163)=>696,chr(164)=>696,chr(165)=>696,chr(166)=>720,chr(167)=>500,chr(168)=>595,chr(169)=>1000,chr(170)=>564,chr(171)=>650,chr(172)=>838,chr(173)=>415,chr(174)=>1000,chr(175)=>500,
+	chr(176)=>500,chr(177)=>838,chr(178)=>438,chr(179)=>438,chr(180)=>725,chr(181)=>736,chr(182)=>636,chr(183)=>380,chr(184)=>582,chr(185)=>438,chr(186)=>564,chr(187)=>650,chr(188)=>1167,chr(189)=>1094,chr(190)=>724,chr(191)=>580,chr(192)=>774,chr(193)=>774,chr(194)=>774,chr(195)=>774,chr(196)=>774,chr(197)=>774,
+	chr(198)=>1085,chr(199)=>734,chr(200)=>683,chr(201)=>683,chr(202)=>683,chr(203)=>683,chr(204)=>372,chr(205)=>372,chr(206)=>372,chr(207)=>372,chr(208)=>845,chr(209)=>837,chr(210)=>850,chr(211)=>850,chr(212)=>850,chr(213)=>850,chr(214)=>850,chr(215)=>838,chr(216)=>850,chr(217)=>812,chr(218)=>812,chr(219)=>812,
+	chr(220)=>812,chr(221)=>724,chr(222)=>742,chr(223)=>719,chr(224)=>675,chr(225)=>675,chr(226)=>675,chr(227)=>675,chr(228)=>675,chr(229)=>675,chr(230)=>1048,chr(231)=>593,chr(232)=>678,chr(233)=>678,chr(234)=>678,chr(235)=>678,chr(236)=>343,chr(237)=>343,chr(238)=>343,chr(239)=>343,chr(240)=>687,chr(241)=>712,
+	chr(242)=>687,chr(243)=>687,chr(244)=>687,chr(245)=>687,chr(246)=>687,chr(247)=>838,chr(248)=>687,chr(249)=>712,chr(250)=>712,chr(251)=>712,chr(252)=>712,chr(253)=>652,chr(254)=>716,chr(255)=>652);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraBI.z';
+$originalsize=63208;
+?>
diff --git a/include/fonts/VeraBI.z b/include/fonts/VeraBI.z
new file mode 100644
index 0000000..2ee4581
Binary files /dev/null and b/include/fonts/VeraBI.z differ
diff --git a/include/fonts/VeraBd.php b/include/fonts/VeraBd.php
new file mode 100644
index 0000000..38b5e5f
--- /dev/null
+++ b/include/fonts/VeraBd.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSans-Bold';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>32,'FontBBox'=>'[-199 -236 1417 928]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
+$up=-111;
+$ut=126;
+$cw=array(
+	chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+	chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>348,'!'=>456,'"'=>521,'#'=>838,'$'=>696,'%'=>1002,'&'=>872,'\''=>306,'('=>457,')'=>457,'*'=>523,'+'=>838,
+	','=>380,'-'=>415,'.'=>380,'/'=>365,'0'=>696,'1'=>696,'2'=>696,'3'=>696,'4'=>696,'5'=>696,'6'=>696,'7'=>696,'8'=>696,'9'=>696,':'=>400,';'=>400,'<'=>838,'='=>838,'>'=>838,'?'=>580,'@'=>1000,'A'=>774,
+	'B'=>762,'C'=>734,'D'=>830,'E'=>683,'F'=>683,'G'=>821,'H'=>837,'I'=>372,'J'=>372,'K'=>775,'L'=>637,'M'=>995,'N'=>837,'O'=>850,'P'=>733,'Q'=>850,'R'=>770,'S'=>720,'T'=>682,'U'=>812,'V'=>774,'W'=>1103,
+	'X'=>771,'Y'=>724,'Z'=>725,'['=>457,'\\'=>365,']'=>457,'^'=>838,'_'=>500,'`'=>500,'a'=>675,'b'=>716,'c'=>593,'d'=>716,'e'=>678,'f'=>435,'g'=>716,'h'=>712,'i'=>343,'j'=>343,'k'=>665,'l'=>343,'m'=>1042,
+	'n'=>712,'o'=>687,'p'=>716,'q'=>716,'r'=>493,'s'=>595,'t'=>478,'u'=>712,'v'=>652,'w'=>924,'x'=>645,'y'=>652,'z'=>582,'{'=>712,'|'=>365,'}'=>712,'~'=>838,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>600,
+	chr(132)=>600,chr(133)=>600,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>600,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+	chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>348,chr(161)=>456,chr(162)=>696,chr(163)=>696,chr(164)=>696,chr(165)=>696,chr(166)=>720,chr(167)=>500,chr(168)=>595,chr(169)=>1000,chr(170)=>564,chr(171)=>646,chr(172)=>838,chr(173)=>415,chr(174)=>1000,chr(175)=>500,
+	chr(176)=>500,chr(177)=>838,chr(178)=>438,chr(179)=>438,chr(180)=>725,chr(181)=>736,chr(182)=>636,chr(183)=>380,chr(184)=>582,chr(185)=>438,chr(186)=>564,chr(187)=>646,chr(188)=>1167,chr(189)=>1094,chr(190)=>724,chr(191)=>580,chr(192)=>774,chr(193)=>774,chr(194)=>774,chr(195)=>774,chr(196)=>774,chr(197)=>774,
+	chr(198)=>1085,chr(199)=>734,chr(200)=>683,chr(201)=>683,chr(202)=>683,chr(203)=>683,chr(204)=>372,chr(205)=>372,chr(206)=>372,chr(207)=>372,chr(208)=>838,chr(209)=>837,chr(210)=>850,chr(211)=>850,chr(212)=>850,chr(213)=>850,chr(214)=>850,chr(215)=>838,chr(216)=>850,chr(217)=>812,chr(218)=>812,chr(219)=>812,
+	chr(220)=>812,chr(221)=>724,chr(222)=>738,chr(223)=>719,chr(224)=>675,chr(225)=>675,chr(226)=>675,chr(227)=>675,chr(228)=>675,chr(229)=>675,chr(230)=>1048,chr(231)=>593,chr(232)=>678,chr(233)=>678,chr(234)=>678,chr(235)=>678,chr(236)=>343,chr(237)=>343,chr(238)=>343,chr(239)=>343,chr(240)=>687,chr(241)=>712,
+	chr(242)=>687,chr(243)=>687,chr(244)=>687,chr(245)=>687,chr(246)=>687,chr(247)=>838,chr(248)=>687,chr(249)=>712,chr(250)=>712,chr(251)=>712,chr(252)=>712,chr(253)=>652,chr(254)=>716,chr(255)=>652);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraBd.z';
+$originalsize=58716;
+?>
diff --git a/include/fonts/VeraBd.z b/include/fonts/VeraBd.z
new file mode 100644
index 0000000..f5fa4d0
Binary files /dev/null and b/include/fonts/VeraBd.z differ
diff --git a/include/fonts/VeraIt.php b/include/fonts/VeraIt.php
new file mode 100644
index 0000000..374494a
--- /dev/null
+++ b/include/fonts/VeraIt.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSans-Oblique';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>96,'FontBBox'=>'[-262 -236 1259 928]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>600);
+$up=-104;
+$ut=70;
+$cw=array(
+	chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+	chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>318,'!'=>401,'"'=>460,'#'=>838,'$'=>636,'%'=>950,'&'=>780,'\''=>275,'('=>390,')'=>390,'*'=>500,'+'=>838,
+	','=>318,'-'=>361,'.'=>318,'/'=>337,'0'=>636,'1'=>636,'2'=>636,'3'=>636,'4'=>636,'5'=>636,'6'=>636,'7'=>636,'8'=>636,'9'=>636,':'=>337,';'=>337,'<'=>838,'='=>838,'>'=>838,'?'=>531,'@'=>1000,'A'=>684,
+	'B'=>686,'C'=>698,'D'=>770,'E'=>632,'F'=>575,'G'=>775,'H'=>752,'I'=>295,'J'=>295,'K'=>656,'L'=>557,'M'=>863,'N'=>748,'O'=>787,'P'=>603,'Q'=>787,'R'=>695,'S'=>635,'T'=>611,'U'=>732,'V'=>684,'W'=>989,
+	'X'=>685,'Y'=>611,'Z'=>685,'['=>390,'\\'=>337,']'=>390,'^'=>838,'_'=>500,'`'=>500,'a'=>613,'b'=>635,'c'=>550,'d'=>635,'e'=>615,'f'=>352,'g'=>635,'h'=>634,'i'=>278,'j'=>278,'k'=>579,'l'=>278,'m'=>974,
+	'n'=>634,'o'=>612,'p'=>635,'q'=>635,'r'=>411,'s'=>521,'t'=>392,'u'=>634,'v'=>592,'w'=>818,'x'=>592,'y'=>592,'z'=>525,'{'=>636,'|'=>337,'}'=>636,'~'=>838,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>600,
+	chr(132)=>600,chr(133)=>600,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>600,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+	chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>318,chr(161)=>401,chr(162)=>636,chr(163)=>636,chr(164)=>636,chr(165)=>636,chr(166)=>635,chr(167)=>500,chr(168)=>521,chr(169)=>1000,chr(170)=>471,chr(171)=>617,chr(172)=>838,chr(173)=>361,chr(174)=>1000,chr(175)=>500,
+	chr(176)=>500,chr(177)=>838,chr(178)=>401,chr(179)=>401,chr(180)=>685,chr(181)=>636,chr(182)=>636,chr(183)=>318,chr(184)=>525,chr(185)=>401,chr(186)=>471,chr(187)=>617,chr(188)=>1070,chr(189)=>1028,chr(190)=>611,chr(191)=>531,chr(192)=>684,chr(193)=>684,chr(194)=>684,chr(195)=>684,chr(196)=>684,chr(197)=>684,
+	chr(198)=>974,chr(199)=>698,chr(200)=>632,chr(201)=>632,chr(202)=>632,chr(203)=>632,chr(204)=>295,chr(205)=>295,chr(206)=>295,chr(207)=>295,chr(208)=>775,chr(209)=>748,chr(210)=>787,chr(211)=>787,chr(212)=>787,chr(213)=>787,chr(214)=>787,chr(215)=>838,chr(216)=>787,chr(217)=>732,chr(218)=>732,chr(219)=>732,
+	chr(220)=>732,chr(221)=>611,chr(222)=>608,chr(223)=>630,chr(224)=>613,chr(225)=>613,chr(226)=>613,chr(227)=>613,chr(228)=>613,chr(229)=>613,chr(230)=>995,chr(231)=>550,chr(232)=>615,chr(233)=>615,chr(234)=>615,chr(235)=>615,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>612,chr(241)=>634,
+	chr(242)=>612,chr(243)=>612,chr(244)=>612,chr(245)=>612,chr(246)=>612,chr(247)=>838,chr(248)=>612,chr(249)=>634,chr(250)=>634,chr(251)=>634,chr(252)=>634,chr(253)=>592,chr(254)=>635,chr(255)=>592);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraIt.z';
+$originalsize=63684;
+?>
diff --git a/include/fonts/VeraIt.z b/include/fonts/VeraIt.z
new file mode 100644
index 0000000..b172197
Binary files /dev/null and b/include/fonts/VeraIt.z differ
diff --git a/include/fonts/VeraMoBI.php b/include/fonts/VeraMoBI.php
new file mode 100644
index 0000000..45dfded
--- /dev/null
+++ b/include/fonts/VeraMoBI.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSansMono-BoldOb';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>97,'FontBBox'=>'[-73 -236 681 928]','ItalicAngle'=>-11,'StemV'=>120,'MissingWidth'=>602);
+$up=-108;
+$ut=120;
+$cw=array(
+	chr(0)=>602,chr(1)=>602,chr(2)=>602,chr(3)=>602,chr(4)=>602,chr(5)=>602,chr(6)=>602,chr(7)=>602,chr(8)=>602,chr(9)=>602,chr(10)=>602,chr(11)=>602,chr(12)=>602,chr(13)=>602,chr(14)=>602,chr(15)=>602,chr(16)=>602,chr(17)=>602,chr(18)=>602,chr(19)=>602,chr(20)=>602,chr(21)=>602,
+	chr(22)=>602,chr(23)=>602,chr(24)=>602,chr(25)=>602,chr(26)=>602,chr(27)=>602,chr(28)=>602,chr(29)=>602,chr(30)=>602,chr(31)=>602,' '=>602,'!'=>602,'"'=>602,'#'=>602,'$'=>602,'%'=>602,'&'=>602,'\''=>602,'('=>602,')'=>602,'*'=>602,'+'=>602,
+	','=>602,'-'=>602,'.'=>602,'/'=>602,'0'=>602,'1'=>602,'2'=>602,'3'=>602,'4'=>602,'5'=>602,'6'=>602,'7'=>602,'8'=>602,'9'=>602,':'=>602,';'=>602,'<'=>602,'='=>602,'>'=>602,'?'=>602,'@'=>602,'A'=>602,
+	'B'=>602,'C'=>602,'D'=>602,'E'=>602,'F'=>602,'G'=>602,'H'=>602,'I'=>602,'J'=>602,'K'=>602,'L'=>602,'M'=>602,'N'=>602,'O'=>602,'P'=>602,'Q'=>602,'R'=>602,'S'=>602,'T'=>602,'U'=>602,'V'=>602,'W'=>602,
+	'X'=>602,'Y'=>602,'Z'=>602,'['=>602,'\\'=>602,']'=>602,'^'=>602,'_'=>602,'`'=>602,'a'=>602,'b'=>602,'c'=>602,'d'=>602,'e'=>602,'f'=>602,'g'=>602,'h'=>602,'i'=>602,'j'=>602,'k'=>602,'l'=>602,'m'=>602,
+	'n'=>602,'o'=>602,'p'=>602,'q'=>602,'r'=>602,'s'=>602,'t'=>602,'u'=>602,'v'=>602,'w'=>602,'x'=>602,'y'=>602,'z'=>602,'{'=>602,'|'=>602,'}'=>602,'~'=>602,chr(127)=>602,chr(128)=>602,chr(129)=>602,chr(130)=>602,chr(131)=>602,
+	chr(132)=>602,chr(133)=>602,chr(134)=>602,chr(135)=>602,chr(136)=>602,chr(137)=>602,chr(138)=>602,chr(139)=>602,chr(140)=>602,chr(141)=>602,chr(142)=>602,chr(143)=>602,chr(144)=>602,chr(145)=>602,chr(146)=>602,chr(147)=>602,chr(148)=>602,chr(149)=>602,chr(150)=>602,chr(151)=>602,chr(152)=>602,chr(153)=>602,
+	chr(154)=>602,chr(155)=>602,chr(156)=>602,chr(157)=>602,chr(158)=>602,chr(159)=>602,chr(160)=>602,chr(161)=>602,chr(162)=>602,chr(163)=>602,chr(164)=>602,chr(165)=>602,chr(166)=>602,chr(167)=>602,chr(168)=>602,chr(169)=>602,chr(170)=>602,chr(171)=>602,chr(172)=>602,chr(173)=>602,chr(174)=>602,chr(175)=>602,
+	chr(176)=>602,chr(177)=>602,chr(178)=>602,chr(179)=>602,chr(180)=>602,chr(181)=>602,chr(182)=>602,chr(183)=>602,chr(184)=>602,chr(185)=>602,chr(186)=>602,chr(187)=>602,chr(188)=>602,chr(189)=>602,chr(190)=>602,chr(191)=>602,chr(192)=>602,chr(193)=>602,chr(194)=>602,chr(195)=>602,chr(196)=>602,chr(197)=>602,
+	chr(198)=>602,chr(199)=>602,chr(200)=>602,chr(201)=>602,chr(202)=>602,chr(203)=>602,chr(204)=>602,chr(205)=>602,chr(206)=>602,chr(207)=>602,chr(208)=>602,chr(209)=>602,chr(210)=>602,chr(211)=>602,chr(212)=>602,chr(213)=>602,chr(214)=>602,chr(215)=>602,chr(216)=>602,chr(217)=>602,chr(218)=>602,chr(219)=>602,
+	chr(220)=>602,chr(221)=>602,chr(222)=>602,chr(223)=>602,chr(224)=>602,chr(225)=>602,chr(226)=>602,chr(227)=>602,chr(228)=>602,chr(229)=>602,chr(230)=>602,chr(231)=>602,chr(232)=>602,chr(233)=>602,chr(234)=>602,chr(235)=>602,chr(236)=>602,chr(237)=>602,chr(238)=>602,chr(239)=>602,chr(240)=>602,chr(241)=>602,
+	chr(242)=>602,chr(243)=>602,chr(244)=>602,chr(245)=>602,chr(246)=>602,chr(247)=>602,chr(248)=>602,chr(249)=>602,chr(250)=>602,chr(251)=>602,chr(252)=>602,chr(253)=>602,chr(254)=>602,chr(255)=>602);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraMoBI.z';
+$originalsize=55032;
+?>
diff --git a/include/fonts/VeraMoBI.z b/include/fonts/VeraMoBI.z
new file mode 100644
index 0000000..9ef6a31
Binary files /dev/null and b/include/fonts/VeraMoBI.z differ
diff --git a/include/fonts/VeraMoBd.php b/include/fonts/VeraMoBd.php
new file mode 100644
index 0000000..3b1074d
--- /dev/null
+++ b/include/fonts/VeraMoBd.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSansMono-Bold';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>33,'FontBBox'=>'[-19 -236 606 928]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>602);
+$up=-108;
+$ut=120;
+$cw=array(
+	chr(0)=>602,chr(1)=>602,chr(2)=>602,chr(3)=>602,chr(4)=>602,chr(5)=>602,chr(6)=>602,chr(7)=>602,chr(8)=>602,chr(9)=>602,chr(10)=>602,chr(11)=>602,chr(12)=>602,chr(13)=>602,chr(14)=>602,chr(15)=>602,chr(16)=>602,chr(17)=>602,chr(18)=>602,chr(19)=>602,chr(20)=>602,chr(21)=>602,
+	chr(22)=>602,chr(23)=>602,chr(24)=>602,chr(25)=>602,chr(26)=>602,chr(27)=>602,chr(28)=>602,chr(29)=>602,chr(30)=>602,chr(31)=>602,' '=>602,'!'=>602,'"'=>602,'#'=>602,'$'=>602,'%'=>602,'&'=>602,'\''=>602,'('=>602,')'=>602,'*'=>602,'+'=>602,
+	','=>602,'-'=>602,'.'=>602,'/'=>602,'0'=>602,'1'=>602,'2'=>602,'3'=>602,'4'=>602,'5'=>602,'6'=>602,'7'=>602,'8'=>602,'9'=>602,':'=>602,';'=>602,'<'=>602,'='=>602,'>'=>602,'?'=>602,'@'=>602,'A'=>602,
+	'B'=>602,'C'=>602,'D'=>602,'E'=>602,'F'=>602,'G'=>602,'H'=>602,'I'=>602,'J'=>602,'K'=>602,'L'=>602,'M'=>602,'N'=>602,'O'=>602,'P'=>602,'Q'=>602,'R'=>602,'S'=>602,'T'=>602,'U'=>602,'V'=>602,'W'=>602,
+	'X'=>602,'Y'=>602,'Z'=>602,'['=>602,'\\'=>602,']'=>602,'^'=>602,'_'=>602,'`'=>602,'a'=>602,'b'=>602,'c'=>602,'d'=>602,'e'=>602,'f'=>602,'g'=>602,'h'=>602,'i'=>602,'j'=>602,'k'=>602,'l'=>602,'m'=>602,
+	'n'=>602,'o'=>602,'p'=>602,'q'=>602,'r'=>602,'s'=>602,'t'=>602,'u'=>602,'v'=>602,'w'=>602,'x'=>602,'y'=>602,'z'=>602,'{'=>602,'|'=>602,'}'=>602,'~'=>602,chr(127)=>602,chr(128)=>602,chr(129)=>602,chr(130)=>602,chr(131)=>602,
+	chr(132)=>602,chr(133)=>602,chr(134)=>602,chr(135)=>602,chr(136)=>602,chr(137)=>602,chr(138)=>602,chr(139)=>602,chr(140)=>602,chr(141)=>602,chr(142)=>602,chr(143)=>602,chr(144)=>602,chr(145)=>602,chr(146)=>602,chr(147)=>602,chr(148)=>602,chr(149)=>602,chr(150)=>602,chr(151)=>602,chr(152)=>602,chr(153)=>602,
+	chr(154)=>602,chr(155)=>602,chr(156)=>602,chr(157)=>602,chr(158)=>602,chr(159)=>602,chr(160)=>602,chr(161)=>602,chr(162)=>602,chr(163)=>602,chr(164)=>602,chr(165)=>602,chr(166)=>602,chr(167)=>602,chr(168)=>602,chr(169)=>602,chr(170)=>602,chr(171)=>602,chr(172)=>602,chr(173)=>602,chr(174)=>602,chr(175)=>602,
+	chr(176)=>602,chr(177)=>602,chr(178)=>602,chr(179)=>602,chr(180)=>602,chr(181)=>602,chr(182)=>602,chr(183)=>602,chr(184)=>602,chr(185)=>602,chr(186)=>602,chr(187)=>602,chr(188)=>602,chr(189)=>602,chr(190)=>602,chr(191)=>602,chr(192)=>602,chr(193)=>602,chr(194)=>602,chr(195)=>602,chr(196)=>602,chr(197)=>602,
+	chr(198)=>602,chr(199)=>602,chr(200)=>602,chr(201)=>602,chr(202)=>602,chr(203)=>602,chr(204)=>602,chr(205)=>602,chr(206)=>602,chr(207)=>602,chr(208)=>602,chr(209)=>602,chr(210)=>602,chr(211)=>602,chr(212)=>602,chr(213)=>602,chr(214)=>602,chr(215)=>602,chr(216)=>602,chr(217)=>602,chr(218)=>602,chr(219)=>602,
+	chr(220)=>602,chr(221)=>602,chr(222)=>602,chr(223)=>602,chr(224)=>602,chr(225)=>602,chr(226)=>602,chr(227)=>602,chr(228)=>602,chr(229)=>602,chr(230)=>602,chr(231)=>602,chr(232)=>602,chr(233)=>602,chr(234)=>602,chr(235)=>602,chr(236)=>602,chr(237)=>602,chr(238)=>602,chr(239)=>602,chr(240)=>602,chr(241)=>602,
+	chr(242)=>602,chr(243)=>602,chr(244)=>602,chr(245)=>602,chr(246)=>602,chr(247)=>602,chr(248)=>602,chr(249)=>602,chr(250)=>602,chr(251)=>602,chr(252)=>602,chr(253)=>602,chr(254)=>602,chr(255)=>602);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraMoBd.z';
+$originalsize=49052;
+?>
diff --git a/include/fonts/VeraMoBd.z b/include/fonts/VeraMoBd.z
new file mode 100644
index 0000000..8aae085
Binary files /dev/null and b/include/fonts/VeraMoBd.z differ
diff --git a/include/fonts/VeraMoIt.php b/include/fonts/VeraMoIt.php
new file mode 100644
index 0000000..129af5d
--- /dev/null
+++ b/include/fonts/VeraMoIt.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSansMono-Oblique';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>97,'FontBBox'=>'[-71 -236 691 928]','ItalicAngle'=>-11,'StemV'=>70,'MissingWidth'=>602);
+$up=-104;
+$ut=69;
+$cw=array(
+	chr(0)=>602,chr(1)=>602,chr(2)=>602,chr(3)=>602,chr(4)=>602,chr(5)=>602,chr(6)=>602,chr(7)=>602,chr(8)=>602,chr(9)=>602,chr(10)=>602,chr(11)=>602,chr(12)=>602,chr(13)=>602,chr(14)=>602,chr(15)=>602,chr(16)=>602,chr(17)=>602,chr(18)=>602,chr(19)=>602,chr(20)=>602,chr(21)=>602,
+	chr(22)=>602,chr(23)=>602,chr(24)=>602,chr(25)=>602,chr(26)=>602,chr(27)=>602,chr(28)=>602,chr(29)=>602,chr(30)=>602,chr(31)=>602,' '=>602,'!'=>602,'"'=>602,'#'=>602,'$'=>602,'%'=>602,'&'=>602,'\''=>602,'('=>602,')'=>602,'*'=>602,'+'=>602,
+	','=>602,'-'=>602,'.'=>602,'/'=>602,'0'=>602,'1'=>602,'2'=>602,'3'=>602,'4'=>602,'5'=>602,'6'=>602,'7'=>602,'8'=>602,'9'=>602,':'=>602,';'=>602,'<'=>602,'='=>602,'>'=>602,'?'=>602,'@'=>602,'A'=>602,
+	'B'=>602,'C'=>602,'D'=>602,'E'=>602,'F'=>602,'G'=>602,'H'=>602,'I'=>602,'J'=>602,'K'=>602,'L'=>602,'M'=>602,'N'=>602,'O'=>602,'P'=>602,'Q'=>602,'R'=>602,'S'=>602,'T'=>602,'U'=>602,'V'=>602,'W'=>602,
+	'X'=>602,'Y'=>602,'Z'=>602,'['=>602,'\\'=>602,']'=>602,'^'=>602,'_'=>602,'`'=>602,'a'=>602,'b'=>602,'c'=>602,'d'=>602,'e'=>602,'f'=>602,'g'=>602,'h'=>602,'i'=>602,'j'=>602,'k'=>602,'l'=>602,'m'=>602,
+	'n'=>602,'o'=>602,'p'=>602,'q'=>602,'r'=>602,'s'=>602,'t'=>602,'u'=>602,'v'=>602,'w'=>602,'x'=>602,'y'=>602,'z'=>602,'{'=>602,'|'=>602,'}'=>602,'~'=>602,chr(127)=>602,chr(128)=>602,chr(129)=>602,chr(130)=>602,chr(131)=>602,
+	chr(132)=>602,chr(133)=>602,chr(134)=>602,chr(135)=>602,chr(136)=>602,chr(137)=>602,chr(138)=>602,chr(139)=>602,chr(140)=>602,chr(141)=>602,chr(142)=>602,chr(143)=>602,chr(144)=>602,chr(145)=>602,chr(146)=>602,chr(147)=>602,chr(148)=>602,chr(149)=>602,chr(150)=>602,chr(151)=>602,chr(152)=>602,chr(153)=>602,
+	chr(154)=>602,chr(155)=>602,chr(156)=>602,chr(157)=>602,chr(158)=>602,chr(159)=>602,chr(160)=>602,chr(161)=>602,chr(162)=>602,chr(163)=>602,chr(164)=>602,chr(165)=>602,chr(166)=>602,chr(167)=>602,chr(168)=>602,chr(169)=>602,chr(170)=>602,chr(171)=>602,chr(172)=>602,chr(173)=>602,chr(174)=>602,chr(175)=>602,
+	chr(176)=>602,chr(177)=>602,chr(178)=>602,chr(179)=>602,chr(180)=>602,chr(181)=>602,chr(182)=>602,chr(183)=>602,chr(184)=>602,chr(185)=>602,chr(186)=>602,chr(187)=>602,chr(188)=>602,chr(189)=>602,chr(190)=>602,chr(191)=>602,chr(192)=>602,chr(193)=>602,chr(194)=>602,chr(195)=>602,chr(196)=>602,chr(197)=>602,
+	chr(198)=>602,chr(199)=>602,chr(200)=>602,chr(201)=>602,chr(202)=>602,chr(203)=>602,chr(204)=>602,chr(205)=>602,chr(206)=>602,chr(207)=>602,chr(208)=>602,chr(209)=>602,chr(210)=>602,chr(211)=>602,chr(212)=>602,chr(213)=>602,chr(214)=>602,chr(215)=>602,chr(216)=>602,chr(217)=>602,chr(218)=>602,chr(219)=>602,
+	chr(220)=>602,chr(221)=>602,chr(222)=>602,chr(223)=>602,chr(224)=>602,chr(225)=>602,chr(226)=>602,chr(227)=>602,chr(228)=>602,chr(229)=>602,chr(230)=>602,chr(231)=>602,chr(232)=>602,chr(233)=>602,chr(234)=>602,chr(235)=>602,chr(236)=>602,chr(237)=>602,chr(238)=>602,chr(239)=>602,chr(240)=>602,chr(241)=>602,
+	chr(242)=>602,chr(243)=>602,chr(244)=>602,chr(245)=>602,chr(246)=>602,chr(247)=>602,chr(248)=>602,chr(249)=>602,chr(250)=>602,chr(251)=>602,chr(252)=>602,chr(253)=>602,chr(254)=>602,chr(255)=>602);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraMoIt.z';
+$originalsize=54508;
+?>
diff --git a/include/fonts/VeraMoIt.z b/include/fonts/VeraMoIt.z
new file mode 100644
index 0000000..de24404
Binary files /dev/null and b/include/fonts/VeraMoIt.z differ
diff --git a/include/fonts/VeraMono.php b/include/fonts/VeraMono.php
new file mode 100644
index 0000000..4de89da
--- /dev/null
+++ b/include/fonts/VeraMono.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSansMono-Roman';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>33,'FontBBox'=>'[-5 -236 606 928]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>602);
+$up=-104;
+$ut=69;
+$cw=array(
+	chr(0)=>602,chr(1)=>602,chr(2)=>602,chr(3)=>602,chr(4)=>602,chr(5)=>602,chr(6)=>602,chr(7)=>602,chr(8)=>602,chr(9)=>602,chr(10)=>602,chr(11)=>602,chr(12)=>602,chr(13)=>602,chr(14)=>602,chr(15)=>602,chr(16)=>602,chr(17)=>602,chr(18)=>602,chr(19)=>602,chr(20)=>602,chr(21)=>602,
+	chr(22)=>602,chr(23)=>602,chr(24)=>602,chr(25)=>602,chr(26)=>602,chr(27)=>602,chr(28)=>602,chr(29)=>602,chr(30)=>602,chr(31)=>602,' '=>602,'!'=>602,'"'=>602,'#'=>602,'$'=>602,'%'=>602,'&'=>602,'\''=>602,'('=>602,')'=>602,'*'=>602,'+'=>602,
+	','=>602,'-'=>602,'.'=>602,'/'=>602,'0'=>602,'1'=>602,'2'=>602,'3'=>602,'4'=>602,'5'=>602,'6'=>602,'7'=>602,'8'=>602,'9'=>602,':'=>602,';'=>602,'<'=>602,'='=>602,'>'=>602,'?'=>602,'@'=>602,'A'=>602,
+	'B'=>602,'C'=>602,'D'=>602,'E'=>602,'F'=>602,'G'=>602,'H'=>602,'I'=>602,'J'=>602,'K'=>602,'L'=>602,'M'=>602,'N'=>602,'O'=>602,'P'=>602,'Q'=>602,'R'=>602,'S'=>602,'T'=>602,'U'=>602,'V'=>602,'W'=>602,
+	'X'=>602,'Y'=>602,'Z'=>602,'['=>602,'\\'=>602,']'=>602,'^'=>602,'_'=>602,'`'=>602,'a'=>602,'b'=>602,'c'=>602,'d'=>602,'e'=>602,'f'=>602,'g'=>602,'h'=>602,'i'=>602,'j'=>602,'k'=>602,'l'=>602,'m'=>602,
+	'n'=>602,'o'=>602,'p'=>602,'q'=>602,'r'=>602,'s'=>602,'t'=>602,'u'=>602,'v'=>602,'w'=>602,'x'=>602,'y'=>602,'z'=>602,'{'=>602,'|'=>602,'}'=>602,'~'=>602,chr(127)=>602,chr(128)=>602,chr(129)=>602,chr(130)=>602,chr(131)=>602,
+	chr(132)=>602,chr(133)=>602,chr(134)=>602,chr(135)=>602,chr(136)=>602,chr(137)=>602,chr(138)=>602,chr(139)=>602,chr(140)=>602,chr(141)=>602,chr(142)=>602,chr(143)=>602,chr(144)=>602,chr(145)=>602,chr(146)=>602,chr(147)=>602,chr(148)=>602,chr(149)=>602,chr(150)=>602,chr(151)=>602,chr(152)=>602,chr(153)=>602,
+	chr(154)=>602,chr(155)=>602,chr(156)=>602,chr(157)=>602,chr(158)=>602,chr(159)=>602,chr(160)=>602,chr(161)=>602,chr(162)=>602,chr(163)=>602,chr(164)=>602,chr(165)=>602,chr(166)=>602,chr(167)=>602,chr(168)=>602,chr(169)=>602,chr(170)=>602,chr(171)=>602,chr(172)=>602,chr(173)=>602,chr(174)=>602,chr(175)=>602,
+	chr(176)=>602,chr(177)=>602,chr(178)=>602,chr(179)=>602,chr(180)=>602,chr(181)=>602,chr(182)=>602,chr(183)=>602,chr(184)=>602,chr(185)=>602,chr(186)=>602,chr(187)=>602,chr(188)=>602,chr(189)=>602,chr(190)=>602,chr(191)=>602,chr(192)=>602,chr(193)=>602,chr(194)=>602,chr(195)=>602,chr(196)=>602,chr(197)=>602,
+	chr(198)=>602,chr(199)=>602,chr(200)=>602,chr(201)=>602,chr(202)=>602,chr(203)=>602,chr(204)=>602,chr(205)=>602,chr(206)=>602,chr(207)=>602,chr(208)=>602,chr(209)=>602,chr(210)=>602,chr(211)=>602,chr(212)=>602,chr(213)=>602,chr(214)=>602,chr(215)=>602,chr(216)=>602,chr(217)=>602,chr(218)=>602,chr(219)=>602,
+	chr(220)=>602,chr(221)=>602,chr(222)=>602,chr(223)=>602,chr(224)=>602,chr(225)=>602,chr(226)=>602,chr(227)=>602,chr(228)=>602,chr(229)=>602,chr(230)=>602,chr(231)=>602,chr(232)=>602,chr(233)=>602,chr(234)=>602,chr(235)=>602,chr(236)=>602,chr(237)=>602,chr(238)=>602,chr(239)=>602,chr(240)=>602,chr(241)=>602,
+	chr(242)=>602,chr(243)=>602,chr(244)=>602,chr(245)=>602,chr(246)=>602,chr(247)=>602,chr(248)=>602,chr(249)=>602,chr(250)=>602,chr(251)=>602,chr(252)=>602,chr(253)=>602,chr(254)=>602,chr(255)=>602);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraMono.z';
+$originalsize=49224;
+?>
diff --git a/include/fonts/VeraMono.z b/include/fonts/VeraMono.z
new file mode 100644
index 0000000..4c6eb76
Binary files /dev/null and b/include/fonts/VeraMono.z differ
diff --git a/include/fonts/VeraSe.php b/include/fonts/VeraSe.php
new file mode 100644
index 0000000..a0968b9
--- /dev/null
+++ b/include/fonts/VeraSe.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSerif-Roman';
+$desc=array('Ascent'=>928,'Descent'=>-236,'CapHeight'=>729,'Flags'=>32,'FontBBox'=>'[-183 -236 1287 928]','ItalicAngle'=>0,'StemV'=>70,'MissingWidth'=>600);
+$up=-104;
+$ut=65;
+$cw=array(
+	chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+	chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>318,'!'=>402,'"'=>460,'#'=>838,'$'=>636,'%'=>950,'&'=>890,'\''=>275,'('=>390,')'=>390,'*'=>500,'+'=>838,
+	','=>318,'-'=>338,'.'=>318,'/'=>337,'0'=>636,'1'=>636,'2'=>636,'3'=>636,'4'=>636,'5'=>636,'6'=>636,'7'=>636,'8'=>636,'9'=>636,':'=>337,';'=>337,'<'=>838,'='=>838,'>'=>838,'?'=>536,'@'=>1000,'A'=>722,
+	'B'=>735,'C'=>765,'D'=>802,'E'=>730,'F'=>694,'G'=>799,'H'=>872,'I'=>395,'J'=>401,'K'=>747,'L'=>664,'M'=>1024,'N'=>875,'O'=>820,'P'=>673,'Q'=>820,'R'=>753,'S'=>685,'T'=>667,'U'=>843,'V'=>722,'W'=>1028,
+	'X'=>712,'Y'=>660,'Z'=>695,'['=>390,'\\'=>337,']'=>390,'^'=>838,'_'=>500,'`'=>500,'a'=>596,'b'=>640,'c'=>560,'d'=>640,'e'=>592,'f'=>370,'g'=>640,'h'=>644,'i'=>320,'j'=>310,'k'=>606,'l'=>320,'m'=>948,
+	'n'=>644,'o'=>602,'p'=>640,'q'=>640,'r'=>478,'s'=>513,'t'=>402,'u'=>644,'v'=>565,'w'=>856,'x'=>564,'y'=>565,'z'=>527,'{'=>636,'|'=>337,'}'=>636,'~'=>838,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>600,
+	chr(132)=>600,chr(133)=>600,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>600,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+	chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>318,chr(161)=>402,chr(162)=>636,chr(163)=>636,chr(164)=>636,chr(165)=>636,chr(166)=>685,chr(167)=>500,chr(168)=>513,chr(169)=>1000,chr(170)=>475,chr(171)=>612,chr(172)=>838,chr(173)=>338,chr(174)=>1000,chr(175)=>500,
+	chr(176)=>500,chr(177)=>838,chr(178)=>401,chr(179)=>401,chr(180)=>695,chr(181)=>650,chr(182)=>636,chr(183)=>318,chr(184)=>527,chr(185)=>401,chr(186)=>470,chr(187)=>612,chr(188)=>1137,chr(189)=>989,chr(190)=>660,chr(191)=>536,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1001,chr(199)=>765,chr(200)=>730,chr(201)=>730,chr(202)=>730,chr(203)=>730,chr(204)=>395,chr(205)=>395,chr(206)=>395,chr(207)=>395,chr(208)=>807,chr(209)=>875,chr(210)=>820,chr(211)=>820,chr(212)=>820,chr(213)=>820,chr(214)=>820,chr(215)=>838,chr(216)=>820,chr(217)=>843,chr(218)=>843,chr(219)=>843,
+	chr(220)=>843,chr(221)=>660,chr(222)=>676,chr(223)=>668,chr(224)=>596,chr(225)=>596,chr(226)=>596,chr(227)=>596,chr(228)=>596,chr(229)=>596,chr(230)=>940,chr(231)=>560,chr(232)=>592,chr(233)=>592,chr(234)=>592,chr(235)=>592,chr(236)=>320,chr(237)=>320,chr(238)=>320,chr(239)=>320,chr(240)=>602,chr(241)=>644,
+	chr(242)=>602,chr(243)=>602,chr(244)=>602,chr(245)=>602,chr(246)=>602,chr(247)=>838,chr(248)=>602,chr(249)=>644,chr(250)=>644,chr(251)=>644,chr(252)=>644,chr(253)=>565,chr(254)=>640,chr(255)=>565);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraSe.z';
+$originalsize=60280;
+?>
diff --git a/include/fonts/VeraSe.z b/include/fonts/VeraSe.z
new file mode 100644
index 0000000..e228cce
Binary files /dev/null and b/include/fonts/VeraSe.z differ
diff --git a/include/fonts/VeraSeBd.php b/include/fonts/VeraSeBd.php
new file mode 100644
index 0000000..bd2657f
--- /dev/null
+++ b/include/fonts/VeraSeBd.php
@@ -0,0 +1,24 @@
+<?php
+$type='TrueType';
+$name='BitstreamVeraSerif-Bold';
+$desc=array('Ascent'=>939,'Descent'=>-236,'CapHeight'=>729,'Flags'=>32,'FontBBox'=>'[-186 -236 1361 939]','ItalicAngle'=>0,'StemV'=>120,'MissingWidth'=>600);
+$up=-106;
+$ut=117;
+$cw=array(
+	chr(0)=>600,chr(1)=>600,chr(2)=>600,chr(3)=>600,chr(4)=>600,chr(5)=>600,chr(6)=>600,chr(7)=>600,chr(8)=>600,chr(9)=>600,chr(10)=>600,chr(11)=>600,chr(12)=>600,chr(13)=>600,chr(14)=>600,chr(15)=>600,chr(16)=>600,chr(17)=>600,chr(18)=>600,chr(19)=>600,chr(20)=>600,chr(21)=>600,
+	chr(22)=>600,chr(23)=>600,chr(24)=>600,chr(25)=>600,chr(26)=>600,chr(27)=>600,chr(28)=>600,chr(29)=>600,chr(30)=>600,chr(31)=>600,' '=>348,'!'=>439,'"'=>521,'#'=>838,'$'=>696,'%'=>950,'&'=>903,'\''=>306,'('=>473,')'=>473,'*'=>523,'+'=>838,
+	','=>348,'-'=>415,'.'=>348,'/'=>365,'0'=>696,'1'=>696,'2'=>696,'3'=>696,'4'=>696,'5'=>696,'6'=>696,'7'=>696,'8'=>696,'9'=>696,':'=>369,';'=>369,'<'=>838,'='=>838,'>'=>838,'?'=>586,'@'=>1000,'A'=>776,
+	'B'=>845,'C'=>796,'D'=>867,'E'=>762,'F'=>710,'G'=>854,'H'=>945,'I'=>468,'J'=>473,'K'=>869,'L'=>703,'M'=>1107,'N'=>914,'O'=>871,'P'=>752,'Q'=>871,'R'=>831,'S'=>722,'T'=>744,'U'=>872,'V'=>776,'W'=>1123,
+	'X'=>776,'Y'=>714,'Z'=>730,'['=>473,'\\'=>365,']'=>473,'^'=>838,'_'=>500,'`'=>500,'a'=>648,'b'=>699,'c'=>609,'d'=>699,'e'=>636,'f'=>430,'g'=>699,'h'=>727,'i'=>380,'j'=>362,'k'=>693,'l'=>380,'m'=>1058,
+	'n'=>727,'o'=>667,'p'=>699,'q'=>699,'r'=>527,'s'=>563,'t'=>462,'u'=>727,'v'=>581,'w'=>861,'x'=>596,'y'=>581,'z'=>568,'{'=>643,'|'=>364,'}'=>643,'~'=>838,chr(127)=>600,chr(128)=>600,chr(129)=>600,chr(130)=>600,chr(131)=>600,
+	chr(132)=>600,chr(133)=>600,chr(134)=>600,chr(135)=>600,chr(136)=>600,chr(137)=>600,chr(138)=>600,chr(139)=>600,chr(140)=>600,chr(141)=>600,chr(142)=>600,chr(143)=>600,chr(144)=>600,chr(145)=>600,chr(146)=>600,chr(147)=>600,chr(148)=>600,chr(149)=>600,chr(150)=>600,chr(151)=>600,chr(152)=>600,chr(153)=>600,
+	chr(154)=>600,chr(155)=>600,chr(156)=>600,chr(157)=>600,chr(158)=>600,chr(159)=>600,chr(160)=>348,chr(161)=>439,chr(162)=>696,chr(163)=>696,chr(164)=>696,chr(165)=>696,chr(166)=>722,chr(167)=>523,chr(168)=>563,chr(169)=>1000,chr(170)=>487,chr(171)=>625,chr(172)=>838,chr(173)=>415,chr(174)=>1000,chr(175)=>500,
+	chr(176)=>500,chr(177)=>838,chr(178)=>438,chr(179)=>438,chr(180)=>730,chr(181)=>732,chr(182)=>636,chr(183)=>348,chr(184)=>568,chr(185)=>438,chr(186)=>500,chr(187)=>625,chr(188)=>1180,chr(189)=>1028,chr(190)=>714,chr(191)=>586,chr(192)=>776,chr(193)=>776,chr(194)=>776,chr(195)=>776,chr(196)=>776,chr(197)=>776,
+	chr(198)=>1034,chr(199)=>796,chr(200)=>762,chr(201)=>762,chr(202)=>762,chr(203)=>762,chr(204)=>468,chr(205)=>468,chr(206)=>468,chr(207)=>468,chr(208)=>874,chr(209)=>914,chr(210)=>871,chr(211)=>871,chr(212)=>871,chr(213)=>871,chr(214)=>871,chr(215)=>838,chr(216)=>871,chr(217)=>872,chr(218)=>872,chr(219)=>872,
+	chr(220)=>872,chr(221)=>714,chr(222)=>757,chr(223)=>760,chr(224)=>648,chr(225)=>648,chr(226)=>648,chr(227)=>648,chr(228)=>648,chr(229)=>648,chr(230)=>975,chr(231)=>609,chr(232)=>636,chr(233)=>636,chr(234)=>636,chr(235)=>636,chr(236)=>380,chr(237)=>380,chr(238)=>380,chr(239)=>380,chr(240)=>667,chr(241)=>727,
+	chr(242)=>667,chr(243)=>667,chr(244)=>667,chr(245)=>667,chr(246)=>667,chr(247)=>838,chr(248)=>667,chr(249)=>727,chr(250)=>727,chr(251)=>727,chr(252)=>727,chr(253)=>581,chr(254)=>699,chr(255)=>581);
+$enc='ISO-8859-15';
+$diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis';
+$file='VeraSeBd.z';
+$originalsize=58736;
+?>
diff --git a/include/fonts/VeraSeBd.z b/include/fonts/VeraSeBd.z
new file mode 100644
index 0000000..b94115b
Binary files /dev/null and b/include/fonts/VeraSeBd.z differ
diff --git a/include/texify.inc.php b/include/texify.inc.php
deleted file mode 100644
index e6df11d..0000000
--- a/include/texify.inc.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program 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 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program 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 this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-/*
- * Fonctions de générations de tex pour les pages de .org
- * Auteur original : Pierre HABOUZIT
- */
-
-/** Fonction qui gère les pdflatexisations :)
- * Compile le code latex en pdf et le propose à l'upload
- * @param   $texte  le texte à texifier
- */
-function tex_to_pdf($texte) {
-    global $pdf_tmp_dir;
-    set_time_limit(300); // timeout de 5 minutes au cas où le texte serait gros
-                         // et pdflatex lent
-    $pdf_tmp_dir=('/tmp/mescontacts_'.Session::get('forlife'));
-    // fonction pour effacer le rep temporaire
-    function clean_tmp_dir() {
-        global $pdf_tmp_dir;
-        system("rm -rf $pdf_tmp_dir");
-    }
-    // nétoyage du repertoire avant tout
-    clean_tmp_dir();
-
-    // programme le nétoyage du répertoire à la fin du script
-    // utile pour faire le nétoyage même en cas de fermeture prématurée
-    // de la connexion par le client
-    register_shutdown_function("clean_tmp_dir");
-    
-    mkdir($pdf_tmp_dir, 0777);
-    
-    $texf = fopen("$pdf_tmp_dir/contacts.tex", "w");
-    fwrite($texf, $texte);
-    fclose($texf);
-    system("cd $pdf_tmp_dir; pdflatex --interaction nonstopmode contacts.tex &>/dev/null");
-
-    // sortie en PDF
-    header("Pragma: ");
-    header("Cache-Control: ");
-    header("Content-type: application/pdf");
-    // force le nom du fichier final 
-#    header("Content-Disposition: attachment; filename=mes_contacts.pdf");
-
-    readfile("$pdf_tmp_dir/contacts.pdf", "r");
-    
-    // le nétoyage du répertoire est fait par la fonction clean_tmp_dir
-    // exécutée à la fin du script grâce à register_shutdown_function.
-}
-
-/** Hearders LaTeX pour la feuille de contacts
- * @return en têtes tex pour la feuille de contacts (imprimercontacts.php)
- */
-function contacts_headers() {
-    return "\\documentclass[twocolumn,a4paper,10pt,oneside]{article}\n"
-	.  "\\usepackage[francais]{babel}\n"
-	.  "\\usepackage[latin9]{inputenc}\n"
-	.  "\\usepackage[T1]{fontenc}\n"
-	.  "\\addtolength{\\hoffset}{-1.5cm} \\addtolength{\\textwidth}{3cm}\n"
-	.  "\\addtolength{\\voffset}{-2cm} \\addtolength{\\textheight}{4cm}\n"
-	.  "\\usepackage{tabularx,float}\n"
-	.  "\n"
-	.  "\\makeatletter\n"
-	.  "\\renewcommand{\\@oddhead}{\\small\\hfill "
-		." {\\bf\\Large Mes contacts sur Polytechnique.org\$^\\ast\$}"
-	.  "\\renewcommand{\\@evenhead}{\\@oddhead}\n"
-		." \\hfill}\n"
-	.  "\\renewcommand{\\@oddfoot}{\\small\\hfill "
-		." {\\bf \$^\\ast\$ Informations limitées à un usage strictement personnel et non commercial}"
-		." \\hfill}\n"
-	.  "\\renewcommand{\\@evenfoot}{\\@oddfoot}\n"
-	.  "\\makeatother\n"
-	.  "\\newcolumntype{L}{@{\\hspace{1pt}}>{\\small\\sffamily\\bfseries}l}\n"
-	.  "\\newcolumntype{T}{>{\\center\\bfseries}p{\\linewidth}}\n"
-	.  "\\renewcommand{\\tabularxcolumn}[1]{>{\\small\\raggedright\\arraybackslash}p{#1}@{\\hspace{1pt}}}\n"
-	.  "\n"
-	.  "\\begin{document}\n"
-	.  "\t\\floatstyle{plain}\n"
-	.  "\t\\newfloat{contact}{thp}{lop}\n"
-	.  "\t\\floatname{contact}{}\n"
-	.  "\n";
-}
-
-/** Footers LaTeX pour la feuille de contacts
- * @return pied de page tex pour la feuille de contacts (imprimercontacts.php)
- */
-function contacts_footer() {
-    return "\n" . "\\end{document}\n";
-}
-
-/** préfixe de tableau de contact
- * @return Préfixe de construction d'une fiche. Contient l'en tête avec le nom.
- * @param   $prenom prénom du contact
- * @param   $nom    nom du contact
- * @param   $epouse nom d'épouse
- * @param   $promo  promo
- * @param   $maj    date de dernière mise à jour de la fiche
- */
-function contact_tbl_hdr($prenom, $nom, $epouse, $promo, $maj) {
-    return "\t\\noindent\\parbox{\\linewidth}{\n"
-	.  "\t\t\\begin{tabularx}{\\linewidth}{LX}\n"
-	.  "\t\t\t\\multicolumn{2}{@{}T@{}}{\\noindent\\rule{\\linewidth}{1pt}\n\n"
-	    . "\\vspace{-2pt}$prenom $nom" . ($epouse ? " épouse $epouse" : "") . " ($promo) {\small $maj}}\\\\\n"
-	.  "\t\t\t\\hline\n";
-}
-
-/** suffixe de tableau de contact
- * @return suffixe de construction d'une fiche.
- */
-function contact_tbl_ftr() {
-    return "\t\t\\end{tabularx}\n"
-	.  "\t}\n"
-	.  "\t\\vspace{-1.5em}\n\n";
-}
-
-/** Fonction qui remplace les caractères particuliers
- * remplace les # par \# par exemple
- * @param   $texte  le texte à stripper
- * @return  le texte modifié
- */
-function tex_strip($texte) {
-    $tmp = str_replace("\\", "$\\backslash$", $texte);
-    $tmp = str_replace("#", "\\#", $tmp);
-    $tmp = str_replace("$", "\\$", $tmp);
-    $tmp = str_replace("\\$\\backslash\\$", "$\\backslash$", $texte);
-    $tmp = str_replace("%", "\\%", $tmp);
-    $tmp = str_replace("&", "\\&", $tmp);
-    $tmp = str_replace("_", "\\_", $tmp);
-    $tmp = str_replace("^", "\\^{}", $tmp);
-    return $tmp;
-}
-
-/** Génération d'un nouvel item
- * @return code TeX pour la création d'un nouveau titre de ligne de tableau
- * @param  $itemname label de la nouvelle ligne
- */
-function contact_tbl_item($itemname) {
-    return "\t\t\t" . tex_strip($itemname) . "\n";
-}
-
-/** Génération d'un contenu
- * @return code TeX pour l'insertion d'une nouvelle ligne de contenu.
- * @param  $text le-dit contenu, chaque '\n' est réinterprété.
- */
-function contact_tbl_row($text) {
-    $temp = split("\n",tex_strip($text));
-    return "\t\t\t\t&"
-	.  join("\\\\\n\t\t\t&", $temp)
-	.  "\\\\\n";
-}
-
-/** Génération d'un item + contenu
- * @return code TeX pour l'insertion d'une nouvelle ligne.
- * @param  $itemname label de la nouvelle ligne
- * @param  $text le-dit contenu, chaque '\n' est réinterprété.
- */
-function contact_tbl_entry($itemname, $text) {
-    $temp = split("\n",tex_strip($text));
-    return "\t\t\t" . tex_strip($itemname) . "\n"
-	.  "\t\t\t\t&"
-	.  join("\\\\\n\t\t\t&", $temp)
-	.  "\\\\\n";
-}
-
-?>
diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index d716e95..561d0c4 100644
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -216,6 +216,7 @@ function &get_user_details($login, $from_uid = '')
                                       FROM  groupesx_ins
                                  LEFT JOIN  groupesx_def ON groupesx_ins.gid = groupesx_def.id
                                      WHERE  guid = {?}", $uid);
+    $user['gpxs'] = Array();
     while (list($gxt, $gxu) = $res->next()) {
         $user['gpxs'][] = $gxu ? "<a href=\"$gxu\">$gxt</a>" : $gxt;
     } 
@@ -227,6 +228,7 @@ function &get_user_details($login, $from_uid = '')
                                     WHERE  uid={?}
                                  ORDER BY  ordre", $uid);
     
+    $user['applis_fmt'] = Array();
     while (list($txt, $url, $type) = $res->next()) {
         require_once('applis.func.inc.php');
         $user['applis_fmt'][] = applis_fmt($type, $txt, $url);
diff --git a/include/xorg/page.inc.php b/include/xorg/page.inc.php
index d86ba8e..9b52d17 100644
--- a/include/xorg/page.inc.php
+++ b/include/xorg/page.inc.php
@@ -19,7 +19,9 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once("diogenes.core.page.inc.php");
+require_once('diogenes.core.page.inc.php');
+require_once('xorg/errors.inc.php');
+require_once('xorg/smarty.plugins.inc.php');
 
 // {{{ class XorgPage
 
@@ -69,14 +71,11 @@ class XorgPage extends DiogenesCorePage
 
         $this->_page_type = $type;
         $this->_tpl       = $tpl;
-	require_once('xorg/errors.inc.php');
         $this->_errors    = new XOrgErrors;
 
         $this->DiogenesCorePage();
-	require_once('xorg/smarty.plugins.inc.php');
         $this->register_prefilter('at_to_globals');
 
-        $this->assign('site_dev',$globals->debug);
         $this->doAuth();
     }
 
diff --git a/templates/skin/common.devel.tpl b/templates/skin/common.devel.tpl
index 7d74f93..3fa0acd 100644
--- a/templates/skin/common.devel.tpl
+++ b/templates/skin/common.devel.tpl
@@ -18,7 +18,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************}
 
-{if $site_dev}
+{if #globals.debug#}
 {if $db_trace neq "\n\n"}
   <div id="db-trace">
     <h1>