#9 Corregido el problema de detectar http y https en el enlace de la url de llamada.

Sacada la versión y el autor del fichero de configuración.

.gitignore

@@ -1,2 +1,3 @@
 nbproject
+tmp/*
 .DS_Store

Ajax.php

@@ -1,93 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
- * @license http://www.gnu.org/licenses/gpl-3.0.txt
- * This file is part of Inventario.
- * Inventario is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Inventario 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 Inventario.  If not, see <http://www.gnu.org/licenses/>.
- */
-//Clase encargada de procesar las peticiones ajax
-require_once 'inc/configuracion.inc';
-require_once 'Sql.php';
-
-$ajax = new Ajax();
-echo $ajax->procesa();
-
-class Ajax
-{
-    private $sql;
-    private $tabla;
-
-    public function __construct()
-    {
-        $this->sql = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
-        if ($this->sql->error()) {
-            return $this->respuesta($this->mensaje(false, 'Error conectando con la Base de Datos'));
-        }
-        $this->tabla = $_GET['tabla'];
-    }
-
-    private function respuesta($mensaje)
-    {
-        header('Content-Type: application/json', true, 200);
-
-        return $mensaje;
-    }
-
-    public function procesa()
-    {
-        $opc = $_GET['opc'];
-        switch ($opc) {
-            case 'get': return $this->obtiene();
-            case 'put': return $this->actualiza();
-        }
-    }
-
-    private function mensaje($exito, $texto)
-    {
-        return json_encode(['success' => $exito, 'msj' => $texto]);
-    }
-
-    private function actualiza()
-    {
-        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
-            $comando = 'update '.mysql_escape_string($this->tabla).' set '.mysql_escape_string($_POST['name'])." = '".mysql_escape_string($_POST['value'])."' where id = '".mysql_escape_string($_POST['pk'])."';";
-            $this->sql->ejecuta($comando);
-            $exito = !$this->sql->error();
-            $mensaje = $this->sql->mensajeError();
-            $resp = $this->mensaje($exito, $mensaje);
-
-            return $this->respuesta($resp);
-        }
-    }
-
-    private function obtiene()
-    {
-        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
-            $comando = 'select id, descripcion from '.$this->tabla.' order by descripcion asc;';
-            $this->sql->ejecuta($comando);
-            $exito = !$this->sql->error();
-            $mensaje = $this->sql->mensajeError();
-            if (!$exito) {
-                return $this->respuesta($this->mensaje($exito, $mensaje));
-            }
-            $filas = [];
-            while ($r = $this->sql->procesaResultado()) {
-                $filas[] = [$r['id'] => $r['descripcion']];
-            }
-            $resp = json_encode($filas);
-
-            return $this->respuesta($resp);
-        }
-    }
-}

AportaContenido.php

@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -15,50 +17,31 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
-define('PIE', '<center><a target="_blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html"><img src="img/gplv3.png" alt="GPL v3"/></a>'.
+define('PIE', '<center><a target="_blank" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html"><img src="img/gplv3.png" alt="GPL v3"/></a>' .
-        '<a target="_blank" href="http://www.apache.org"><img src="img/apache.gif" alt="Sitio web creado con Apache" /></a>'.
+        '<a target="_blank" href="http://www.apache.org"><img src="img/apache.gif" alt="Sitio web creado con Apache" /></a>' .
-        '<a target="_blank" href="http://www.mysql.org"><img src="img/mysql.png" width=125 height=47 alt="Gestor de bases de datos mySQL" /></a>'.
+        '<a target="_blank" href="http://www.mysql.org"><img src="img/mysql.png" width=125 height=47 alt="Gestor de bases de datos mySQL" /></a>' .
         '<a target="_blank" href="http://www.php.net"><img src="img/php.gif" alt="PHP Language" /></a> </center>');
-define('FORMULARIO_ACCESO', '<form name="formulario_acceso" action="index.php?registrarse" method="POST">'.
+define('FORMULARIO_ACCESO', '<form name="formulario_acceso" action="index.php?registrarse" method="POST">' .
-        'Usuario<br><input type="text" name="usuario" value="" size="8" /><br><br>Clave<br><input type="password" name="clave" value="" size="8" />'.
+        'Usuario<br><input type="text" name="usuario" value="" size="8" /><br><br>Clave<br><input type="password" name="clave" value="" size="8" />' .
-        '<br><br><button type="submit" name="iniciar" class="btn btn-primary">Iniciar <span class="glyphicon glyphicon-log-in"></span></button></form>');
+        '<br><br><input type="submit" value="Iniciar" name="iniciar" /></form>');
 define('MENSAJE_DEMO', 'Puede Iniciar sesi&oacute;n con<br>usuario <i><b>demo</b></i><br>contrase&ntilde;a <i>demo</i><br>');
-define('USUARIO_INCORRECTO', '<label class="bg-danger">Usuario y clave incorrectos!</label><br><br>');
+define('USUARIO_INCORRECTO', '<label class="error">Usuario y clave incorrectos!</label><br><br>');
-define('CREDITOS_CABECERA', '<div class="modal fade" tabindex="-1" id="creditos" role="dialog" aria-labelledby="modalCreditos" aria-hidden="true">
-                      <div class="modal-dialog modal-lg">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                              <h4>Créditos</h4>
-                            </div>
-                            <div class="modal-body">
-                                <div class="jumbotron">
-                                    <img src="img/qrlogo.png" class="img-responsive img-rounded" style="float:left"> 
-                                    <h1>Inventario2</h1>
-                                    <p> Aplicación para controlar el inventario de un centro educativo.</p>
-                                    <p>En la aplicación se hace uso de los siguientes módulos y/o bibliotecas</p>');
-
-define('CREDITOS_PIE', '                <p><h5>Copyright &copy; 2008-2014 Ricardo Montañana Gómez</h5>
-                                    <h5><small>Esta aplicación se distribuye con licencia <a target="_blank" href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3 </a></small></h5></p>
-                                </div>
-                            </div>
-                        </div>
-                      </div>
-                    </div>');
 
 // Esta clase aportará el contenido a la plantilla
-class AportaContenido
+class AportaContenido {
-{
+
     /**
-     * @var bool Aporta información sobre si el usuario está registrado o no.
+     * 
+     * @var boolean Aporta información sobre si el usuario está registrado o no.
      */
     private $registrado;
 
     /**
      * @var string Nombre del usuario
      */
-    private $usuario = null;
+    private $usuario = NULL;
 
     /**
      * @var Menu Menú de la página.
@@ -76,7 +59,7 @@ class AportaContenido
     private $opcionActual;
 
     /**
-     * @var bool Usuario y clave incorrectos?
+     * @var boolean Usuario y clave incorrectos?
      */
     private $usuario_inc = false;
 
@@ -85,24 +68,16 @@ class AportaContenido
      */
     private $perfil;
 
-    /**
-     * @var array Datos pasados en la URL
-     */
-    private $datosURL = [];
-
     // El constructor necesita saber cuál es la opción actual
-
     /**
      * Constructor de la clase. 
-     *
      * @param BaseDatos $baseDatos Manejador de la base de datos
-     * @param bool      $registrado usuario registrado si/no
+     * @param boolean $registrado usuario registrado si/no
-     * @param string    $usuario    Nombre del usuario
+     * @param String $usuario Nombre del usuario
      * @param array $perfil Permisos de acceso del usuario
-     * @param string    $opcion     Opción elegida por el usuario
+     * @param String $opcion Opción elegida por el usuario
      */
-    public function __construct($baseDatos, $registrado, $usuario, $perfil, $opcion)
+    public function __construct($baseDatos, $registrado, $usuario, $perfil, $opcion) {
-    {
         $this->bdd = $baseDatos;
         $this->miMenu = new Menu('inc/inventario.menu');
         $this->registrado = $registrado;
@@ -112,144 +87,82 @@ class AportaContenido
     }
 
     /**
-     * Devuelve una tabla HTML con el contenido de las bibliotecas/módulos utilizadas en la aplicación
+     * Devuelve la fecha actual
-     * Si el perfil del usuario es de Configuración devuelve también las versiones de las bibliotecas.
-     *
-     * @return string
-     */
-    public function creaTablaAcercaDe()
-    {
-        $poner = $this->perfil['Config'];
-        $tabla = '<table class="table table-condensed">';
-        $tabla .= '<thead><tr><th>Biblioteca/Módulo</th>'.($poner ? '<th>Versión</th>' : '').'<th>Licencia</th></tr></thead>';
-        $tabla .= '<tbody>';
-        $tabla .= '<tr><td><a href="http://jquery.com/" target="_blank">jquery</a></td>'.($poner ? '<td>2.1.0</td>' : '').'<td><a target="_blank" href="https://jquery.org/license/">MIT</a></td>';
-        $tabla .= '<tr><td><a href="http://getbootstrap.com/" target="_blank">Twitter Bootstrap</a></td>'.($poner ? '<td>3.1.1</td>' : '').'<td><a target="_blank" href="https://github.com/twbs/bootstrap/blob/master/LICENSE">MIT</a></td>';
-        $tabla .= '<tr><td><a href="http://www.fpdf.org/" target="_blank">FPDF</a></td>'.($poner ? '<td>1.7</td>' : '').'<td>Libre</td>';
-        $tabla .= '<tr><td><a href="http://phpqrcode.sourceforge.net/" target="_blank">PHP QR Code Enconder</a></td>'.($poner ? '<td>1.1.4</td>' : '').'<td><a target="_blank" href="http://www.gnu.org/licenses/lgpl-3.0.txt">LGPL</a></td>';
-        $tabla .= '<tr><td><a href="http://stefangabos.ro/php-libraries/zebra-image/" target="_blank">Zebra_Image</a></td>'.($poner ? '<td>2.2.3</td>' : '').'<td><a target="_blank" href="http://www.gnu.org/licenses/lgpl-3.0.txt">LGPL</a></td>';
-        $tabla .= '<tr><td><a href="http://jasny.github.io/bootstrap/" target="_blank">Jasny Bootstrap</a></td>'.($poner ? '<td>3.1.0</td>' : '').'<td><a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a></td>';
-        $tabla .= '<tr><td><a href="http://1000hz.github.io/bootstrap-validator/" target="_blank">Bootstrap Validator</a></td>'.($poner ? '<td>0.2.1</td>' : '').'<td><a target="_blank" href="https://github.com/1000hz/bootstrap-validator/blob/master/LICENSE">MIT</a></td>';
-        $tabla .= '<tr><td><a href="https://github.com/tkrotoff/jquery-simplecolorpicker" target="_blank">jquery-simplecolorpicker</a></td>'.($poner ? '<td>0.3.0</td>' : '').'<td><a target="_blank" href="https://github.com/tkrotoff/jquery-simplecolorpicker/blob/master/LICENSE.txt">MIT</a></td>';
-        $tabla .= '<tr><td><a href="http://eonasdan.github.io/bootstrap-datetimepicker/" target="_blank">Bootstrap datetimepicker</a></td>'.($poner ? '<td>2.1.32</td>' : '').'<td><a target="_blank" href="https://github.com/Eonasdan/bootstrap-datetimepicker/blob/master/src/js/bootstrap-datetimepicker.js">MIT</a></td>';
-        $tabla .= '<tr><td><a href="http://silviomoreto.github.io/bootstrap-select/" target="_blank">Bootstrap-select</a></td>'.($poner ? '<td>1.5.4</td>' : '').'<td><a target="_blank" href="https://github.com/silviomoreto/bootstrap-select">MIT</a></td>';
-        $tabla .= '<tr><td><a href="https://github.com/vitalets/x-editable" target="_blank">X-editable</a></td>'.($poner ? '<td>1.5.1</td>' : '').'<td><a target="_blank" href="https://github.com/vitalets/x-editable/blob/master/LICENSE-MIT">MIT</a></td>';
-        $tabla .= '<tr><td><a href="http://momentjs.com/" target="_blank">Moment.js</a></td>'.($poner ? '<td>2.5.1</td>' : '').'<td><a target="_blank" href="https://github.com/moment/moment/blob/develop/LICENSE">MIT</a></td>';
-        $tabla .= '</tbody>';
-        $tabla .= '</table>';
-
-        return $tabla;
-    }
-
-    /**
-     * Devuelve la fecha actual.
-     *
      * @param string $formato formato de devolución de la fecha
      * @param string $idioma idioma para formatear la fecha, p.ej. es_ES
-     *
      * @return string
      */
-    public function fechaActual($formato = '', $idioma = 'es_ES')
+    public function fechaActual($formato = '', $idioma = 'es_ES') {
-    {
+        if ($formato == '')
-        if ($formato == '') {
+            $formato = "%d-%b-%y";
-            $formato = '%d-%b-%y';
-        }
         setlocale(LC_TIME, $idioma);
-
         return strftime($formato);
     }
 
     /**
+     * 
      * @return string Mensaje el usuario debe registrarse.
      */
-    private function mensajeRegistro()
+    private function mensajeRegistro() {
-    {
         return 'Debe registrarse para acceder a este apartado';
     }
 
     // Procesaremos todas las invocaciones a métodos en
     // la función __call()
-
     /**
      * Procesa las peticiones de contenido de la plantilla.
-     *
      * @param string $metodo Método a ejecutar
      * @param string $parametros Parámetros del método
-     *
      * @return string Contenido devuelto por el método
      */
-    public function __call($metodo, $parametros)
+    public function __call($metodo, $parametros) {
-    {
         switch ($metodo) { // Dependiendo del método invocado
+            case 'titulo': // devolvemos el título
+                return PROGRAMA.VERSION;
             case 'usuario':
-                if ($this->registrado) {
+                if ($this->registrado)
                     return "Usuario=$this->usuario";
-                } else {
+                else
                     return '';
-                }
+            case 'fecha': return $this->fechaActual();
-            case 'fecha':
+            case 'aplicacion': return PROGRAMA.VERSION;
-                $script = '<script type="text/javascript">
-                                $(function () {
-                                    $('."'#fechaCabecera'".").datetimepicker({
-                                        pick12HourFormat: false,
-                                        language: 'es',
-                                        pickTime: false
-                                        });
-                                });
-                                </script>";
-                $campo = '<input type="hidden" name="fechaCabecera" id="fechaCabecera" value="'.$this->fechaActual('%d/%m/%Y').'">';
-                $etiqueta = '<label for="fechaCabecera" onClick="$('."'#fechaCabecera'".").data('DateTimePicker').show();".'">'.$this->fechaActual().'</label>';
-
-                return $etiqueta.$campo.$script;
-            case 'aplicacion':
-                $nombre = explode(' ', PROGRAMA);
-                $nombre = $nombre[2];
-
-                return $nombre.' v'.VERSION;
             case 'menu': // el menú
                 if ($this->registrado) {
                     return $this->miMenu->insertaMenu();
                 } else {
                     $salida = FORMULARIO_ACCESO;
                     if ($this->usuario_inc) {
-                        $salida .= USUARIO_INCORRECTO;
+                        $salida.=USUARIO_INCORRECTO;
                     }
                     //$salida.=MENSAJE_DEMO;
                     return $salida;
                 }
             case 'opcion':
-                if (strstr($this->opcionActual, '&')) {
+                list($opcion, $parametro) = explode("&", $this->opcionActual);
-                    list($opcion, $parametro) = explode('&', $this->opcionActual);
-                } else {
-                    $opcion = $this->opcionActual;
-                    $parametro = '';
-                }
                 switch ($opcion) {
                     case 'bienvenido':
-                        return 'Men&uacute; Principal';
+                        return "Men&uacute; Principal";
                     case 'principal':
-                        return 'Pantalla Inicial';
+                        return "Pantalla Inicial";
-                    case 'articulos': $opcion = 'art&iacute;culos';
+                    case 'articulos': $opcion = "art&iacute;culos";
                     case 'elementos':
                     case 'ubicaciones':
                     case 'usuarios':
                     case 'test':
-                        return 'Mantenimiento '.ucfirst($opcion);
+                        return "Mantenimiento de " . ucfirst($opcion) . ".";
                     case 'configuracion':
-                        return 'Configuraci&oacute;n y Preferencias';
+                        return 'Configuraci&oacute;n y Preferencias.';
-                    case 'informeInventario':return 'Informe de Inventario';
+                    case 'informeInventario':return "Informe de Inventario";
                     case 'descuadres':return 'Informe de descuadres';
                     case 'importacion': return 'Importaci&oacute;n de datos';
                     case 'copiaseg': return 'Copia de seguridad de datos';
                 }
-
                 return '';
             case 'control':
-                if ($this->registrado) {
+                if ($this->registrado)
-                    return '<a href="index.php?cerrarSesion">Cerrar Sesi&oacute;n <span class="glyphicon glyphicon-log-out"></span></a>';
+                    return '<a href="index.php?cerrarSesion">Cerrar Sesi&oacute;n</a>';
-                } else {
+                else
                     return '';
-                }
             // Para incluir el contenido central de la página
             case 'contenido':
                 // tendremos en cuenta cuál es la opción actual
@@ -259,95 +172,35 @@ class AportaContenido
 //                if (!$this->registrado) {
 //                    return $this->mensajeRegistro();
 //                }
-                if (strstr($this->opcionActual, '&')) {
+                list($opcion, $parametro) = explode("&", $this->opcionActual);
-                    list($opcion, $parametro) = explode('&', $this->opcionActual);
-                } else {
-                    $opcion = $this->opcionActual;
-                    $parametro = '';
-                }
                 switch ($opcion) {
-                    case 'bienvenido':
-                        $mensaje = '<div class="alert alert-success">';
-                        $mensaje .= 'Bienvenid@ '.$this->usuario.'</div>';
                     case 'principal': // contenido inicial
-                        $mensaje = '';
+                        return '<br><br><center><img src="img/logo.png" alt="' . PROGRAMA . '">' .
-                        $creditos = "$('#creditos').modal({keyboard: false});";
+                                '<br><label>' . CENTRO . '</label></center><br><br>' . PIE;
-                        $centro = '<div class="well well-sm">'.CENTRO.'</div>';
-                        $tabla = $this->creaTablaAcercaDe();
-                        $rama_texto = trim(substr(file_get_contents('.git/HEAD'), 16));
-                        $rama = ($rama_texto != 'master' ? '<br><button class="btn btn-warning btn-xs" type="button"onClick="'.$creditos.'"><span class="glyphicon glyphicon-cog"></span> '.$rama_texto.'</button></center>' : '');
-
-                        return $mensaje.'<br><br><center><img src="img/qrlogo.png" alt="'.PROGRAMA.'" onClick="'.$creditos.'" >'.
-                                '<br><br><label onClick="'.$creditos.'">'.$centro.'</label>'.$rama.'</center>'.CREDITOS_CABECERA.$tabla.CREDITOS_PIE;
                     case 'articulos':
                     case 'ubicaciones':
                     case 'test':
                     case 'elementos':
-                        $this->cargaDatosURL();
-                        if ($this->datosURL['opc'] == 'informe') {
-                            if ($this->perfil['Informe']) {
-                                $this->procesaURL();
-                                $fichero = 'xml/informe'.ucfirst($opcion).'.xml';
-                                $salida = TMP.'/informe'.ucfirst($opcion).'.xml';
-                                //Establece los posibles parámetros del listado.
-                                $orden = $this->datosURL['orden'];
-                                $sentido = $this->datosURL['sentido'] == 'asc' ? ' ' : ' desc ';
-                                $filtro = isset($this->datosURL['buscar']) ? $this->bdd->filtra($this->datosURL['buscar']) : '';
-                                $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla '.$fichero);
-                                $plantilla = str_replace('{filtro}', $filtro, $plantilla);
-                                $plantilla = str_replace('{orden}', $orden.$sentido, $plantilla);
-                                file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla '.$salida);
-                                $informe = new InformePDF($this->bdd, $salida, $this->registrado);
-                                $informe->crea($salida);
-                                $informe->cierraPDF();
-
-                                return $this->devuelveInforme($informe);
-                            } else {
-                                return $this->mensajePermisos('Informes');
-                            }
-                        }
                         if ($this->perfil['Consulta']) {
                             $ele = new Mantenimiento($this->bdd, $this->perfil, $opcion);
-
                             return $ele->ejecuta();
                         } else {
                             return $this->mensajePermisos(ucfirst($opcion));
                         }
                     case 'usuarios':
                         if ($this->perfil['Usuarios']) {
-                            $this->cargaDatosURL();
-                            if ($this->datosURL['opc'] == 'informe') {
-                                if (!$this->pefil['Informe']) {
-                                    $this->procesaURL();
-                                    $fichero = 'xml/informe'.ucfirst($opcion).'.xml';
-                                    $salida = TMP.'/informe'.ucfirst($opcion).'.xml';
-                                    //Establece los posibles parámetros del listado.
-                                    $orden = $this->datosURL['orden'];
-                                    $sentido = $this->datosURL['sentido'] == 'asc' ? ' ' : ' desc ';
-                                    $filtro = isset($this->datosURL['buscar']) ? $this->bdd->filtra($this->datosURL['buscar']) : '';
-                                    $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla '.$fichero);
-                                    $plantilla = str_replace('{filtro}', $filtro, $plantilla);
-                                    $plantilla = str_replace('{orden}', $orden.$sentido, $plantilla);
-                                    file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla '.$salida);
-                                    $informe = new InformePDF($this->bdd, $salida, $this->registrado);
-                                    $informe->crea($salida);
-                                    $informe->cierraPDF();
-
-                                    return $this->devuelveInforme($informe);
-                                } else {
-                                    return $this->mensajePermisos('Informes');
-                                }
-                            }
                             $ele = new Mantenimiento($this->bdd, $this->perfil, $opcion);
-
                             return $ele->ejecuta();
                         } else {
                             return $this->mensajePermisos('Usuarios');
                         }
+
+                    case 'bienvenido': // El usuario quiere iniciar sesión
+                        return 'Bienvenid@ ' . $this->usuario . '<br><br><center><img src="img/codigoBarras.png" alt="' . PROGRAMA . '">' .
+                                '<br><label>' . CENTRO . '</label></center><br><br>' . PIE;
                     case 'configuracion':
                         if ($this->perfil['Config']) {
                             $conf = new Configuracion();
-
                             return $conf->ejecuta();
                         } else {
                             return $this->mensajePermisos('Configuraci&oacute;n');
@@ -355,47 +208,66 @@ class AportaContenido
                     case 'informeInventario':
                         if ($this->perfil['Informe']) {
                             $info = new InformeInventario($this->bdd);
-
                             return $info->ejecuta();
                         } else {
                             return $this->mensajePermisos('Informes');
                         }
+                    case 'descuadres':
+                        if ($this->perfil['Informe']) {
+                            $enlace = 'xml/informe' . ucfirst($opcion) . '.xml';
+                            $informe = new InformePDF($this->bdd, $enlace, $this->registrado);
+                            $informe->crea($enlace);
+                            $informe->cierraPDF();
+                            $informe->imprimeInforme();
+                            return;
+                        } else {
+                            return $this->mensajePermisos('Informes');
+                        }
                     case 'importacion':
                         if ($this->perfil['Modificacion'] && $this->perfil['Borrado']) {
                             $import = new Importacion($this->bdd, $this->registrado);
-
                             return $import->ejecuta();
                         } else {
-                            return $this->mensajePermisos('Actualizaci&oacute;n, creaci&oacute;n y borrado de elementos');
+                            return $this->mensajePermisos("Actualizaci&oacute;n, creaci&oacute;n y borrado de elementos");
                         }
                     case 'copiaseg':
                         if ($this->perfil['Config']) {
-                            $copia = new CopiaSeguridad();
+                            $archivo_sql = "tmp/copiaseg.sql";
-                            if (isset($_GET['confirmado']) && $_GET['confirmado'] == '1') {
+                            $archivo = $archivo_sql . ".gz";
-                                if (!$copia->creaCopia()) {
+                            if (file_exists($archivo)) {
-                                    $tipo = 'danger';
+                                unlink($archivo);
-                                    $cabecera = 'ERROR';
-                                } else {
-                                    $tipo = 'info';
-                                    $cabecera = 'INFORMACIÓN';
                             }
-
+                            $comando = escapeshellcmd(MYSQLDUMP . ' -u ' . USUARIO . ' --password=' . CLAVE . ' --result-file=' . $archivo_sql . ' ' . BASEDATOS);                                                       
-                                return $this->panel($cabecera, $copia->mensaje(), $tipo);
+                            $comando2 = escapeshellcmd(GZIP . ' -9f ' . $archivo_sql);                                    
+                            exec($comando);
+                            exec($comando2);
+                            if (filesize($archivo) < 1024) {
+                                //No se ha realizado la copia de seguridad
+                                $mensaje = "La copia de seguridad no se ha realizado correctamente.<br><br>";
+                                $mensaje .= "Compruebe que las rutas a los programas mysqldump y gzip en configuraci&oacute;n est&aacute;n correctamente establecidas ";
+                                $mensaje .= "y que los datos de acceso a la base de datos sean correctos.<br>";
+                                $mensaje .= "mysqldump=[" . MYSQLDUMP . "]<br>";
+                                $mensaje .= "gzip=[" . GZIP . "]";
+                                $cabecera = "ERROR";
+                                $tipo = "danger";
                             } else {
-                                return $copia->dialogo();
+                                $mensaje .= 'Copia de seguridad realizada con &eacute;xito.<br><br>Pulse sobre el siguiente enlace para descargar:<br><br>';
+                                $mensaje .= '<a href="' . $archivo . '">Descargar Copia de Seguridad de Datos</a><br>';
+                                $cabecera = "Informaci&oacute;n";
+                                $tipo = "success";
                             }
+                            return $this->panel($cabecera,$mensaje,$tipo);
                         } else {
-                            return $this->mensajePermisos('Copias de seguridad');
+                            return $this->mensajePermisos("Copias de seguridad");
                         }
                 } // Fin del contenido
             case 'usuario_incorrecto':
                 $this->usuario_inc = true;
-
                 return;
             case 'registro': // Si está registrado mostrar bienvenida
                 // si no, un enlace
                 if ($this->bEstaRegistrado) {
-                    return "Bienvenid@ <b>$this->sUsuario</b><hr />".
+                    return "Bienvenid@ <b>$this->sUsuario</b><hr />" .
                             '<a href="index.php?cerrarSesion">Cerrar sesi&oacute;n</a>';
                 } else {
                     return '';
@@ -405,47 +277,24 @@ class AportaContenido
         }
     }
 
-    public function cargaDatosURL()
-    {
-        $this->datosURL['opc'] = isset($_GET['opc']) ? $_GET['opc'] : 'inicial';
-        $this->datosURL['orden'] = isset($_GET['orden']) ? $_GET['orden'] : 'id';
-        $this->datosURL['sentido'] = isset($_GET['sentido']) ? $_GET['sentido'] : 'asc';
-        $this->datosURL['pag'] = isset($_GET['pag']) ? $_GET['pag'] : '0';
-        $this->datosURL['buscar'] = isset($_GET['buscar']) ? $_GET['buscar'] : null;
-        $this->datosURL['id'] = isset($_GET['id']) ? $_GET['id'] : null;
-    }
-
     /**
-     * @param string $tipo
      *
+     * @param string $tipo
      * @return string
      */
-    public function mensajePermisos($tipo)
+    public function mensajePermisos($tipo) {
-    {
+        return $this->panel("ERROR", "No tiene permiso para acceder a $tipo", "danger");
-        return $this->panel('ERROR', "No tiene permiso para acceder a $tipo", 'danger');
     }
 
-    private function devuelveInforme($informe)
+    public function panel($cabecera, $mensaje, $tipo) {
-    {
+        $panel = '<div class="panel panel-' . $tipo . '"><div class="panel-heading">';
-        $letras = 'abcefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+        $panel .= '<h3 class="panel-title">' . $cabecera . '</h3></div>';
-        $nombre = TMP.'/informe'.substr(str_shuffle($letras), 0, 10).'.pdf';
-        $informe->guardaArchivo($nombre);
-
-        return '<div class="container">
-                    <!--<a href="'.$nombre.'" target="_blank"><span class="glyphicon glyphicon-cloud-download" style="font-size:1.5em;"></span>Descargar Informe</a>--> 
-                    <object data="'.$nombre.'" type="application/pdf" width="100%" height="700" style="float:left;">
-                    </object>
-                </div>';
-    }
-
-    public function panel($cabecera, $mensaje, $tipo)
-    {
-        $panel = '<div class="panel panel-'.$tipo.'"><div class="panel-heading">';
-        $panel .= '<h3 class="panel-title">'.$cabecera.'</h3></div>';
         $panel .= '<div class="panel-body">';
         $panel .= $mensaje;
         $panel .= '</div>';
-
         return $panel;
     }
+
 }
+
+?>

CHANGELOG

@@ -1,101 +0,0 @@
-Version 1.17 29-07-2014
--Eliminados los mensajes de aviso de php en todos los archivos php
-
-Versión 1.16 28-07-2014
--Fix #41. Arregla las llamadas a Instalar.php que se hacían desde Inventario.php y desde Instalar.php
-
-Versión 1.15 29-06-2014
--Crear la opción de clonar registro en Mantenimiento.
--Crear iconos de clonado en todos los estilos.
--Corregido determinaAccion en Imagen para aceptar el clonado
--Corregido codificación/decodificación de la cadena de búsqueda en la URL
-
-Versión 1.14.1 02-06-2014
--Añadidos enlaces a manual y a aplicación de ejemplo en readme.md
--Arreglado que los créditos salgan centrados en lugar de alineados a la derecha
--Añadido la 'v' para indicar la versión en la cabecera de los informes
--Acortado el nombre de la aplicación en la página principal para que en dispositivos pequeños se visualice bien con el icono nuevo del manual
-
-Versión 1.14 01-06-2014
--Añadido icono de acceso a la documentación en la barra superior
--Corregido cierre etiqueta h5 en pie de créditos
--Añade la rama git en la pantalla de inicio en caso de que no sea la rama master, con un botón que al pulsarlo salen los créditos
--Fix #39. Devuelve la versión de las bibliotecas/módulos utilizados en la aplicación si el usuario tiene perfil de Configuración, en caso contrario tan sólo el listado de bibliotecas y su licencia.
--Corregido el nombre de la clase base en Pdf_mysql para que no haya problemas en sistemas que diferencian mayúsculas/minúsculas
--Añadido el botón volver en Configuración
--Fix #36. Añadido límite caracteres en los campos de texto a 35 caracteres en Configuración. Añadido el número de columnas en resoluciones pequeñas y grandes en Configuración.
-
-Versión 1.12 06-05-2014
--Mantenimiento muestra el 'Titulo' del campo tanto en Consulta como en el formulario de edición
--Muestra cuadro de búsqueda y mensaje correcto cuando no se encuentra la cadena de búsqueda en Mantenimiento
--Añadidos mensajes de ayuda en los campos de configuración
--Añadida la columna de cantidad ubicada en mantenimiento de artículos
--Fix #35. Cambiados los informes de Articulos y Ubicaciones para recoger el campo Nº de elementos
--Fix #35. Añadido el campo Nº de elementos en el mantenimiento de Articulos y Ubicaciones a través de archivo xml
--Fix #31. Añadido el directorio temporal en el archivo de configuración
-
-Versión 1.11b 26-04-2014
--Cambiada la referencia de etiquetas Apli
-
-Versión 1.11 26-04-2014
--Fix #34 Corregido que salga una etiqueta por cada elemento reflejado en cantidad.
--Fix #33 Hay que hacer doble click para editar ajax
--Fix #32 Añadido mensaje y enlace al tipo de etiquetas que utiliza y corregido mensaje de error de conexión a base de datos de SQL
--Añadido diálogo antes de realizar el inventario total.
--Añadido cuadro para resaltar el nombre del centro en la pantalla inicial.
--Cambiada la alineación de los campos en Mantenimiento para utilizar el atributo Ajuste
-
-Versión 1.10 21-04-2014
--Corregido error en el nombre del archivo de la clase ajax que estaba en minúsculas
--Añadidos botones de acción tipo bootstrap en Mantenimiento y añadido a configuración en estilo
--Informe de inventario de Artículo o Ubicación desde id y edición ajax de la descripción
--Cambiado mensaje de usuario/clave incorrectos para poner un fondo de color rojo
-
-Versión 1.09 16-04-2014
--Añadida la biblioteca X-Edit
--Añadida actualización Ajax en Mantenimiento
-
-Versión 1.082 09-04-2014
--Ahora git tiene en cuenta los directorios tmp e img.data y no tiene en cuenta su contenido
--Fix #30. Arreglado el botón de buscar que no enviaba los datos. Cambiado el texto por la lupa.
-
-Versión 1.081 08-04-2014
--Fix #29. Añade el programa instalar.php en el proceso de instalación en README.md
--Fix #29. Añadida la tabla de módulos/bibliotecas utilizados en los créditos.
--Fix #28. Corrige que el informe pedido desde matenimiento salga en una ventana nueva.
-
-Versión 1.08 07-04-2014
--Los informes aparecen ahora en la pantalla de la aplicación embebidos.
--Añadido un calendario al pulsar sobre la fecha en la cabecera de la aplicación.
--Corregido pequeño problema de margen en resoluciones pequeñas donde se solapaba parte del menú.
--Quitados los logos de GPLv3, MySQL y Apache
--Inventario.php llama al instalador si la aplicación no está instalada
--Añadido dialogo modal de Créditos cuando se pulsa sobre el gráfico de código de barras de la aplicación o sobre el nombre del centro
--Quitados los usuarios de ejemplo en el archivo setup.sql
--Creado el programa instalar.php que permitirá configurar el acceso a la base de datos, comprobar la configuración del servidor y la creación del usuario administrador
--Añadido un parámetro en el archivo configuracion.inc que permite o no ejecutar el programa instalar.php
-
-Versión 1.07 31-03-2014
--Añadido bootstrap-select a la solicitud de informes de inventario de esta forma se pueden buscar artículos o ubicaciones en el select
--Añadido bootstrap-select al mantenimiento para que en el alta de elementos se puedan buscar artículos o ubicaciones en el el select
--Corregido un problema que permitía cambiar fechas en el formulario de bajas
-
-Versión 1.06 28-03-2014
--Configuracion: Añadido icono en el botón de aceptar.
-                Cambiado el mensaje de éxito en la grabación de los cambios.
--CopiaSeguridad: Añadidos iconos en los botones de aceptar y volver.
--Csv: Añadidos iconos en los botones de acción.
--Importacion: Añadidos iconos en los botones de acción.
-              Cambiado el control de subida de fichero por el de Jasny.
-              Cambiado el formato para controlar las columnas que ocupa el formulario de subida para que sea 'responsive'
--AportaContenido: Quitado 'de' del mensaje de opción actual en Mantenimiento para acortar mensaje.
--InformeInventario: Añadidos iconos en los botones de acción.
-                    Cambiado el formato para que sea correcto en todas las resoluciones de pantalla.
--Mantenimiento: Añadidos iconos en los botones de acción.
-                Añadidas flechas para indicar el campo que marca el orden de visualización.
--bootstrap.html: Añadida la opción de cerrar sesión en resolución pequeña.
-                 Añadida una textura al fondo de la cabecera.
-                 Cambios en las dimensiones de los contenedores para mejorar la visualización.
--img/fondos: Añadidos algunos ficheros de texturas para poder utilizarlos en el futuro.
--CHANGELOG: Añadido este fichero para llevar un registro de cambios entre versiones.
--img: Cambiadas las flechas de sentido ascendente y descendente (intercambiar) para ser coherente con las indicaciones en la cabecra de la tabla.

Configuracion.php

@@ -1,5 +1,7 @@
 <?php
+
 /**
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -15,20 +17,20 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
-class Configuracion
+class Configuracion {
-{
+    private $configuracion = "inc/configuracion.inc";
-    private $configuracion = 'inc/configuracion.inc';
+    private $confNueva = "inc/configuracion.new";
-    private $confNueva = 'inc/configuracion.new';
+    private $confAnterior = "inc/configuracion.ant";
-    private $confAnterior = 'inc/configuracion.ant';
     private $datosConf;
     //Campos del fichero de configuración que se van a editar.
-    private $lista = ['SERVIDOR', 'PUERTO', 'BASEDATOS', 'BASEDATOSTEST', 'USUARIO', 'CLAVE', 'CENTRO', 'NUMFILAS', 'ESTILO', 'PLANTILLA', 'COLORLAT', 'COLORFON', 'MYSQLDUMP', 'GZIP', 'TMP'];
+    private $lista = array('SERVIDOR', 'BASEDATOS', 'BASEDATOSTEST', 'USUARIO', 'CLAVE', 'CENTRO', 'NUMFILAS', 'ESTILO', 'PLANTILLA', 'COLORLAT', 'COLORFON', 'MYSQLDUMP', 'GZIP');
     private $campos;
     
     public function __construct()
     {
-        $this->campos = implode(',', $this->lista);
+        $this->campos = implode(",", $this->lista);
     }
     
     //Hecho público para poder efectuar los tests correspondientes.
@@ -44,29 +46,23 @@ class Configuracion
     
     public function obtieneDatos($linea, &$clave, &$valor)
     {
-        $filtro = str_replace("'", '', $linea);
+        $filtro = str_replace("'", "", $linea);
-        list($clave, $valor) = explode(',', $filtro);
+        list($clave, $valor) = explode(",", $filtro);
-        list($resto, $campo) = explode('(', $clave);
+        list($resto, $campo) = explode("(", $clave);
-        list($valor, $resto) = explode(')', $valor);
+        list($valor, $resto) = explode(")", $valor);
-        list($resto, $clave) = explode('(', $clave);
+        list($resto, $clave) = explode("(", $clave);
         $valor = trim($valor);
     }
     
-    private function creaTitulo($titulo, $ayuda)
+    public function ejecuta() {      
-    {
-        return '<td style="vertical-align:middle"><a class="dato" href="#" data-placement="right" data-content="'.$ayuda.'">'.$titulo.'</a></td>';
-    }
-
-    public function ejecuta()
-    {
         $fichero = $this->obtieneFichero();
         $datos = explode("\n", $fichero);
         $grabar = isset($_POST['SERVIDOR']);
         if ($grabar) {
-            $fsalida = @fopen($this->confNueva, 'wb');
+            $fsalida = @fopen($this->confNueva, "wb");
         }
         foreach ($datos as $linea) {
-            if (stripos($linea, 'DEFINE') !== false) {
+            if (stripos($linea, "DEFINE") !== false) {
                 //Comprueba que tenga una definición correcta
                 $this->obtieneDatos($linea, $clave, $valor);                
                 $this->datosConf[$clave] = $valor;
@@ -78,98 +74,91 @@ class Configuracion
                 //$salida .= "Post=" . var_export($_POST, true);
             }
             if ($grabar) {
-                $registro = substr($linea, 0, 2) == '?>' ? $linea : $linea."\n";
+                $registro = substr($linea, 0, 2) == "?>" ? $linea : $linea . "\n";
                 fwrite($fsalida, $registro);
             }
         }
-        $salida = $this->formulario();
+        $salida.=$this->formulario();
         if ($grabar) {
-            $salida .= '<div class="alert alert-success">Configuraci&oacute;n guardada correctamente</div>';
+            $salida.='<p class="bg-primary">Configuraci&oacute;n guardada correctamente</p>';
             fclose($fsalida);
             //unlink($this->confAnterior);
             rename($this->configuracion, $this->confAnterior);
             rename($this->confNueva, $this->configuracion);
             unlink($this->confAnterior);
         }
-
         return $salida;
     }
 
-    private function formulario()
+    private function formulario() {
-    {
+        $coloresLateral = array("Original" => "#C4FAEC", "Verde" => "#7bd148", "Azul marino" => "#5484ed", "Azul" => "#a4bdfc", "Turquesa" => "#46d6db",
-        $coloresLateral = ['Original' => '#C4FAEC', 'Verde' => '#7bd148', 'Azul marino' => '#5484ed', 'Azul' => '#a4bdfc', 'Turquesa' => '#46d6db',
+            "Verde claro" => "#7ae7bf", "Verde oscuro" => "#51b749", "Amarillo" => "#fbd75b", "Naranja" => "#ffb878", "Morado" => "#6633FF",
-            'Verde claro'             => '#7ae7bf', 'Verde oscuro' => '#51b749', 'Amarillo' => '#fbd75b', 'Naranja' => '#ffb878', 'Morado' => '#6633FF',
+            "Rojo oscuro" => "#dc2127", "P&uacute;rpura" => "#dbadff", "Gris" => "#e1e1e1");
-            'Rojo oscuro'             => '#dc2127', 'P&uacute;rpura' => '#dbadff', 'Gris' => '#e1e1e1', ];
+        $coloresFondo = array("Verde" => "#7bd148", "Azul marino" => "#5484ed", "Azul" => "#a4bdfc", "Turquesa" => "#46d6db",
-        $coloresFondo = ['Verde' => '#7bd148', 'Azul marino' => '#5484ed', 'Azul' => '#a4bdfc', 'Turquesa' => '#46d6db',
+            "Verde claro" => "#7ae7bf", "Verde oscuro" => "#51b749", "Amarillo" => "#fbd75b", "Naranja" => "#ffb878", "Rojo" => "#ff887c",
-            'Verde claro'        => '#7ae7bf', 'Verde oscuro' => '#51b749', 'Amarillo' => '#fbd75b', 'Naranja' => '#ffb878', 'Rojo' => '#ff887c',
+            "Rojo oscuro" => "#dc2127", "P&uacute;rpura" => "#dbadff", "Gris" => "#e1e1e1", "Original" => '#F3FEC8');
-            'Rojo oscuro'        => '#dc2127', 'P&uacute;rpura' => '#dbadff', 'Gris' => '#e1e1e1', 'Original' => '#F3FEC8', ];
+        $personal = $this->datosConf['ESTILO'] == "personal" ? 'selected' : ' ';
-        $personal = $this->datosConf['ESTILO'] == 'personal' ? 'selected' : ' ';
+        $bluecurve = $this->datosConf['ESTILO'] == "bluecurve" ? 'selected' : ' ';
-        $bluecurve = $this->datosConf['ESTILO'] == 'bluecurve' ? 'selected' : ' ';
+        $cristal = $this->datosConf['ESTILO'] == "cristal" ? 'selected' : ' ';
-        $cristal = $this->datosConf['ESTILO'] == 'cristal' ? 'selected' : ' ';
+        $normal = $this->datosConf['PLANTILLA'] == "normal" ? 'selected' : ' ';
-        $bootst = $this->datosConf['ESTILO'] == 'bootstrap' ? 'selected' : ' ';
+        $bootstrap = $this->datosConf['PLANTILLA'] == "bootstrap" ? 'selected' : ' ';
-        $normal = $this->datosConf['PLANTILLA'] == 'normal' ? 'selected' : ' ';
+        $salida = '<center><div class="col-sm-4 col-md-6"><form name="configura" method="post">';
-        $bootstrap = $this->datosConf['PLANTILLA'] == 'bootstrap' ? 'selected' : ' ';
-        $salida = '<center><div class="col-sm-4 col-md-8"><form name="configura" method="post">';
         //$salida.='<p align="center"><table border=1 class="tablaDatos"><tbody>';
-        $salida .= '<p align="center"><table border=2 class="table table-hover"><tbody>';
+        $salida.='<p align="center"><table border=2 class="table table-hover"><tbody>';
-        $salida .= '<th colspan=2 class="info"><center><b>Preferencias</b></center></th>';
+        $salida.='<th colspan=2 class="info"><center><b>Preferencias</b></center></th>';
-        $salida .= '<tr>'.$this->creaTitulo('Nombre del Centro', 'Nombre que aparecerá en los informes y en la página principal de la aplicación').'<td><input type="text" name="CENTRO" value="'.$this->datosConf['CENTRO'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>Nombre del Centro</td><td><input type="text" name="CENTRO" value="' . $this->datosConf['CENTRO'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Número de filas', 'Número de filas que aparecerán en la pantalla de consulta de los maestros. Valor entre 10 y 25.').'<td><input type="number" max="25" min="10" name="NUMFILAS" value="'.$this->datosConf['NUMFILAS'].'" size="3" /></td></tr>';
+        $salida.='<tr><td>N&uacute;mero de filas</td><td><input type="text" name="NUMFILAS" value="' . $this->datosConf['NUMFILAS'] . '" size="3" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Plantilla', 'Plantilla html utilizada para mostrar el contenido de la aplicación.').'<td><select name="PLANTILLA" class="form-control">';
+        $salida.='<tr><td  style="vertical-align:middle">Plantilla</td><td><select name="PLANTILLA" class="form-control">';
-        $salida .= '<option value="normal" '.$normal.'>normal</option>';
+        $salida.='<option value="normal" ' . $normal . '>normal</option>';
-        $salida .= '<option '.$bootstrap.'>bootstrap</option></select></td></tr>';
+        $salida.='<option ' . $bootstrap . '>bootstrap</option></select></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Estilo', 'Estilo de los botones de control en los mantenimientos de los maestros').'<td><select name="ESTILO" class="form-control">';
+        $salida.='<tr><td  style="vertical-align:middle">Estilo</td><td><select name="ESTILO" class="form-control">';
-        $salida .= '<option value="personal" '.$personal.'>personal</option>';
+        $salida.='<option value="personal" ' . $personal . '>personal</option>';
-        $salida .= '<option '.$bluecurve.'>bluecurve</option>';
+        $salida.='<option ' . $bluecurve . '>bluecurve</option>';
-        $salida .= '<option '.$bootst.'>bootstrap</option>';
+        $salida.='<option ' . $cristal . '>cristal</option></select></td></tr>';
-        $salida .= '<option '.$cristal.'>cristal</option></select></td></tr>';
+        $salida.='<tr><td style="vertical-align:middle">Color Lateral (bootstrap)</td><td style="vertical-align:middle"><select name="COLORLAT" id="COLORLAT" class="form-control">';
-        $salida .= '<tr>'.$this->creaTitulo('Color Lateral', 'Color que se aplicará a la parte izquierda de la aplicación donde aparece el menú').'<td style="vertical-align:middle"><select name="COLORLAT" id="COLORLAT" class="form-control">';
         foreach ($coloresLateral as $color => $codigo) {
-            $selec = '';
+            $selec = "";
             if (trim($this->datosConf['COLORLAT']) == $codigo) {
-                $selec = 'selected';
+                $selec = "selected";
             }
-            $salida .= '<option value="'.$codigo.'" '.$selec.' >'.$color.'</option>';
+            $salida.='<option value="' . $codigo . '" ' . $selec . ' >' . $color . '</option>';
         }
-        $salida .= '</select></td></tr>';
+        $salida.='</select></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Color Fondo', 'Color que aparecerá como fondo en todas las pantallas de la aplicación').'<td style="vertical-align:middle"><select name="COLORFON" id="COLORFON" class="form-control">';
+        $salida.='<tr><td style="vertical-align:middle">Color Fondo (bootstrap)</td><td style="vertical-align:middle"><select name="COLORFON" id="COLORFON" class="form-control">';
         foreach ($coloresFondo as $color => $codigo) {
-            $selec = '';
+            $selec = "";
             if (trim($this->datosConf['COLORFON']) == $codigo) {
-                $selec = 'selected';
+                $selec = "selected";
             }
-            $salida .= '<option value="'.$codigo.'" '.$selec.' >'.$color.'</option>';
+            $salida.='<option value="' . $codigo . '" ' . $selec . ' >' . $color . '</option>';
         }
-        $salida .= '</select></td></tr>';
+        $salida.='</select></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Directorio tmp', 'Directorio donde se almacenarán los archivos temporales de la aplicación y también los archivos e informes que genera').'<td><input type="text" name="TMP" value="'.$this->datosConf['TMP'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<th colspan=2 class="danger"><center><b>Base de datos</b></center></th>';
-        $salida .= '<th colspan=2 class="danger"><center><b>Base de datos</b></center></th>';
+        $salida.='<tr><td>Servidor</td><td><input type="text" name="SERVIDOR" value="' . $this->datosConf['SERVIDOR'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Servidor', 'Nombre o dirección IP del servidor MySQL. Normalmente localhost').'<td><input type="text" name="SERVIDOR" value="'.$this->datosConf['SERVIDOR'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>Base de datos</td><td><input type="text" name="BASEDATOS" value="' . $this->datosConf['BASEDATOS'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Puerto', 'Número de puerto donde el servidor admite conexiones MySQL. Normalmente 3306').'<td><input type="text" name="PUERTO" value="'.$this->datosConf['PUERTO'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>Base de datos Tests</td><td><input type="text" name="BASEDATOSTEST" value="' . $this->datosConf['BASEDATOSTEST'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Base de datos', 'Nombre de la base de datos donde se almacenarán los datos de la aplicación').'<td><input type="text" name="BASEDATOS" value="'.$this->datosConf['BASEDATOS'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>Usuario</td><td><input type="text" name="USUARIO" value="' . $this->datosConf['USUARIO'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Base de datos Tests', 'Nombre de la base de datos donde se almacenarán los datos de prueba de la aplicación').'<td><input type="text" name="BASEDATOSTEST" value="'.$this->datosConf['BASEDATOSTEST'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>Clave</td><td><input type="text" name="CLAVE" value="' . $this->datosConf['CLAVE'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Usuario', 'Usuario con permisos de lectura/escritura en la base de datos').'<td><input type="text" name="USUARIO" value="'.$this->datosConf['USUARIO'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>mysqldump</td><td><input type="text" name="MYSQLDUMP" value="' . $this->datosConf['MYSQLDUMP'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('Clave', 'Contraseña del usuario con permisos sobre la base de datos').'<td><input type="text" name="CLAVE" value="'.$this->datosConf['CLAVE'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr><td>gzip</td><td><input type="text" name="GZIP" value="' . $this->datosConf['GZIP'] . '" size="30" /></td></tr>';
-        $salida .= '<tr>'.$this->creaTitulo('mysqldump', 'Ruta completa a la utilidad mysqldump. Este programa es necesario para que se puedan hacer las copias de seguridad de la aplicación').'<td><input type="text" name="MYSQLDUMP" value="'.$this->datosConf['MYSQLDUMP'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='<tr align=center><td colspan=2><input type="submit" class="btn btn-primary" align="center" value="Aceptar" name="aceptar" /></td></tr></p>';
-        $salida .= '<tr>'.$this->creaTitulo('gzip', 'Ruta completa a la utilidad gzip. Este programa es necesario para que se puedan comprimir las copias de seguridad de la aplicación').'<td><input type="text" name="GZIP" value="'.$this->datosConf['GZIP'].'" maxlength="35" size="35" /></td></tr>';
+        $salida.='</form></div></center>';
-        $salida .= '<tr align=center><td colspan=2>
+        $salida.="<script>
-            <a class="btn btn-info" role="button" onClick="location.href='."'index.php'".'"><span class="glyphicon glyphicon-arrow-left"></span> Volver</a>
-            <button type="submit" class="btn btn-primary" name="aceptar"><span class="glyphicon glyphicon-ok"></span> Aceptar</td></tr></p>';
-        $salida .= '</form></div></center>';
-        $salida .= "<script>
                         $(document).ready(function() {
-                            $('select[name=".'"COLORFON"'."]').on('change', function() {
+                            $('select[name=" . '"COLORFON"' . "]').on('change', function() {
-                               $(document.body).css('background-color', $('select[name=".'"COLORFON"'."]').val());
+                               $(document.body).css('background-color', $('select[name=" . '"COLORFON"' . "]').val());
-                               $('.main').css('background-color', $('select[name=".'"COLORFON"'."]').val());    
+                               $('.main').css('background-color', $('select[name=" . '"COLORFON"' . "]').val());    
                             });
-                            $('select[name=".'"COLORLAT"'."]').on('change', function() {
+                            $('select[name=" . '"COLORLAT"' . "]').on('change', function() {
-                               $('.sidebar').css('background-color', $('select[name=".'"COLORLAT"'."]').val());
+                               $('.sidebar').css('background-color', $('select[name=" . '"COLORLAT"' . "]').val());
                             });
-                            $('select[name=".'"COLORLAT"'."]').simplecolorpicker({theme: 'glyphicons'});
+                            $('select[name=" . '"COLORLAT"' . "]').simplecolorpicker({theme: 'glyphicons'});
-                            $('select[name=".'"COLORFON"'."]').simplecolorpicker({theme: 'glyphicons'});
+                            $('select[name=" . '"COLORFON"' . "]').simplecolorpicker({theme: 'glyphicons'});
-                            $('.dato').popover({trigger: 'hover'});
                         });
                     </script>";
-
         return $salida;
     }
+
 }
+
+?>

CopiaSeguridad.php

@@ -1,138 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014, Ricardo Montañana Gómez
- * @license http://www.gnu.org/licenses/gpl-3.0.txt
- * This file is part of Inventario.
- * Inventario is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Inventario 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 Inventario.  If not, see <http://www.gnu.org/licenses/>.
- */
-class CopiaSeguridad
-{
-    private $mensaje;
-    private $baseDatos;
-    private $imagenes;
-
-    public function creaCopia()
-    {
-        if (!$this->copiaBaseDatos()) {
-            return false;
-        }
-        if (!$this->copiaImagenes()) {
-            return false;
-        }
-        if (!$this->empaqueta()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function dialogo()
-    {
-        $dialogo = '<div class="container col-5"><div class="jumbotron">
-                      <h1>Copia de Seguridad</h1>
-                      <p>¿Desea realizar una copia de seguridad de todos los datos de la Base de Datos y de todas las Imágenes?</p>
-                      <p><a class="btn btn-primary btn-lg" role="button" onClick="location.href='."'index.php'".'"><span class="glyphicon glyphicon-arrow-left"></span> Volver</a>
-                         <a class="btn btn-success btn-lg" role="button" onClick="location.href='."'index.php?copiaseg&confirmado=1'".'">
-                             <span class="glyphicon glyphicon-cloud-download"></span> Continuar</a></p>
-                    </div></div>';
-
-        return $dialogo;
-    }
-
-    private function copiaBaseDatos()
-    {
-        $archivo_sql = TMP.'/baseDatos'.BASEDATOS.'.sql';
-        $baseDatosComprimida = $archivo_sql.'.gz';
-        $this->baseDatos = $baseDatosComprimida;
-        if (file_exists($baseDatosComprimida)) {
-            unlink($baseDatosComprimida);
-        }
-        $comando = escapeshellcmd(MYSQLDUMP.' -h '.SERVIDOR.' -P '.PUERTO.' -u '.USUARIO.' --password='.CLAVE.' --result-file='.$archivo_sql.' '.BASEDATOS);
-        $comando2 = escapeshellcmd(GZIP.' -9f '.$archivo_sql);
-        exec($comando);
-        exec($comando2);
-        if (filesize($baseDatosComprimida) < 1024) {
-            //No se ha realizado la copia de seguridad
-            $mensaje = 'La copia de seguridad no se ha realizado correctamente.<br><br>';
-            $mensaje .= 'Compruebe que las rutas a los programas mysqldump y gzip en configuraci&oacute;n est&aacute;n correctamente establecidas ';
-            $mensaje .= 'y que los datos de acceso a la base de datos sean correctos.<br>';
-            $mensaje .= 'mysqldump=['.MYSQLDUMP.']<br>';
-            $mensaje .= 'gzip=['.GZIP.']';
-            $this->mensaje = $mensaje;
-            $this->error = true;
-
-            return false;
-        }
-
-        return true;
-    }
-
-    private function copiaImagenes()
-    {
-        $copiaImagenes = TMP.'/Imagenes.tbz';
-        $this->imagenes = $copiaImagenes;
-        if (file_exists($copiaImagenes)) {
-            unlink($copiaImagenes);
-        }
-        $comando = escapeshellcmd('tar cf '.$copiaImagenes.' '.IMAGEDATA);
-        exec($comando);
-
-        if (filesize($copiaImagenes) == 0) {
-            $this->error = true;
-            $mensaje = 'No se ha podido comprimir el directorio de las imágenes '.IMAGEDATA.'<br>';
-            $mensaje .= 'Compruebe que la ruta de acceso al programa tar en configuraci&oacute;n est&aacute; correctamente establecida';
-            $this->mensaje = $mensaje;
-
-            return false;
-        }
-
-        return true;
-    }
-
-    private function empaqueta()
-    {
-        // Empaqueta los dos archivos en el que va a devolver
-        $nombreCopia = TMP.'/Copia'.BASEDATOS.strftime('%Y%m%d%H%M').'.tar';
-        if (file_exists($nombreCopia)) {
-            unlink($nombreCopia);
-        }
-        $comando = escapeshellcmd('tar cf '.$nombreCopia.' '.$this->baseDatos.' '.$this->imagenes);
-        exec($comando);
-        if (filesize($nombreCopia) == 0 || !file_exists($nombreCopia)) {
-            $this->error = true;
-            $mensaje = 'No se ha creado el paquete con los archivos de imágenes en [<b>'.$this->imagenes.'</b>] y <br>';
-            $mensaje .= ' con el archivo de Base de Datos [<b>'.$this->baseDatos.'</b>]<br><br>';
-            $mensaje .= 'Compruebe que los datos de configuración están correctamente establecidos <br>';
-            $mensaje .= 'El comando de copia fue ['.$comando.']<br>';
-            $mensaje .= 'gzip=['.GZIP.']';
-            $this->mensaje = $mensaje;
-
-            return false;
-        }
-        $this->error = false;
-        unlink($this->baseDatos);
-        unlink($this->imagenes);
-        $mensaje = 'Copia de seguridad realizada con &eacute;xito.<br><br>Pulse sobre el siguiente enlace para descargar:<br><br>';
-        $mensaje .= '<a href="'.$nombreCopia.'">Descargar Copia de Seguridad de Datos</a><br><br>';
-        $mensaje .= 'El paquete de copia contiene un archivo con la copia de la información de la base de datos y un archivo que contiene el directorio de las fotografías e imágenes asociadas a los datos';
-        $this->mensaje = $mensaje;
-
-        return true;
-    }
-
-    public function mensaje()
-    {
-        return $this->mensaje;
-    }
-}

Csv.php

@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -16,18 +17,20 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
-class Csv
+class Csv {
-{
+
     /**
-     * @var string Nombre del fichero csv
+     * 
+     * @var String Nombre del fichero csv
      */
     private $nombre;
 
     /**
      * @var FILE manejador del fichero
      */
-    private $fichero = null;
+    private $fichero = NULL;
 
     /**
      * @var xml conulta asociada a este fichero
@@ -40,6 +43,7 @@ class Csv
     private $bdd;
 
     /**
+     *
      * @var int Número de registros en el fichero csv
      */
     private $numRegistros;
@@ -55,7 +59,8 @@ class Csv
     private $datosFichero;
 
     /**
-     * Indices a los campos correspondientes.
+     * Indices a los campos correspondientes
+     * 
      */
     private $idElemento;
     private $idArticulo;
@@ -66,54 +71,48 @@ class Csv
     private $nSerie;
 
     /**
-     * // El constructor necesita saber cuál es la opción actual.
+      // El constructor necesita saber cuál es la opción actual
-     * /**
+      /**
      * Constructor de la clase. 
-     *
      * @param BaseDatos $baseDatos Manejador de la base de datos
      */
-    public function __construct($baseDatos)
+    public function __construct($baseDatos) {
-    {
         $this->bdd = $baseDatos;
     }
 
     /**
-     * Crea un fichero csv con el nombre especificado.
+     * Crea un fichero csv con el nombre especificado
-     *
+     * @param String $fichero Nombre del fichero
-     * @param string $fichero Nombre del fichero
      */
-    public function crea($fichero)
+    public function crea($fichero) {
-    {
         $this->nombre = $fichero;
-        $this->fichero = fopen($this->nombre, 'w') or die('No puedo abrir '.$this->nombre.' para escritura.');
+        $this->fichero = fopen($this->nombre, "w") or die("No puedo abrir " . $this->nombre . " para escritura.");
     }
 
     /**
+     * 
      * @param array $datos escribe la línea en el archivo
      */
-    public function escribeLinea($datos)
+    public function escribeLinea($datos) {
-    {
+        fputcsv($this->fichero, $datos, ',', '"') or die("No puedo escribir en el fichero csv");
-        fputcsv($this->fichero, $datos, ',', '"') or die('No puedo escribir en el fichero csv');
     }
 
-    public function __destruct()
+    public function __destruct() {
-    {
         $this->cierra();
     }
 
-    public function cierra()
+    public function cierra() {
-    {
+        fclose($this->fichero) or die("No puedo cerrar el archivo csv");
-        fclose($this->fichero) or die('No puedo cerrar el archivo csv');
     }
 
     /**
-     * @param string $fichero Archivo xml que contiene la definición de la consulta
+     * 
+     * @param String $fichero Archivo xml que contiene la definición de la consulta
      */
-    public function ejecutaConsulta($fichero)
+    public function ejecutaConsulta($fichero) {
-    {
+        $consulta = simplexml_load_file($fichero) or die("No puedo cargar el fichero xml " . $fichero . " al csv");
-        $consulta = simplexml_load_file($fichero) or die('No puedo cargar el fichero xml '.$fichero.' al csv');
         // Escribe la cabecera del fichero
-        $this->escribeLinea([$consulta->Pagina->Cabecera, $consulta->Titulo['id'], $consulta->Titulo['Texto']]);
+        $this->escribeLinea(array($consulta->Pagina->Cabecera, $consulta->Titulo['id'], $consulta->Titulo['Texto']));
         foreach ($consulta->Pagina->Cuerpo->Col as $campo) {
             $campos[] = $campo['Titulo'];
         }
@@ -121,7 +120,7 @@ class Csv
         // Escribe los datos de los campos
         $this->bdd->ejecuta($consulta->Datos->Consulta);
         while ($fila = $this->bdd->procesaResultado()) {
-            $campos = [];
+            $campos = array();
             foreach ($consulta->Pagina->Cuerpo->Col as $campo) {
                 $campos[] = $fila[(string) $campo['Nombre']];
             }
@@ -130,12 +129,12 @@ class Csv
     }
 
     /**
-     * @param string $ficheroCSV Nombre del archivo csv
+     * 
+     * @param String $ficheroCSV Nombre del archivo csv
      */
-    public function cargaCSV($ficheroCSV)
+    public function cargaCSV($ficheroCSV) {
-    {
         $this->nombre = $ficheroCSV;
-        $this->fichero = fopen($this->nombre, 'r') or die('No puedo abrir el archivo '.$this->nombre.' para lectura.');
+        $this->fichero = fopen($this->nombre, "r") or die('No puedo abrir el archivo ' . $this->nombre . " para lectura.");
         list($archivo, $idCabecera, $cabecera) = fgetcsv($this->fichero);
         while ($linea = fgetcsv($this->fichero)) {
             $datosFichero[] = $linea;
@@ -147,120 +146,113 @@ class Csv
     }
 
     /**
-     * Muestra un resumen de los datos del fichero csv cargado por pantalla.
+     * Muestra un resumen de los datos del fichero csv cargado por pantalla
+     * 
      */
-    public function resumen()
+    public function resumen() {
-    {
         //$mensaje .=
-        $mensaje = '<center><h1>Archivo [inventario'.$this->cabecera[0].']</h1>';
+        $mensaje = "<center><h1>Archivo [inventario" . $this->cabecera[0] . "]</h1>";
-        $mensaje .= '<h2>id=['.$this->cabecera[1].'] Descripci&oacute;n=['.$this->cabecera[2].']</h2><br>';
+        $mensaje .= "<h2>id=[" . $this->cabecera[1] . "] Descripci&oacute;n=[" . $this->cabecera[2] . "]</h2><br>";
         $mensaje .= '<table border=1 class="table table-striped table-bordered table-condensed table-hover"><theader>';
         foreach ($this->datosFichero[0] as $campo) {
             $dato = $campo;
             $mensaje .= "<th><b>$dato</b></th>";
         }
-        $mensaje .= '<th><b>Acci&oacute;n</b></th>';
+        $mensaje .= "<th><b>Acci&oacute;n</b></th>";
-        $mensaje .= '</theader><tbody>';
+        $mensaje .="</theader><tbody>";
         $this->cargaIndices($this->datosFichero[0]);
         //echo "$mensaje contar Datosfichero=[".count($datosFichero)."]";
         for ($i = 1; $i < count($this->datosFichero); $i++) {
-            $mensaje .= '<tr>';
+            $mensaje .= "<tr>";
             $primero = true;
             foreach ($this->datosFichero[$i] as $dato) {
                 if ($primero) {
                     $primero = false;
                     switch ($dato) {
-                        case 'S': $estado = '-Baja-';
+                        case 'S': $estado = "-Baja-";
-                            $color = 'danger';
+                            $color = "danger";
                             break;
-                        case 'Alta': $estado = '-Alta-';
+                        case 'Alta': $estado = "-Alta-";
-                            $color = 'primary';
+                            $color = "primary";
                             break;
-                        case 'N': $estado = $this->compruebaCantidades($i);
+                        case "N" : $estado = $this->compruebaCantidades($i);
                             if ($estado != 0) {
-                                $color = 'warning';
+                                $color = "warning";
                                 if ($estado > 0) {
-                                    $estado = '+'.$estado;
+                                    $estado = "+" . $estado;
                                 }
                             } else {
-                                $estado = 'igual';
+                                $estado = "igual";
-                                $color = 'info';
+                                $color = "info";
                             }
                             break;
                         default: throw new Exception("El archivo csv tiene un formato incorrecto.<br>Bajas=[$dato]");
                     }
                 }
-                $mensaje .= '<td>'.$dato.'</td>';
+                $mensaje .= "<td>" . $dato . "</td>";
             }
-            $mensaje .= '<td align="center"><label class="label label-'.$color.'">'.$estado.'</label></td>';
+            $mensaje .= '<td align="center"><label class="label label-' . $color . '">' . $estado . '</label></td>';
-            $mensaje .= '</tr>';
+            $mensaje .= "</tr>";
         }
-        $mensaje .= '</tbody></table></p><br>';
+        $mensaje .= "</tbody></table></p><br>";
         $mensaje .= $this->panelMensaje('Si se produce cualquier error en el procesamiento del fichero, no se aplicar&aacute; ning&uacute;n cambio en la base de datos.');
 
         $mensaje .= '<form method="post" name="Aceptar" action="index.php?importacion&opc=ejecutar">
-                <button type="button" name="Cancelar" value="Cancelar" onClick="location.href='."'index.php'".'" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span> Cancelar</button>
+                <input type="button" name="Cancelar" value="Cancelar" onClick="location.href=' . "'index.php'" . '" class="btn btn-danger">
-                <button type="submit" name="Aceptar" class="btn btn-primary"><span class="glyphicon glyphicon-ok"></span> Aceptar</button>
+                <input type="submit" name="Aceptar" value="Aceptar" class="btn btn-primary">
-                <input type="hidden" name="ficheroCSV" value="'.$this->nombre.'">
+                <input type="hidden" name="ficheroCSV" value="' . $this->nombre . '">
                 </form></center>';
 
         return $mensaje;
     }
 
     /**
-     * @param $array línea de datos del fichero csv para comprobar las cantidades si se han modificado o no
      * 
+     * @param $array línea de datos del fichero csv para comprobar las cantidades si se han modificado o no 
      * @return string
      */
-    private function compruebaCantidades($i)
+    private function compruebaCantidades($i) {
-    {
+        $ultimo = count($datos);
-        //$ultimo = count($datos);
         return $this->datosFichero[$i][$this->cantidadReal] - $this->datosFichero[$i][$this->cantidad];
     }
 
-    private function panelMensaje($info, $tipo = 'danger', $cabecera = '&iexcl;Atenci&oacute;n!')
+    private function panelMensaje($info, $tipo = "danger", $cabecera = "&iexcl;Atenci&oacute;n!") {
-    {
+        $mensaje = '<div class="panel panel-' . $tipo . '"><div class="panel-heading">';
-        $mensaje = '<div class="panel panel-'.$tipo.'"><div class="panel-heading">';
+        $mensaje .= '<h3 class="panel-title">' . $cabecera . '</h3></div>';
-        $mensaje .= '<h3 class="panel-title">'.$cabecera.'</h3></div>';
         $mensaje .= '<div class="panel-body">';
         $mensaje .= $info;
         $mensaje .= '</div>';
         $mensaje .= '</div>';
-
         return $mensaje;
     }
 
-    private function escribeLog($comando)
+    private function escribeLog($comando) {
-    {
+        $fp = fopen($this->nombre.".log", "a");
-        $fp = fopen($this->nombre.'.log', 'a');
+        $linea = strftime("%Y/%m/%d")."|".$this->nombre."|".$comando;
-        $linea = strftime('%Y/%m/%d').'|'.$this->nombre.'|'.$comando;
+        fputs($fp, $linea . "\n");
-        fwrite($fp, $linea."\n");
         fclose($fp);
     }
 
-    private function bajaElemento($i)
+    private function bajaElemento($i) {
-    {
         $id = $this->datosFichero[$i][$this->idElemento];
-        $comando = 'delete from Elementos where id="'.$id.'";';
+        $comando = 'delete from Elementos where id="' . $id . '";';
         $this->escribeLog($comando);
         if (!$this->bdd->ejecuta($comando)) {
-            throw new Exception('Baja-'.$this->bdd->mensajeError, $this->bdd->error);
+            throw new Exception("Baja-".$this->bdd->mensajeError, $this->bdd->error);
         }
     }
 
-    private function modificaElemento($i)
+    private function modificaElemento($i) {
-    {
         $id = $this->datosFichero[$i][$this->idElemento];
-        $comando = 'update Elementos set Cantidad='.$this->datosFichero[$i][$this->cantidadReal].' where id="'.$id.'";';
+        $comando = 'update Elementos set Cantidad=' . $this->datosFichero[$i][$this->cantidadReal] . ' where id="' . $id . '";';
         $this->escribeLog($comando);
                 if (!$this->bdd->ejecuta($comando)) {
-            throw new Exception('Modifica-'.$this->bdd->mensajeError, $this->bdd->error);
+            throw new Exception("Modifica-".$this->bdd->mensajeError, $this->bdd->error);
         }
     }
 
-    private function altaElemento($i)
+    private function altaElemento($i) {
-    {
+        if ($this->cabecera[0] == "Articulo") {
-        if ($this->cabecera[0] == 'Articulo') {
             $idUbicacion = $this->datosFichero[$i][$this->idUbicacion];
             $idArticulo = $this->cabecera[1];
             $comando = 'select id from Ubicaciones where Descripcion="'.$this->datosFichero[$i][$this->desUbicacion].'";';
@@ -269,31 +261,30 @@ class Csv
             $idArticulo = $this->datosFichero[$i][$this->idArticulo];
         }
         $idArt = $datosFichero[$i];
-        $comando = 'insert into Elementos () values (null,'.$idArticulo.','.$idUbicacion.',"'.$this->datosFichero[$i][$this->nSerie];
+        $comando = 'insert into Elementos () values (null,' . $idArticulo . ',' . $idUbicacion . ',"' . $this->datosFichero[$i][$this->nSerie];
-        $comando .= '",'.$this->datosFichero[$i][$this->cantidadReal].',"'.$this->datosFichero[$i][$this->fechaCompra].'");';
+        $comando .= '",' . $this->datosFichero[$i][$this->cantidadReal] . ',"' . $this->datosFichero[$i][$this->fechaCompra] . '");';
         $this->escribeLog($comando);
         if (!$this->bdd->ejecuta($comando)) {
-            throw new Exception('Alta-'.$this->bdd->mensajeError, $this->bdd->error);
+            throw new Exception("Alta-".$this->bdd->mensajeError, $this->bdd->error);
         }
     }
 
-    private function cargaIndices($campos)
+    private function cargaIndices($campos) {
-    {
         for ($i = 0; $i < count($campos); $i++) {
             switch ($campos[$i]) {
-                case 'Cant. Real': $this->cantidadReal = $i;
+                case "Cant. Real": $this->cantidadReal = $i;
                     break;
-                case 'Fecha C.': $this->fechaCompra = $i;
+                case "Fecha C.": $this->fechaCompra = $i;
                     break;
-                case 'idUbic': $this->idUbicacion = $i;
+                case "idUbic": $this->idUbicacion = $i;
                     break;
-                case 'idArt': $this->idArticulo = $i;
+                case "idArt": $this->idArticulo = $i;
                     break;
-                case 'idElem': $this->idElemento = $i;
+                case "idElem": $this->idElemento = $i;
                     break;
-                case 'Cantidad': $this->cantidad = $i;
+                case "Cantidad": $this->cantidad = $i;
                     break;
-                case 'N Serie': $this->nSerie = $i;
+                case "N Serie": $this->nSerie = $i;
                     break;
             }
         }
@@ -302,10 +293,9 @@ class Csv
     }
 
     /**
-     * Procesa contra la base de datos todas las acciones del archivo.
+     * Procesa contra la base de datos todas las acciones del archivo
      */
-    public function ejecutaFichero()
+    public function ejecutaFichero() {
-    {
         $this->cargaIndices($this->datosFichero[0]);
         //Realiza una transacción para que no se ejecute parcialmente una actualización
         try {
@@ -327,31 +317,31 @@ class Csv
                             $acciones++;
                         }
                         break;
-                    default: throw new Exception('Acci&oacute;n no reconocida en la importacion ['.$this->datosFichero[0].']');
+                    default: throw new Exception("Acci&oacute;n no reconocida en la importacion [" . $this->datosFichero[0] . "]");
                 }
             }
             $mensaje = "Se han procesado correctamente $acciones acciones en la Base de Datos.";
             $this->bdd->confirmaTransaccion();
-
+            return $this->panelMensaje($mensaje,"success", "Informaci&oacute;n");
-            return $this->panelMensaje($mensaje, 'success', 'Informaci&oacute;n');
         } catch (Exception $e) {
             $this->bdd->abortaTransaccion();
-            $mensaje = 'Se ha producido el error ['.$e->getMessage().']<br>NO se ha realizado ning&uacute;n cambio en la Base de Datos.';
+            $mensaje = "Se ha producido el error [" . $e->getMessage() . "]<br>NO se ha realizado ning&uacute;n cambio en la Base de Datos.";
-
             return $this->panelMensaje($mensaje);
         }
     }
 
-    private function ejecutaFichero2()
+    private function ejecutaFichero2() {
-    {
         echo '<script>visualizaProgreso();</script>';
         for ($i = 1; $i < 80; $i++) {
             //sleep(1);
             $progreso = $i;
-            echo '<script>actProgreso('.$progreso.');</script>';
+            echo '<script>actProgreso(' . $progreso . ');</script>';
             //echo str_repeat(' ',1024*64);
             flush();
             //echo '$(".bar").css("width", "'.$progreso.'");';
         }
     }
+
 }
+
+?>

Distribucion.php

@@ -1,5 +1,6 @@
 <?php
-/**
+    /**
+     * @package Inventario
      * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
      * @license http://www.gnu.org/licenses/gpl-3.0.txt
      * This file is part of Inventario.
@@ -15,6 +16,7 @@
      * 
      * You should have received a copy of the GNU General Public License
      * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+     *  
      */
 //
 // Esta clase procesará una página sustituyendo
@@ -25,8 +27,7 @@
 // y una referencia al objeto cuyos métodos deberán
 // aportar los contenidos.
 //
-class Distribucion
+class Distribucion {
-{
 	// Variable para conservar la plantilla
 	private $plantilla;
 	// Matriz que contendrá los nombres de elementos
@@ -34,46 +35,45 @@ class Distribucion
 	// Referencia al objeto cuyos métodos serán
 	// invocados para aportar el contenido
 	private $objeto;
-
 	// Constructor de la clase
 	public function __construct($archivo, $objeto)
 	{
             // Recuperamos el contenido del archivo
-        $this->plantilla = file_get_contents($archivo)
+            $this->plantilla=file_get_contents($archivo)
                 or die('Fallo en la apertura de la plantilla '.$archivo);
             // y guardamos la referencia al objeto
-        $this->objeto = $objeto;
+            $this->objeto=$objeto;
             // Extraemos todas las marcas de contenido
-        preg_match_all('/\{[A-Za-z]+\}/', $this->plantilla, $el, PREG_PATTERN_ORDER);
+            preg_match_all('/\{[A-Za-z]+\}/', $this->plantilla,$el, PREG_PATTERN_ORDER);
             // Nos quedamos con la matriz de resultados
-        $this->elementos = $el[0];
+            $this->elementos=$el[0];
 	}
-
 	// Este método es el encargado de procesar la plantilla
 	public function procesaPlantilla()
 	{
             // Tomamos la plantilla en una variable local, para
             // así no modificar el contenido original
-        $pagina = $this->plantilla;
+            $pagina=$this->plantilla;
             // Recorremos la matriz de marcas de contenido
-        foreach ($this->elementos as $el) {
+            foreach($this->elementos as $el) {
                 // Eliminamos los delimitadores { y }
-            $el = substr($el, 1, strlen($el) - 2);
+                $el=substr($el,1,strlen($el)-2);
                 // invocamos a la función del objeto
-            $resultado = $this->objeto->$el();
+                $resultado=$this->objeto->$el();
                 // e introducimos su contenido en lugar de la marca
-            $pagina = str_replace('{'.$el.'}', $resultado, $pagina);
+                $pagina=str_replace('{'.$el.'}',$resultado,$pagina);
             }
-        /*
+            /**
              *  @todo Tratar de activar la compresión.
              */
             // Si es posible comprimir
 //            if(strstr($_SERVER['HTTP_ACCEPT_ENCODING'],'gzip')) {
 //                // introducimos la cabecera que indica que el contenido está comprimido
 //                header('Content-Encoding: gzip');
-//                // y comprime al máximo la información antes de enviarla
+//                // y comprime al m<EFBFBD>ximo la información antes de enviarla
 //                return gzencode($pagina, 9);
 //            }
             return $pagina; // enviamos sin comprimir
 	}
 }
+?>

EtiquetasPDF.php

@@ -1,13 +1,13 @@
+
 <?php
 
 /**
- * genera un documento PDF a partir de una descripción dada en un archivo XML.
+ * genera un documento PDF a partir de una descripción dada en un archivo XML
- *
  * @author Ricardo Montañana <rmontanana@gmail.com>
- *
  * @version 1.0
- *
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -23,27 +23,27 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
 require_once 'phpqrcode.php';
 
-class EtiquetasPDF
+class EtiquetasPDF {
-{
+
     /**
+     * 
      * @var basedatos Controlador de la base de datos
      */
     private $bdd;
     private $docu;
     private $pdf;
     private $def;
-    private $nombreFichero;
+    private $nombreFichero = "tmp/informeEtiquetas.pdf";
 
     /**
-     * El constructor recibe como argumento el nombre del archivo XML con la definición, encargándose de recuperarla y guardar toda la información localmente.
+     * El constructor recibe como argumento el nombre del archivo XML con la definición, encargándose de recuperarla y guardar toda la información localmente
-     *
      * @param basedatos $bdd manejador de la base de datos
      * @param string $definicion fichero con la definición del informe en XML
-     * @param bool      $registrado usuario registrado si/no
+     * @param boolean $registrado usuario registrado si/no
-     *
      * @return ficheroPDF
      * todo: cambiar este comentario
      */
@@ -52,7 +52,6 @@ class EtiquetasPDF
         if (!$registrado) {
             return 'Debe registrarse para acceder a este apartado';
         }
-        $this->nombreFichero = TMP.'/informeEtiquetas.pdf';
         // Recuperamos la definición del informe
         $this->def = simplexml_load_file($definicion);
         $this->bdd = $bdd;
@@ -62,7 +61,7 @@ class EtiquetasPDF
         $this->pdf->setAutoPageBreak(false);
         //echo $def->Titulo.$def->Cabecera;
         $this->pdf->setAuthor(AUTOR, true);
-        $creador = CENTRO.' '.PROGRAMA.VERSION;
+        $creador = CENTRO . " " . PROGRAMA . VERSION;
         $this->pdf->setCreator(html_entity_decode($creador), true);
         $this->pdf->setSubject($this->def->Titulo, true);
         //$this->pdf->setAutoPageBreak(true, 10);
@@ -79,15 +78,12 @@ class EtiquetasPDF
         $this->pdf->AddPage();
         $tamLinea = 5;
         $fila = -1;
-        $primero = true;
+        $primero = true; $i = 0;
-        $i = 0;
+        $url = explode("/", $_SERVER['SCRIPT_NAME']);
-        $url = explode('/', $_SERVER['SCRIPT_NAME']);
         $aplicacion = $url[1];
-        $protocolo = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443 ? 'https://' : 'http://';
+        $protocolo = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443 ? "https://" : "http://";
-        $enlace = $protocolo.$_SERVER['SERVER_NAME'].'/'.$aplicacion.'/index.php?elementos&opc=editar&id=';
+        $enlace = $protocolo . $_SERVER['SERVER_NAME'] . "/" . $aplicacion . "/index.php?elementos&opc=editar&id=";
-        while ($tupla = $this->bdd->procesaResultado()) {
+        while($tupla = $this->bdd->procesaResultado()) {            
-            for ($j = 0; $j < $tupla['cantidad']; $j++) {
-                //Hay que generar tantas etiquetas como ponga la cantidad de cada elemento
             if ($i % 2) {
                 //Columna 2
                 $etiq1 = 136;
@@ -106,35 +102,34 @@ class EtiquetasPDF
                 $primero = false;
             }
             $py = 6 + 41 * $fila;
-                $enlace2 = $enlace.$tupla['idEl'];
+            $enlace2=$enlace.$tupla['idEl'];
-                $fichero = TMP.'/etiq'.rand(1000, 9999).'.png';
+            $fichero = "tmp/etiq".rand(1000,9999).".png";
             QRcode::png($enlace2, $fichero);
             $this->pdf->image($fichero, $etiq2, $py, 30, 30);
             unlink($fichero);
             $this->pdf->setxy($etiq1, $py);
             $this->pdf->Cell(30, 10, utf8_decode($tupla['articulo']));
-                $py += $tamLinea;
+            $py+=$tamLinea;
             $this->pdf->setxy($etiq1, $py);
             $this->pdf->Cell(30, 10, utf8_decode($tupla['marca']));
-                $py += $tamLinea;
+            $py+=$tamLinea;
             $this->pdf->setxy($etiq1, $py);
             $this->pdf->Cell(30, 10, utf8_decode($tupla['modelo']));
-                $py += $tamLinea;
+            $py+=$tamLinea;
             $this->pdf->setxy($etiq1, $py);
             $this->pdf->Cell(30, 10, utf8_decode($tupla['numserie']));
-                $py += $tamLinea;
+            $py+=$tamLinea;
             $this->pdf->setxy($etiq1, $py);
             $this->pdf->Cell(30, 10, $tupla['fechaCompra']);
-                $py += $tamLinea - 1;
+            $py+=$tamLinea-1;
             $this->pdf->setxy($etiq2, $py);
             $this->pdf->Cell(30, 10, utf8_decode($tupla['ubicacion']));
-                $py += $tamLinea - 1;
+            $py+=$tamLinea-1;
             $this->pdf->setxy($etiq2, $py);
-                $cadena = 'idElemento='.$tupla['idEl'].' / idArticulo='.$tupla['idArt'].' / idUbicacion='.$tupla['idUbic'];
+            $cadena = "idElemento=" . $tupla['idEl'] . " / idArticulo=" . $tupla['idArt'] . " / idUbicacion=" . $tupla['idUbic'];           
             $this->pdf->Cell(30, 10, $cadena);
             $i++;
         }
-        }
         //$this->pdf->MultiCell(0,30,var_export($filas,true));
     }
 
@@ -151,16 +146,15 @@ class EtiquetasPDF
 
     public function getCabecera()
     {
-        $cabecera = 'Content-type: application/pdf';
+        $cabecera = "Content-type: application/pdf";
-        $cabecera = $cabecera.'Content-length: '.strlen($this->docu);
+        $cabecera = $cabecera . "Content-length: " . strlen($this->docu);
-        $cabecera = $cabecera.'Content-Disposition: inline; filename='.$this->nombreFichero;
+        $cabecera = $cabecera . "Content-Disposition: inline; filename=" . $this->nombreFichero;
-
         return $cabecera;
     }
 
-    public function guardaArchivo($nombre)
+    public function guardaArchivo($nombre = "tmp/Informe.pdf")
     {
-        $fichero = fopen($nombre, 'w');
+        $fichero = fopen($nombre, "w");
         fwrite($fichero, $this->getCabecera());
         fwrite($fichero, $this->getContenido(), strlen($this->getContenido()));
         $this->nombreFichero = $nombre;
@@ -169,10 +163,10 @@ class EtiquetasPDF
 
     public function enviaCabecera()
     {
-        header('Content-type: application/pdf');
+        header("Content-type: application/pdf");
         $longitud = strlen($this->docu);
         header("Content-length: $longitud");
-        header('Content-Disposition: inline; filename='.$this->nombreFichero);
+        header("Content-Disposition: inline; filename=" . $this->nombreFichero);
     }
 
     public function imprimeInforme()
@@ -181,3 +175,5 @@ class EtiquetasPDF
         echo $this->docu;
     }
 }
+
+?>

Imagen.php

@@ -1,186 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014, Ricardo Montañana Gómez
- * @license http://www.gnu.org/licenses/gpl-3.0.txt
- * This file is part of Inventario.
- * Inventario is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Inventario 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 Inventario.  If not, see <http://www.gnu.org/licenses/>.
- */
-//Para comprimir las imágenes
-require_once 'Zebra_Image.php';
-define('HAYQUEGRABAR', 1);
-define('HAYQUEBORRAR', 2);
-define('NOHACERNADA', 3);
-
-class Imagen
-{
-    private $archivoSubido;
-    public $archivoComprimido;
-    private $extension;
-    private $dirData;
-    public $archivoCopiado;
-
-    public function __construct()
-    {
-        $this->dirData = IMAGEDATA;
-    }
-
-    public function determinaAccion($campo)
-    {
-        if (isset($_POST[$campo]) && $_POST[$campo] == '') {
-            return HAYQUEBORRAR; //Hay que borrar el archivo de imagen
-        } elseif (isset($_FILES[$campo]['error']) && $_FILES[$campo]['error'] == 0) {
-            return HAYQUEGRABAR; //Hay que guardar el archivo de imagen enviado
-        } else {
-            return NOHACERNADA; //No hay que hacer nada
-        }
-    }
-
-    public function procesaEnvio($campo, &$mensaje)
-    {
-        try {
-            // Undefined | Multiple Files | $_FILES Corruption Attack
-            // If this request falls under any of them, treat it invalid.
-            if (
-                !isset($_FILES[$campo]['error']) ||
-                is_array($_FILES[$campo]['error'])
-            ) {
-                throw new RuntimeException('Parámetros inválidos.');
-            }
-
-            // Check $_FILES['upfile']['error'] value.
-            switch ($_FILES[$campo]['error']) {
-                case UPLOAD_ERR_OK:
-                    break;
-                case UPLOAD_ERR_NO_FILE:
-                    throw new RuntimeException('No se ha enviado ningún fichero.');
-                case UPLOAD_ERR_INI_SIZE:
-                case UPLOAD_ERR_FORM_SIZE:
-                    throw new RuntimeException('Se ha excedido el tamaño máximo.');
-                default:
-                    throw new RuntimeException('Error desconocido.');
-            }
-
-            // DO NOT TRUST $_FILES['upfile']['mime'] VALUE !!
-            // Check MIME Type by yourself.
-            $finfo = new finfo(FILEINFO_MIME_TYPE);
-            if (false === $ext = array_search(
-                $finfo->file($_FILES[$campo]['tmp_name']),
-                [
-                    'jpg' => 'image/jpeg',
-                    'png' => 'image/png',
-                    'gif' => 'image/gif',
-                ],
-                true
-            )) {
-                throw new RuntimeException('Formato de imagen inválido, no es {jpg, png, gif}');
-            }
-            $this->extension = $ext;
-            // You should name it uniquely.
-            // DO NOT USE $_FILES['upfile']['name'] WITHOUT ANY VALIDATION !!
-            // On this example, obtain safe unique name from its binary data.
-            $this->archivoSubido = sprintf('tmp/%s.%s', sha1_file($_FILES[$campo]['tmp_name']), $ext);
-            if (!move_uploaded_file($_FILES[$campo]['tmp_name'], $this->archivoSubido)) {
-                throw new RuntimeException('Fallo moviendo el archivo subido.');
-            }
-            //Todo ha ido correcto
-            return true;
-        } catch (RuntimeException $e) {
-            $mensaje = $e->getMessage();
-
-            return false;
-        }
-    }
-
-    public static function borraImagenId($tabla, $id)
-    {
-        $extensiones = ['png', 'gif', 'jpg'];
-        foreach ($extensiones as $extension) {
-            $archivo = IMAGEDATA.'/'.$tabla.'_'.$id.'.'.$extension;
-            if (file_exists($archivo)) {
-                unlink($archivo);
-            }
-        }
-    }
-
-    public function copiaImagenId($valorImagen, $tabla, $id, &$mensaje)
-    {
-        $extension = strrchr($valorImagen, '.');
-        $nombre = $this->dirData.'/'.$tabla.'_'.$id.$extension;
-        if (!@copy($valorImagen, $nombre)) {
-            $errors = error_get_last();
-            $mensaje = 'No pudo copiar el archivo '.$valorImagen.' en '.$nombre.' Error = ['.$errors['message'].']';
-
-            return false;
-        }
-        $this->archivoCopiado = $nombre;
-
-        return true;
-    }
-
-    public function mueveImagenId($tabla, $id, &$mensaje)
-    {
-        if (!$this->comprimeArchivo($tabla.'_'.$id, $mensaje)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private function comprimeArchivo($id, &$mensaje)
-    {
-        $zebra = new Zebra_Image();
-        $zebra->source_path = $this->archivoSubido;
-        $this->archivoComprimido = $this->dirData.'/'.$id.'.'.$this->extension;
-        $zebra->target_path = $this->archivoComprimido;
-        $zebra->jpeg_quality = 100;
-
-        // some additional properties that can be set
-        // read about them in the documentation
-        $zebra->preserve_aspect_ratio = true;
-        $zebra->enlarge_smaller_images = true;
-        $zebra->preserve_time = true;
-
-        // resize the image to exactly 100x100 pixels by using the "crop from center" method
-        // (read more in the overview section or in the documentation)
-        //  and if there is an error, check what the error is about
-        if (!$zebra->resize(640, 480, ZEBRA_IMAGE_CROP_CENTER)) {
-            // if there was an error, let's see what the error is about
-            switch ($zebra->error) {
-                case 1: $mensaje = 'El fichero origen no se ha encontrado!';
-                    break;
-                case 2: $mensaje = 'No se puede leer el archivo origen '.$this->archivoSubido;
-                    break;
-                case 3: $mensaje = 'No se pudo escribir el archivo destino '.$this->archivoComprimido;
-                    break;
-                case 4: $mensaje = 'Formato de fichero origen no soportado '.$this->archivoSubido;
-                    break;
-                case 5: $mensaje = 'Formato de fichero destino no soportado '.$this->archivoComprimido;
-                    break;
-                case 6: $mensaje = 'La versión de la biblioteca GD no soporta el formato de destino '.$this->archivoComprimido;
-                    break;
-                case 7: $mensaje = 'La biblioteca GD no está instalada';
-                    break;
-                case 8: $mensaje = 'el comando "chmod" está deshabilitado por configuración';
-                    break;
-            }
-
-            return false;
-        } else {
-            //Borra el archivo subido
-            unlink($this->archivoSubido);
-
-            return true;
-        }
-    }
-}

Importacion.php

@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -16,21 +17,20 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
-class Importacion
+class Importacion {
-{
+
     private $bdd;
 
-    public function __construct($baseDatos, $registrado)
+    public function __construct($baseDatos, $registrado) {
-    {
          if (!$registrado) {
             return 'Debe registrarse para acceder a este apartado';
         }
         $this->bdd = $baseDatos;
     }
 
-    public function ejecuta()
+    public function ejecuta() {
-    {
         $opc = '';
         if (isset($_GET['opc'])) {
             $opc = $_GET['opc'];
@@ -39,51 +39,28 @@ class Importacion
             case 'form':return $this->formulario();
             case 'importar':return $this->importarFichero();
             case 'ejecutar':return $this->ejecutaFichero();
-            default: return 'Importacion: No entiendo qué me has pedido.';
+            default: return "Importacion: No entiendo qué me has pedido.";
         }
     }
 
-    private function importarFichero()
+    private function importarFichero() {
-    {
+        $uploadfile = "tmp/" . basename($_FILES['fichero']['name']);
-        $uploadfile = TMP.'/'.basename($_FILES['fichero']['name']);
         if (!move_uploaded_file($_FILES['fichero']['tmp_name'], $uploadfile)) {
-            die('No se pudo subir el fichero '.$_FILES['userfile']['tmp_name']);
+            die('No se pudo subir el fichero ' . $_FILES['userfile']['tmp_name']);
         }
         $csv = new Csv($this->bdd);
         $csv->cargaCSV($uploadfile);
-
         return $csv->resumen();
     }
 
-    private function formulario()
+    private function formulario() {
-    {
+        $accion = "index.php?importacion&opc=importar";
-        $accion = 'index.php?importacion&opc=importar';
+        $salida = '<form  enctype="multipart/form-data" name="importacion.form" method="post" action="' . $accion . '">' . "\n";
-        $salida = '';
+        $salida .= "<fieldset style=\"width: 96%;\"><p><legend style=\"color: red;\"><b>Elige Archivo</b></legend>\n";
-        //$salida .= '<script type="text/javascript" src="css/bootstrap-filestyle.min.js"> </script>';
+        $salida .= '<input type="file" name="fichero" id="fichero" onChange="seleccionFichero(this);">';
-        $salida .= '<div class="col-sm-6 col-md-6">';
+        $salida .= '<p align="center"><button class="btn btn-primary" type=submit>Aceptar</button></p><br>' . "\n";
-        $salida .= '<form  enctype="multipart/form-data" name="importacion.form" method="post" action="'.$accion.'">'."\n";
+        $mensaje = utf8_decode('Sólo se permiten archivos con extensión CSV');
-        $salida .= "<fieldset style=\"width: 96%;\"><p><legend style=\"color: red;\"><b>Elige Archivo</b></legend></p>\n";
+        $salida .= "<script type='text/javascript'>
-        //$salida .= '<input type="file" name="fichero" id="fichero" onChange="seleccionFichero(this);" class="filestyle" data-classButton="btn btn-primary">';
-        //$salida .= '<input type="file" name="fichero" id="fichero" onChange="seleccionFichero(this);">';
-        //$salida .= '<input type="file" class="filestyle" data-input="false">';
-        $salida .= '<div class="fileinput fileinput-new" data-provides="fileinput">
-                        <div class="input-group">
-                            <div class="form-control" data-trigger="fileinput">
-                                <i class="glyphicon glyphicon-file fileinput-exists"></i>
-                                <span class="fileinput-filename"></span>
-                            </div>
-                            <span class="input-group-addon btn btn-default btn-file">
-                            <span class="fileinput-new">
-                            <span class="glyphicon glyphicon-folder-open"></span> Selecciona fichero</span>
-                            <span class="fileinput-exists">Cambiar</span><input type="file" name="fichero" id="fichero" onChange="seleccionFichero(this);"></span>
-                            <a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Eliminar</a>
-                        </div>
-                    </div></fieldset>';
-        $salida .= '<p align="center"><button class="btn btn-primary" type=submit><span class="glyphicon glyphicon-cloud-upload"></span> Aceptar</button></p><br>'."\n";
-        $salida .= '</div>';
-        $mensaje = 'Sólo se permiten archivos con extensión CSV';
-        $salida .= "<script type='text/javascript'>"."
-
                 function seleccionFichero(obj) {
                 var filePath = obj.value;
 
@@ -93,16 +70,14 @@ class Importacion
                     location.reload();
                 }}
            </script>";
-
         return $salida;
     }
-
+    private function ejecutaFichero() {
-    private function ejecutaFichero()
-    {
         $archivo = $_POST['ficheroCSV'];
         $csv = new Csv($this->bdd);
         $csv->cargaCSV($archivo);
-
         return $csv->ejecutaFichero();
     }
 }
+
+?>

InformeInventario.php

@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -16,247 +17,192 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
-class InformeInventario
+class InformeInventario {
-{
+
     private $bdd;
 
-    public function __construct($baseDatos)
+    public function __construct($baseDatos) {
-    {
         $this->bdd = $baseDatos;
     }
 
-    public function ejecuta()
+    public function ejecuta() {
-    {
         $opc = $_GET['opc'];
         switch ($opc) {
             case 'Ubicacion':return $this->formularioUbicacion();
             case 'listarUbicacion':return $this->listarUbicacion();
             case 'listarArticulo':return $this->listarArticulo();
-            case 'listarTotal': return $this->listarTotal();
             case 'Articulo':return $this->formularioArticulo();
             case 'Total':return $this->inventarioTotal();
-            case 'descuadres': return $this->inventarioDescuadres();
         }
     }
 
-    private function inventarioDescuadres()
+    private function listarUbicacion() {
-    {
-        $enlace = 'xml/informeDescuadres.xml';
-        $informe = new InformePDF($this->bdd, $enlace, true);
-        $informe->crea($enlace);
-        $informe->cierraPDF();
-
-        return $this->devuelveInforme($informe);
-    }
-
-    private function devuelveInforme($informe)
-    {
-        $letras = 'abcefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-        $nombre = TMP.'/informe'.substr(str_shuffle($letras), 0, 10).'.pdf';
-        $informe->guardaArchivo($nombre);
-
-        return '<div class="container">
-                    <!--<a href="'.$nombre.'" target="_blank"><span class="glyphicon glyphicon-cloud-download" style="font-size:1.5em;"></span>Descargar Informe</a>--> 
-                    <object data="'.$nombre.'" type="application/pdf" width="100%" height="700" style="float:left;">
-                    </object>
-                </div>';
-    }
-
-    private function listarUbicacion()
-    {
         $salidaInforme = isset($_POST['salida']) ? $_POST['salida'] : 'pantalla';
         switch ($salidaInforme) {
-            case 'pantalla':
+            case "pantalla":
-                $fichero = 'xml/inventarioUbicacion.xml';
+                $fichero = "xml/inventarioUbicacion.xml";
-                $salida = TMP.'/inventarioUbicacion.xml';
+                $salida = "tmp/inventarioUbicacion.xml";
                 break;
-            case 'csv':
+            case "csv":
-                $fichero = 'xml/inventarioUbicacionCSV.xml';
+                $fichero = "xml/inventarioUbicacionCSV.xml";
-                $salida = TMP.'/inventarioUbicacionCSV.xml';
+                $salida = "tmp/inventarioUbicacionCSV.xml";
                 break;
-            case 'etiquetas':
+            case "etiquetas":
-                $fichero = 'xml/inventarioUbicacionEtiquetas.xml';
+                $fichero = "xml/inventarioUbicacionEtiquetas.xml";
-                $salida = TMP.'/inventarioUbicacionEtiquetas.xml';
+                $salida = "tmp/inventarioUbicacionEtiquetas.xml";
                 break;
         }
-        $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla '.$fichero);
+        $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla ' . $fichero);
-        $id = $_POST['id'] == null ? $_GET['id'] : $_POST['id'];
+        $id = $_POST['id'] == NULL ? $_GET['id'] : $_POST['id'];
-        $comando = "select * from Ubicaciones where id='".$id."';";
+        $comando = "select * from Ubicaciones where id='" . $id . "';";
         $resultado = $this->bdd->ejecuta($comando);
         if (!$resultado) {
             return $this->bdd->mensajeError($comando);
         }
         $fila = $this->bdd->procesaResultado();
-        $plantilla = str_replace('{id}', $id, $plantilla);
+        $plantilla = str_replace("{id}", $id, $plantilla);
-        $plantilla = str_replace('{Descripcion}', $fila['Descripcion'], $plantilla);
+        $plantilla = str_replace("{Descripcion}", $fila['Descripcion'], $plantilla);
-        file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla '.$salida);
+        file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla ' . $salida);
         switch ($salidaInforme) {
-            case 'pantalla':
+            case "pantalla":
                 $informe = new InformePDF($this->bdd, $salida, true);
                 $informe->crea($salida);
                 $informe->cierraPDF();
-
+                $informe->guardaArchivo("tmp/Informe.pdf");
-                return $this->devuelveInforme($informe);
+                echo '<script type="text/javascript"> window.open( "tmp/Informe.pdf" ) </script>';
-            case 'csv':
+                break;
+            case "csv":
                 //Genera una hoja de cálculo en formato csv
-                $nombre = TMP.'/Ubicacion'.strftime('%Y%m%d').rand(100, 999).'.csv';
+                $nombre = "tmp/Ubicacion" . strftime("%Y%m%d") . rand(100, 999) . ".csv";
                 $hoja = new Csv($this->bdd);
                 $hoja->crea($nombre);
                 $hoja->ejecutaConsulta($salida);
-                echo '<script type="text/javascript"> window.open( "'.$nombre.'" ) </script>';
+                echo '<script type="text/javascript"> window.open( "' . $nombre . '" ) </script>';
                 break;
-            case 'etiquetas':
+            case "etiquetas":
                 $etiquetas = new EtiquetasPDF($this->bdd, $salida, true);
                 $etiquetas->crea($salida);
                 $etiquetas->cierraPDF();
-
+                $etiquetas->guardaArchivo("tmp/EtiquetasUbicacion.pdf");
-                return $this->devuelveInforme($etiquetas);
+                echo '<script type="text/javascript"> window.open( "tmp/EtiquetasUbicacion.pdf" ) </script>';
+                break;
         }
     }
 
-    private function listarArticulo()
+    private function listarArticulo() {
-    {
         $salidaInforme = isset($_POST['salida']) ? $_POST['salida'] : 'pantalla';
         switch ($salidaInforme) {
-            case 'pantalla':
+            case "pantalla":
-                $fichero = 'xml/inventarioArticulo.xml';
+                $fichero = "xml/inventarioArticulo.xml";
-                $salida = TMP.'/inventarioArticulo.xml';
+                $salida = "tmp/inventarioArticulo.xml";
                 break;
-            case 'csv':
+            case "csv":
-                $fichero = 'xml/inventarioArticuloCSV.xml';
+                $fichero = "xml/inventarioArticuloCSV.xml";
-                $salida = TMP.'/inventarioArticuloCSV.xml';
+                $salida = "tmp/inventarioArticuloCSV.xml";
                 break;
-            case 'etiquetas':
+            case "etiquetas":
-                $fichero = 'xml/inventarioArticuloEtiquetas.xml';
+                $fichero = "xml/inventarioArticuloEtiquetas.xml";
-                $salida = TMP.'/inventarioArticuloEtiquetas.xml';
+                $salida = "tmp/inventarioArticuloEtiquetas.xml";
                 break;
         }
-        $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla '.$fichero);
+        $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla ' . $fichero);
-        $id = $_POST['id'] == null ? $_GET['id'] : $_POST['id'];
+        $id = $_POST['id'] == NULL ? $_GET['id'] : $_POST['id'];
-        $comando = "select * from Articulos where id='".$id."';";
+        $comando = "select * from Articulos where id='" . $id . "';";
         $resultado = $this->bdd->ejecuta($comando);
         if (!$resultado) {
             return $this->bdd->mensajeError($comando);
         }
         $fila = $this->bdd->procesaResultado();
-        $plantilla = str_replace('{id}', $id, $plantilla);
+        $plantilla = str_replace("{id}", $id, $plantilla);
-        $plantilla = str_replace('{Descripcion}', $fila['descripcion'], $plantilla);
+        $plantilla = str_replace("{Descripcion}", $fila['descripcion'], $plantilla);
-        $plantilla = str_replace('{Marca}', $fila['marca'], $plantilla);
+        $plantilla = str_replace("{Marca}", $fila['marca'], $plantilla);
-        $plantilla = str_replace('{Modelo}', $fila['modelo'], $plantilla);
+        $plantilla = str_replace("{Modelo}", $fila['modelo'], $plantilla);
-        file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla '.$salida);
+        file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla ' . $salida);
         switch ($salidaInforme) {
-            case 'pantalla':
+            case "pantalla":
                 $informe = new InformePDF($this->bdd, $salida, true);
                 $informe->crea($salida);
                 $informe->cierraPDF();
-
+                $informe->guardaArchivo("tmp/Informe.pdf");
-                return $this->devuelveInforme($informe);
+                echo '<script type="text/javascript"> window.open( "tmp/Informe.pdf" ) </script>'; 
-            case 'csv':
+                break;
+            case "csv":
                 //Genera una hoja de cálculo en formato csv
-                $nombre = TMP.'/Articulo'.strftime('%Y%m%d').rand(100, 999).'.csv';
+                $nombre = "tmp/Articulo" . strftime("%Y%m%d") . rand(100, 999) . ".csv";
                 $hoja = new Csv($this->bdd);
                 $hoja->crea($nombre);
                 $hoja->ejecutaConsulta($salida);
-                echo '<script type="text/javascript"> window.open( "'.$nombre.'" ) </script>';
+                echo '<script type="text/javascript"> window.open( "' . $nombre . '" ) </script>';
                 break;
-            case 'etiquetas':
+            case "etiquetas":
                 $etiquetas = new EtiquetasPDF($this->bdd, $salida, true);
                 $etiquetas->crea($salida);
                 $etiquetas->cierraPDF();
-
+                $etiquetas->guardaArchivo("tmp/EtiquetasArticulo.pdf");
-                return $this->devuelveInforme($etiquetas);
+                echo '<script type="text/javascript"> window.open( "tmp/EtiquetasArticulo.pdf" ) </script>';
+                break;
         }
     }
 
-    private function listaUbicaciones()
+    private function listaUbicaciones() {
-    {
+        $salida = "<select class=\"form-control\" name=\"id\">\n";
-        $salida = "<select class=\"selectpicker show-tick\" name=\"id\" data-live-search=\"true\" data-width=\"auto\">\n";
+        $comando = "select * from Ubicaciones order by Descripcion";
-        $comando = 'select * from Ubicaciones order by Descripcion';
         $resultado = $this->bdd->ejecuta($comando);
         if (!$resultado) {
             return $this->bdd->mensajeError($comando);
         }
         while ($fila = $this->bdd->procesaResultado()) {
-            $salida .= '<option value='.$fila['id'].'>'.$fila['Descripcion']."</option><br>\n";
+            $salida.="<option value=" . $fila['id'] . ">" . $fila['Descripcion'] . "</option><br>\n";
         }
-        $salida .= "</select>\n";
+        $salida.="</select>\n";
-
         return $salida;
     }
 
-    private function listaArticulos()
+    private function listaArticulos() {
-    {
+        $salida = "<select class=\"form-control\" name=\"id\">\n";
-        $salida = "<select class=\"selectpicker show-tick\" name=\"id\" data-live-search=\"true\" data-width=\"auto\">\n";
+        $comando = "select * from Articulos order by descripcion, marca, modelo";
-        $comando = 'select * from Articulos order by descripcion, marca, modelo';
         $resultado = $this->bdd->ejecuta($comando);
         if (!$resultado) {
             return $this->bdd->mensajeError($comando);
         }
         while ($fila = $this->bdd->procesaResultado()) {
-            $salida .= '<option value='.$fila['id'].'>'.$fila['descripcion'].'-'.$fila['marca'].'-'.$fila['modelo']."</option><br>\n";
+            $salida.="<option value=" . $fila['id'] . ">" . $fila['descripcion'] . "-" . $fila['marca'] . "-" . $fila['modelo'] . "</option><br>\n";
         }
-        $salida .= "</select>\n";
+        $salida.="</select>\n";
-
         return $salida;
     }
 
-    private function formulario($accion, $etiqueta, $lista)
+    private function formulario($accion, $etiqueta, $lista) {
-    {
+        $salida = '<div class="col-sm-2 col-md-6"><form name="informeInventario.form" method="post" action="' . $accion . '">' . "\n";
-        $salida = '<div class="col-sm-6 col-md-6"><form name="informeInventario.form" method="post" action="'.$accion.'">'."\n";
+        $salida.="<fieldset style=\"width: 96%;\"><p><legend style=\"color: red;\"><b>Elige $etiqueta</b></legend>\n";
-        $salida .= "<fieldset style=\"width: 96%;\"><p><legend style=\"color: red;\"><b>Elige $etiqueta</b></legend>\n";
+        $salida.="<br><br><label>$etiqueta</label>";
-        $salida .= "<br><br><label>$etiqueta </label>";
+        $salida.=$lista;
-        $salida .= $lista;
+        $salida.="<br><br><label for='salida'>Salida del informe por:</label>";
-        $salida .= "<br><br>
+        $salida.='<div class="radio"><label><input type="radio" name="salida" value="pantalla" checked>Pantalla</label></div>';
-            <label for='salida'>Salida del informe por:</label>";
+        $salida.='<div class="radio"><label><input type="radio" name="salida" value="csv">Archivo CSV</label></div>';
-        $salida .= '<div class="radio"><label><input type="radio" name="salida" value="pantalla" checked><span class="glyphicon glyphicon-list-alt"></span> Pantalla</label></div>';
+        $salida.='<div class="radio"><label><input type="radio" name="salida" value="etiquetas">Etiquetas</label></div>';
-        $salida .= '<div class="radio"><label><input type="radio" name="salida" value="csv"><span class="glyphicon glyphicon-cloud-download"></span> Archivo CSV</label></div>';
+        $salida.="<br><br></fieldset><p>";
-        $salida .= '<div class="radio"><label><input type="radio" name="salida" value="etiquetas"><span class="glyphicon glyphicon-qrcode"></span> Etiquetas (<a target="_new" href="http://www.apli.es/producto/ficha_producto.aspx?referencia=01275&stype=referencia&referenciaValue=01275&q=01275">Apli 1275</a>)</label></div>';
+        $salida.='<p align="center"><button type=submit class="btn btn-primary">Aceptar</button></p><br></div>' . "\n";
-        $salida .= '<br><br></fieldset><p>';
-        $salida .= '<p align="center"><button type=submit class="btn btn-primary"><span class="glyphicon glyphicon-ok"></span> Aceptar</button></p><br></div>'."\n";
-        $salida .= "<script>$('.selectpicker').selectpicker();</script>";
-
         return $salida;
     }
 
-    private function formularioUbicacion()
+    private function formularioUbicacion() {
-    {
         //Genera un formulario con las ubicaciones disponibles.
-        $accion = 'index.php?informeInventario&opc=listarUbicacion';
+        $accion = "index.php?informeInventario&opc=listarUbicacion";
-
         return $this->formulario($accion, 'Ubicaci&oacute;n', $this->listaUbicaciones());
     }
 
-    private function formularioArticulo()
+    private function formularioArticulo() {
-    {
+        $accion = "index.php?informeInventario&opc=listarArticulo";
-        $accion = 'index.php?informeInventario&opc=listarArticulo';
-
         return $this->formulario($accion, 'Art&iacute;culo', $this->listaArticulos());
     }
 
-    private function inventarioTotal()
+    private function inventarioTotal() {
-    {
+        $fichero = "xml/inventarioUbicacion.xml";
-        return $this->dialogo();
+        $salida = "tmp/inventarioUbicacion.xml";
-    }
+        $comando = "select * from Ubicaciones ;";
-
-    private function dialogo()
-    {
-        $dialogo = '<div class="container col-5"><div class="jumbotron">
-                      <h1>Inventario Total</h1>
-                      <p>¿Desea obtener el inventario de todo el centro?</p>
-                      <p><a class="btn btn-primary btn-lg" role="button" onClick="location.href='."'index.php'".'"><span class="glyphicon glyphicon-arrow-left"></span> Volver</a>
-                         <a class="btn btn-success btn-lg" role="button" onClick="location.href='."'index.php?informeInventario&opc=listarTotal'".'">
-                             <span class="glyphicon glyphicon-list-alt"></span> Continuar</a></p>
-                    </div></div>';
-
-        return $dialogo;
-    }
-
-    private function listarTotal()
-    {
-        $fichero = 'xml/inventarioUbicacion.xml';
-        $salida = TMP.'/inventarioUbicacion.xml';
-        $comando = 'select * from Ubicaciones ;';
         $resultado = $this->bdd->ejecuta($comando);
         if (!$resultado) {
             return $this->bdd->mensajeError($comando);
@@ -265,18 +211,21 @@ class InformeInventario
         $bdatos = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
         $primero = true;
         while ($fila = $this->bdd->procesaResultado()) {
-            $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla '.$fichero);
+            //$fila=$this->bdd->procesaResultado();
-            $plantilla = str_replace('{id}', $fila['id'], $plantilla);
+            $plantilla = file_get_contents($fichero) or die('Fallo en la apertura de la plantilla ' . $fichero);
-            $plantilla = str_replace('{Descripcion}', $fila['Descripcion'], $plantilla);
+            $plantilla = str_replace("{id}", $fila['id'], $plantilla);
-            file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla '.$salida);
+            $plantilla = str_replace("{Descripcion}", $fila['Descripcion'], $plantilla);
+            file_put_contents($salida, $plantilla) or die('Fallo en la escritura de la plantilla ' . $salida);
             if ($primero) {
                 $primero = false;
                 $informe = new InformePDF($bdatos, $salida, true);
             }
             $informe->crea($salida);
         }
+        $nombre = "tmp/total.pdf";
         $informe->cierraPDF();
-
+        $informe->imprimeInforme();
-        return $this->devuelveInforme($informe);
     }
 }
+
+?>

InformePDF.php

@@ -1,13 +1,13 @@
+
 <?php
 
 /**
- * genera un documento PDF a partir de una descripción dada en un archivo XML.
+ * genera un documento PDF a partir de una descripción dada en un archivo XML
- *
  * @author Ricardo Montañana <rmontanana@gmail.com>
- *
  * @version 1.0
- *
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -23,10 +23,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
-class InformePDF
+class InformePDF {
-{
+
     /**
+     * 
      * @var basedatos Controlador de la base de datos
      */
     private $bdd;
@@ -35,17 +37,14 @@ class InformePDF
     private $def;
 
     /**
-     * El constructor recibe como argumento el nombre del archivo XML con la definición, encargándose de recuperarla y guardar toda la información localmente.
+     * El constructor recibe como argumento el nombre del archivo XML con la definición, encargándose de recuperarla y guardar toda la información localmente
-     *
      * @param basedatos $bdd manejador de la base de datos
      * @param string $definicion fichero con la definición del informe en XML
-     * @param bool      $registrado usuario registrado si/no
+     * @param boolean $registrado usuario registrado si/no
-     *
      * @return ficheroPDF
      * todo: cambiar este comentario
      */
-    public function __construct($bdd, $definicion, $registrado)
+    public function __construct($bdd, $definicion, $registrado) {
-    {
         if (!$registrado) {
             return 'Debe registrarse para acceder a este apartado';
         }
@@ -55,15 +54,14 @@ class InformePDF
         $this->pdf = new Pdf_mysql_table($this->bdd->obtieneManejador(), (string) $this->def->Pagina['Orientacion'], (string) $this->def->Pagina['Formato'], (string) utf8_decode($this->def->Titulo['Texto']), (string) $this->def->Pagina->Cabecera);
         //echo $def->Titulo.$def->Cabecera;
         $this->pdf->Open();
-        $this->pdf->setAuthor(AUTOR, true);
+        $this->pdf->setAuthor(AUTOR,true);
-        $creador = CENTRO.' '.PROGRAMA.' v'.VERSION;
+        $creador = CENTRO . " " . PROGRAMA.VERSION;
-        $this->pdf->setCreator(html_entity_decode($creador), true);
+        $this->pdf->setCreator(html_entity_decode($creador),true);
-        $this->pdf->setSubject($this->def->Titulo, true);
+        $this->pdf->setSubject($this->def->Titulo,true);
         $this->pdf->setAutoPageBreak(true, 10);
     }
 
-    public function crea($definicion)
+    public function crea($definicion) {
-    {
         
         //print_r($def);echo $bdd;die();
         // Iniciamos la creación del documento
@@ -77,55 +75,48 @@ class InformePDF
         foreach ($this->def->Pagina->Cuerpo->Col as $columna) {
             $this->pdf->AddCol((string) $columna['Nombre'], (string) $columna['Ancho'], (string) $columna['Titulo'], (string) $columna['Ajuste'], (string) $columna['Total']);
         }
-        $prop = ['HeaderColor' => [255, 150, 100],
+        $prop = array('HeaderColor' => array(255, 150, 100),
-            'color1'           => [210, 245, 255],
+            'color1' => array(210, 245, 255),
-            'color2'           => [255, 255, 210],
+            'color2' => array(255, 255, 210),
-            'padding'          => 2, ];
+            'padding' => 2);
         $this->pdf->Table($this->def->Datos->Consulta, $prop);
     }
 
-    public function cierraPDF()
+    public function cierraPDF() {
-    {
         $this->pdf->Close();
         $this->docu = $this->pdf->Output('', 'S');
     }
 
-    public function getContenido()
+    public function getContenido() {
-    {
         return $this->docu;
     }
 
-    public function getCabecera()
+    public function getCabecera() {
-    {
+        $cabecera = "Content-type: application/pdf";
-        $cabecera = 'Content-type: application/pdf';
+        $cabecera = $cabecera . "Content-length: " . strlen($this->docu);
-        $cabecera = $cabecera.'Content-length: '.strlen($this->docu);
+        $cabecera = $cabecera . "Content-Disposition: inline; filename=tmp/Informe.pdf";
-        $cabecera = $cabecera.'Content-Disposition: inline; filename='.TMP.'/Informe.pdf';
-
         return $cabecera;
     }
 
-    public function guardaArchivo($nombre)
+    public function guardaArchivo($nombre = "tmp/Informe.pdf") {
-    {
+        $fichero = fopen($nombre, "w");
-        if (!isset($nombre)) {
-            $nombre = TMP.'/Informe.pdf';
-        }
-        $fichero = fopen($nombre, 'w');
         fwrite($fichero, $this->getCabecera());
         fwrite($fichero, $this->getContenido(), strlen($this->getContenido()));
         fclose($fichero);
     }
 
-    public function enviaCabecera()
+    public function enviaCabecera() {
-    {
+        header("Content-type: application/pdf");
-        header('Content-type: application/pdf');
         $longitud = strlen($this->docu);
         header("Content-length: $longitud");
-        header('Content-Disposition: inline; filename='.TMP.'/Informe.pdf');
+        header("Content-Disposition: inline; filename=tmp/Informe.pdf");
     }
 
-    public function imprimeInforme()
+    public function imprimeInforme() {
-    {
         $this->enviaCabecera();
         echo $this->docu;
     }
+
 }
+
+?>

Instalar.php

@@ -1,588 +0,0 @@
-<?php
-/**
- * Programa de instalación que genera el entorno de ejecución
- * tanto el fichero de configuración como la base de datos.
- *
- * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
- * @license http://www.gnu.org/licenses/gpl-3.0.txt
- * This file is part of Inventario.
- * Inventario is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Inventario 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 Inventario.  If not, see <http://www.gnu.org/licenses/>.
- */
-//Se incluyen los módulos necesarios
-function __autoload($class_name)
-{
-    require_once $class_name.'.php';
-}
-
-require_once 'inc/configuracion.inc';
-define('NUMPASOS', 3);
-//Para el Paso 1
-define('MINBYTES', 4096000); // post_max_size y max_upload van con esto
-define('CADENAMINBYTES', '4M');
-define('CONFIGURACION', 'inc/configuracion.inc');
-define('CONFIGTMP', TMP.'/config.tmp');
-define('INC', './inc');
-
-$instalar = new Instalar();
-if ($instalar->error) {
-    echo $instalar->panelError();
-
-    return;
-}
-echo $instalar->ejecuta();
-
-class Instalar
-{
-    private $contenido;
-    private $plant;
-    public $error;
-    public $error_msj;
-
-    public function __construct()
-    {
-        //Selecciona la plantilla a utilizar
-        $this->plant = 'plant/';
-        $this->plant .= PLANTILLA;
-        $this->plant .= '.html';
-        $this->error = false;
-        $this->eror_msj = '';
-        if (INSTALADO != 'no') {
-            $this->error = true;
-            $this->error_msj = 'El programa ya está instalado';
-        }
-        /*if ($this->existenDatos()) {
-            $this->error = true;
-            $this->error_msj = "El indicador de instalación tiene 'no' pero la base de datos " . BASEDATOS . " contiene la tabla Articulos.";
-        }*/
-    }
-
-    private function existenDatos()
-    {
-        //Comprueba si existe la tabla Articulos
-        $sql = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
-        if ($sql->error()) {
-            return false;
-        }
-        $sql->ejecuta('select * from Articulos;');
-        if ($sql->error()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function ejecuta()
-    {
-        $paso = isset($_GET['paso']) ? $_GET['paso'] : 0;
-        $paso = $paso > NUMPASOS ? '0' : $paso;
-        $i = 0;
-        //Si quiere ir a un determinado paso se asegura que estén completos los anteriores
-        for ($i = 0; $i < $paso; $i++) {
-            $funcion = 'validaPaso'.$i;
-            if (!$this->$funcion()) {
-                break;
-            }
-        }
-        $funcion = 'paso'.$i;
-        $this->contenido = $this->$funcion();
-        $salida = new Distribucion($this->plant, $this);
-
-        return $salida->procesaPlantilla();
-    }
-
-    // Cuestiones relacionadas con el servidor
-    private function paso0()
-    {
-        $info = '<ul class="list-group">';
-        $info .= '<li class="list-group-item list-group-item-info">Configuración de PHP (php.ini)</li>';
-        // display_errors
-        $displayErr = ini_get('display_errors');
-        $displayErr = $displayErr == '1' || $displayErr == 'on' ? 'on' : 'off';
-        $mensaje = $displayErr == 'off' ? $this->retornaLabel(false, 'Se debe deshabilitar la impresión de errores') :
-                                          $this->retornaLabel(true, 'Se debe deshabilitar la impresión de errores', 'warning');
-        $info .= $this->retornaElemento($mensaje, 'display_errors', $displayErr);
-        // post_max_size
-        $postMax = ini_get('post_max_size');
-        $mensaje = $this->retornaBytes($postMax) >= MINBYTES ? $this->retornaLabel(false, 'Mínimo: '.CADENAMINBYTES) :
-                                                               $this->retornaLabel(true, 'Mínimo: '.CADENAMINBYTES);
-        $info .= $this->retornaElemento($mensaje, 'post_max_size', $postMax);
-        // upload_max_filesize
-        $uploadMax = ini_get('upload_max_filesize');
-        $mensaje = $this->retornaBytes($uploadMax) >= MINBYTES ? $this->retornaLabel(false, 'Mínimo: '.CADENAMINBYTES) :
-                                                                 $this->retornaLabel(true, 'Mínimo: '.CADENAMINBYTES);
-        $info .= $this->retornaElemento($mensaje, 'upload_max_filesize', $uploadMax);
-        // mysqli
-        $mysql = extension_loaded('mysqli');
-        $mysql = $mysql ? 'on' : 'off';
-        $mensaje = $mysql ? $this->retornaLabel(false, 'Tiene que estar cargada la extensión MySQLi para poder funcionar') :
-                            $this->retornaLabel(true, 'Tiene que estar cargada la extensión MySQLi para poder funcionar');
-        $info .= $this->retornaElemento($mensaje, 'extensión MySQLi', $mysql);
-        $info .= '<li class="list-group-item list-group-item-info">Configuración de la Aplicación</li>';
-        // img.dat
-        $mensaje = is_writable(IMAGEDATA) ? $this->retornaLabel(false, 'Se debe poder escribir en el directorio '.IMAGEDATA) :
-                                      $this->retornaLabel(true, 'Se debe poder escribir en el directorio '.IMAGEDATA);
-        $valor = is_writable(IMAGEDATA) ? 'Sí' : 'No';
-        $info .= $this->retornaElemento($mensaje, 'Se puede escribir en '.IMAGEDATA, $valor);
-
-        // tmp
-        $mensaje = is_writable(TMP) ? $this->retornaLabel(false, 'Se debe poder escribir en el directorio '.TMP) :
-                                      $this->retornaLabel(true, 'Se debe poder escribir en el directorio '.TMP);
-        $valor = is_writable(TMP) ? 'Sí' : 'No';
-        $info .= $this->retornaElemento($mensaje, 'Se puede escribir en '.TMP, $valor);
-
-        // inc
-        $mensaje = is_writable(INC) ? $this->retornaLabel(false, 'Se debe poder escribir en el directorio '.INC) :
-                                      $this->retornaLabel(true, 'Se debe poder escribir en el directorio '.INC);
-        $valor = is_writable(INC) ? 'Sí' : 'No';
-        $info .= $this->retornaElemento($mensaje, 'Se puede escribir en '.INC, $valor);
-
-        // configuracion.inc
-        $mensaje = is_writable(CONFIGURACION) ? $this->retornaLabel(false, 'Se debe poder escribir en el fichero de configuración '.CONFIGURACION) :
-                                                $this->retornaLabel(true, 'Se debe poder escribir en el fichero de configuración '.CONFIGURACION);
-        $valor = is_writable(CONFIGURACION) ? 'Sí' : 'No';
-        $info .= $this->retornaElemento($mensaje, 'Se puede escribir en '.CONFIGURACION, $valor);
-
-        // Final del paso
-        $info .= '</ul>';
-        $info .= $this->validaPaso0() ? $this->retornaBoton(false, 'Instalar.php?paso=1') : $this->retornaBoton(true, 'Instalar.php');
-        $panel = $this->panelMensaje($info, 'primary', 'PASO 1: Configuración del servidor y la aplicación');
-
-        return $panel;
-    }
-
-    private function retornaElemento($validacion, $mensaje, $valor)
-    {
-        $info = '<li class="list-group-item">';
-        $info .= $validacion.' '.$mensaje.': <span class="badge">'.$valor.'</span>';
-        $info .= '</li>';
-
-        return $info;
-    }
-
-    private function retornaBoton($error, $paso, $javascript = true)
-    {
-        $anadido = $javascript ? 'onclick="location.href='."'".$paso."'".'"' : '';
-        if (!$error) {
-            return '<button '.$anadido.' type="submit" class="btn btn-success btn-lg pull-right">Continuar <span class="glyphicon glyphicon-arrow-right"></span></button>';
-        } else {
-            return '<button '.$anadido.' type="submit" class="btn btn-danger btn-lg pull-right">Comprobar de nuevo <span class="glyphicon glyphicon-repeat"></span></button>';
-        }
-    }
-
-    private function botonVolver($enlace)
-    {
-        $boton = '<button type="button" onClick="location.href='."'$enlace'".'" class="btn btn-success btn-lg pull-left">Paso anterior <span class="glyphicon glyphicon-arrow-left"></span></button>';
-
-        return $boton;
-    }
-
-    private function retornaLabel($error, $mensaje, $tipo = 'danger')
-    {
-        if ($error) {
-            $nombre1 = $tipo;
-            $nombre2 = 'remove';
-        } else {
-            $nombre1 = 'success';
-            $nombre2 = 'ok';
-        }
-        $mensaje = '<a href="#" data-placement="right" data-toggle="popover" data-content="'.$mensaje.
-                   '"><span class="label label-'.$nombre1.'"><span class="glyphicon glyphicon-'.$nombre2.
-                   '"></span></a>';
-        $mensaje .= '<script>$(function () { $("[data-toggle=\'popover\']").popover(); });</script>';
-
-        return $mensaje;
-    }
-
-    private function retornaBytes($val)
-    {
-        $val = trim($val);
-        $last = strtolower($val[strlen($val) - 1]);
-        switch ($last) {
-            // El modificador 'G' está disponble desde PHP 5.1.0
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
-
-        return $val;
-    }
-
-    private function validaPaso0()
-    {
-        $validar = true;
-        $postMax = ini_get('post_max_size');
-        $uploadMax = ini_get('upload_max_filesize');
-        $mysql = extension_loaded('mysqli');
-        $escConfig = is_writable(CONFIGURACION);
-        $escInc = is_writable(INC);
-        $escTMP = is_writable(TMP);
-        $escIMG = is_writable(IMAGEDATA);
-        if ($this->retornaBytes($postMax) < MINBYTES) {
-            $validar = false;
-        }
-        if ($this->retornaBytes($uploadMax) < MINBYTES) {
-            $validar = false;
-        }
-        if (!$mysql) {
-            $validar = false;
-        }
-        if (!$escConfig) {
-            $validar = false;
-        }
-        if (!$escTMP) {
-            $validar = false;
-        }
-        if (!$escIMG) {
-            $validar = false;
-        }
-        if (!$escInc) {
-            $validar = false;
-        }
-
-        return $validar;
-    }
-
-    private function actualizaConfiguracion($grabar, $campos, &$datos)
-    {
-        $conf = new Configuracion();
-        $fichero = $conf->obtieneFichero();
-        $datosFichero = explode("\n", $fichero);
-        if ($grabar) {
-            $fsalida = @fopen(CONFIGTMP, 'wb');
-        }
-        foreach ($datosFichero as $linea) {
-            if (stripos($linea, 'DEFINE') !== false) {
-                $conf->obtieneDatos($linea, $clave, $valor);
-                if (stripos($campos, $clave) !== false) {
-                    if ($grabar) {
-                        $linea = str_replace($valor, $datos[$clave], $linea);
-                        $valor = $datos[$clave];
-                    }
-                }
-                $datos[$clave] = $valor;
-            }
-            $registro = substr($linea, 0, 2) == '?>' ? $linea : $linea."\n";
-            if ($grabar) {
-                fwrite($fsalida, $registro);
-            }
-        }
-        if ($grabar) {
-            fclose($fsalida);
-            unlink(CONFIGURACION);
-            rename(CONFIGTMP, CONFIGURACION);
-        }
-    }
-
-    // Cuestiones de la base de datos
-    private function paso1()
-    {
-        $grabar = isset($_POST['SERVIDOR']);
-        $campos = 'SERVIDOR,PUERTO,BASEDATOS,USUARIO,CLAVE';
-        //Lee y si hace falta actualiza los datos del formulario en el fichero de configuración
-        if ($grabar) {
-            foreach ($_POST as $clave => $valor) {
-                $datos[$clave] = $valor;
-            }
-        } else {
-            $datos = [];
-        }
-        $this->actualizaConfiguracion($grabar, $campos, $datos);
-        if ($grabar && $this->validaPaso1()) {
-            //Pasa al paso siguiente
-            return $this->paso2();
-        }
-
-        $info = '<form method="post" name="conf" action="Instalar.php?paso=1">';
-        $info .= '<ul class="list-group">';
-        $info .= '<li class="list-group-item list-group-item-info">Datos de configuración</li>';
-        $info .= '<li class="list-group-item">Servidor <input type="text" name="SERVIDOR" class="form-control" placeholder="Nombre del servidor o dirección IP" value="'.$datos['SERVIDOR'].'"></li>';
-        $info .= '<li class="list-group-item">Puerto <input type="text" name="PUERTO" class="form-control" placeholder="Puerto de conexión" value="'.$datos['PUERTO'].'"></li>';
-        $info .= '<li class="list-group-item">Base de Datos <input type="text" name="BASEDATOS" class="form-control" placeholder="Nombre de la Base de Datos" value="'.$datos['BASEDATOS'].'"></li>';
-        $info .= '<li class="list-group-item">Usuario <input type="text" name="USUARIO" class="form-control" placeholder="Usuario" value="'.$datos['USUARIO'].'"></li>';
-        $info .= '<li class="list-group-item">Contraseña <input type="text" name="CLAVE" class="form-control" placeholder="Contraseña" value="'.$datos['CLAVE'].'"></li>';
-        $info .= '</ul>';
-        $info .= $this->botonVolver('Instalar.php');
-        $info .= $this->validaPaso1() ? $this->retornaBoton(false, 'Instalar.php?paso=1', false) : $this->retornaBoton(true, 'Instalar.php?paso=1', false);
-        $info .= '</form>';
-        $panel = $this->panelMensaje($info, 'primary', 'PASO 2: Configuración de la Base de Datos.');
-
-        return $panel;
-    }
-
-    private function validaPaso1()
-    {
-        $sql = new Sql(SERVIDOR, USUARIO, CLAVE, '');
-        if ($sql->error()) {
-            return false;
-        }
-        $sql = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
-        if ($sql->error()) {
-            return false;
-        }
-        $comando = 'create table test2 (id int(10));';
-        $sql->ejecuta($comando);
-        if ($sql->error()) {
-            return false;
-        }
-        $comando = 'drop table test2;';
-        $sql->ejecuta($comando);
-        if ($sql->error()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    // Usuario administrador
-    private function paso2()
-    {
-        if (isset($_POST['usuario'])) {
-            //ha enviado el formulario.
-            //Crea la base de datos
-            $borra_database = 'DROP DATABASE '.BASEDATOS.' ;';
-            $database = 'CREATE DATABASE '.BASEDATOS.' DEFAULT CHARACTER SET utf8;';
-            $articulos = "CREATE TABLE `Articulos` (
-                              `id` smallint(6) NOT NULL auto_increment COMMENT 'ordenable,link/Articulo',
-                              `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,ajax/text',
-                              `marca` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
-                              `modelo` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
-                              `cantidad` int(11) default NULL COMMENT 'ordenable,ajax/number',
-                              `imagen` varchar(45) default NULL COMMENT 'imagen',
-                              PRIMARY KEY  (`id`)
-                            ) ENGINE=InnoDB AUTO_INCREMENT=769 DEFAULT CHARSET=utf8;
-                            ";
-            $ubicaciones = "CREATE TABLE `Ubicaciones` (
-                              `id` smallint(5) unsigned NOT NULL auto_increment COMMENT 'ordenable,link/Ubicacion',
-                              `Descripcion` varchar(50) NOT NULL COMMENT 'ordenable,ajax/text',
-                              `imagen` varchar(45) DEFAULT NULL COMMENT 'imagen',
-                              PRIMARY KEY  (`id`)
-                            ) ENGINE=InnoDB AUTO_INCREMENT=179 DEFAULT CHARSET=utf8;
-                            ";
-            $elementos = "CREATE TABLE `Elementos` (
-                              `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-                              `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
-                              `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
-                              `numserie` varchar(30) default NULL COMMENT 'ordenable,ajax/text',
-                              `cantidad` int(10) unsigned default NULL COMMENT 'ordenable,ajax/number',
-                              `fechaCompra` date NOT NULL COMMENT 'ordenable,ajax/combodate',
-                              `imagen` varchar(45) default NULL COMMENT 'imagen',
-                              PRIMARY KEY  (`id`),
-                              KEY `id` (`id`),
-                              KEY `id_Articulo` (`id_Articulo`),
-                              KEY `id_Ubicacion` (`id_Ubicacion`),
-                              CONSTRAINT `Elementos_ibfk_1` FOREIGN KEY (`id_Articulo`) REFERENCES `Articulos` (`id`) ON DELETE CASCADE,
-                              CONSTRAINT `Elementos_ibfk_2` FOREIGN KEY (`id_Ubicacion`) REFERENCES `Ubicaciones` (`id`) ON UPDATE CASCADE
-                            ) ENGINE=InnoDB AUTO_INCREMENT=1789 DEFAULT CHARSET=utf8;
-                            ";
-            $usuarios = "CREATE TABLE `Usuarios` (
-                              `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
-                              `nombre` varchar(16) NOT NULL default '' COMMENT 'ajax/text',
-                              `clave` varchar(32) NOT NULL default '' COMMENT 'ajax/text',
-                              `idSesion` varchar(20) NOT NULL default '' COMMENT 'ajax/text',
-                              `alta` tinyint(1) NOT NULL default '0',
-                              `modificacion` tinyint(1) NOT NULL default '0',
-                              `borrado` tinyint(1) NOT NULL default '0',
-                              `consulta` tinyint(1) NOT NULL default '1',
-                              `informe` tinyint(1) NOT NULL default '1',
-                              `usuarios` tinyint(1) NOT NULL default '0',
-                              `config` tinyint(1) NOT NULL default '0',
-                              PRIMARY KEY  (`id`),
-                              KEY `nombre` (`nombre`)
-                            ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
-                            ";
-            $letras = 'abcefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-            $sesion = substr(str_shuffle($letras), 0, 8);
-            $usuario = $_POST['usuario'];
-            $clave = $_POST['clave'];
-            $administrador = "insert into Usuarios values (null,'$usuario','$clave','$sesion','1','1','1','1','1','1','1');";
-
-            @mysqli_query($borra_database);
-            @mysqli_query($database);
-            $sql = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
-            $sql->ejecuta($ubicaciones);
-            if ($sql->error()) {
-                return $this->panelMensaje($sql->mensajeError(), 'danger', 'ERROR');
-            }
-            $sql->ejecuta($articulos);
-            if ($sql->error()) {
-                return $this->panelMensaje($sql->mensajeError(), 'danger', 'ERROR');
-            }
-            $sql->ejecuta($elementos);
-            if ($sql->error()) {
-                return $this->panelMensaje($sql->mensajeError(), 'danger', 'ERROR');
-            }
-            $sql->ejecuta($usuarios);
-            if ($sql->error()) {
-                return $this->panelMensaje($sql->mensajeError(), 'danger', 'ERROR');
-            }
-            $sql->ejecuta($administrador);
-            if ($sql->error()) {
-                return $this->panelMensaje($sql->mensajeError(), 'danger', 'ERROR');
-            }
-            $campos = 'INSTALADO';
-            $datos['INSTALADO'] = 'sí';
-            $this->actualizaConfiguracion(true, $campos, $datos);
-
-            return $this->resumen();
-        }
-
-        $info = '      
-        <form data-toggle="validator" role="form" class="form-horizontal" method="post" action="Instalar.php?paso=2">
-                <div class="form-group">
-                    <label for="usuario" class="control-label col-sm-2">Usuario</label>
-                    <div class="form-group col-sm-10">
-                        <input type="text" class="form-control" id="usuario" name="usuario" placeholder="nombre de usuario" data-minlength="5" data-minlength-error="Mínimo 5 caracteres" required>
-                        <div class="help-block with-errors">Mínimo 5 caracteres</div>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label for="clave" class="control-label col-sm-2">Contraseña</label>
-                    <div class="form-group col-sm-10">
-                        <input type="password" data-toggle="validator" data-minlength="6" class="form-control" id="clave" name="clave" placeholder="Contraseña" data-minlength-error="Mínimo 6 caracteres" required>
-                        <span class="help-block with-errors">Mínimo 6 caracteres</span>
-                        <input type="password" class="form-control" id="claverepetida" data-match="#clave" data-match-error="No coincide" data-minlength-error="Mínimo 6 caracteres" placeholder="Confirmar contraseña" required>
-                        <div class="help-block with-errors">Mínimo 6 caracteres</div>
-                    </div>
-                </div>
-
-                <div class="form-group col-sm-12">
-                '.$this->botonVolver('Instalar.php?paso=1').'
-                    <button type="submit" class="btn btn-primary pull-right btn-lg" disabled="disabled">Crear base de datos y usuario <span class="glyphicon glyphicon-arrow-right"></button>
-                </div>
-            </div>
-        </form>
-        <script type="text/javascript" src="./css/validator.min.js"></script>';
-        $panel = $this->panelMensaje($info, 'primary', 'PASO 3: Creación de la base de datos y el usuario administrador.');
-
-        return $panel;
-    }
-
-    private function validaPaso2()
-    {
-        //La validación de este paso se hace con la del formulario en javascript
-        return true;
-    }
-
-    public function panelMensaje($info, $tipo = 'info', $cabecera = '&iexcl;Atenci&oacute;n!')
-    {
-        $mensaje = '<div class="panel panel-'.$tipo.' col-sm-6"><div class="panel-heading">';
-        $mensaje .= '<h3 class="panel-title">'.$cabecera.'</h3></div>';
-        $mensaje .= '<div class="panel-body">';
-        $mensaje .= $info;
-        $mensaje .= '</div>';
-        $mensaje .= '</div>';
-
-        return $mensaje;
-    }
-
-    public function contenido()
-    {
-        return $this->contenido;
-    }
-
-    public function menu()
-    {
-        return '';
-    }
-
-    public function opcion()
-    {
-        return 'INSTALACI&Oacute;N';
-    }
-
-    public function control()
-    {
-        return '';
-    }
-
-    public function aplicacion()
-    {
-        return PROGRAMA.' v'.VERSION;
-    }
-
-    public function usuario()
-    {
-        return '';
-    }
-
-    public function fecha()
-    {
-        $idioma = 'es_ES';
-        $formato = '%d-%b-%y';
-        setlocale(LC_TIME, $idioma);
-
-        return strftime($formato);
-    }
-
-    public function cabecera()
-    {
-        return '<!DOCTYPE html>
-                <html lang="es">
-                    <head>
-                        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-                        <meta charset="utf-8">
-                        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-                        <meta name="viewport" content="width=device-width, initial-scale=1">
-                        <meta name="description" content="">
-                        <meta name="author" content="Ricardo Montañana">
-                        <link rel="shortcut icon" href="img/tux.ico">
-                        <title>Inventario</title>
-                        <!-- Bootstrap core CSS -->
-                        <link href="css/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-                        <!-- Custom styles for this template -->
-                        <link href="css/dashboard.php" rel="stylesheet">
-                        <link href="css/bootstrap-datetimepicker.min.css" rel="stylesheet">
-                        <link rel="stylesheet" href="css/jquery.simplecolorpicker.css">
-                        <link rel="stylesheet" href="css/jquery.simplecolorpicker-glyphicons.css">
-                        <link rel="stylesheet" href="css/jasny-bootstrap.min.css">
-                        <link rel="stylesheet" href="css/bootstrap-select/bootstrap-select.min.css">
-                        <style type="text/css"></style>
-
-                        <script type="text/javascript" src="./css/jquery.min.js"></script>
-                        <script type="text/javascript" src="./css/bootstrap-select/bootstrap-select.min.js"></script>
-                    </head>
-                    <body>';
-    }
-
-    public function panelError()
-    {
-        $mensaje = $this->cabecera();
-        $mensaje .= $this->panelMensaje($this->error_msj, 'danger', '&iexcl;ERROR!');
-        $mensaje .= '</body></html>';
-
-        return $mensaje;
-    }
-
-    private function resumen()
-    {
-        $info = '<ul class="list-group">';
-        $info .= '<li class="list-group-item list-group-item-info">Paso 1</li>';
-        $info .= $this->retornaElemento($this->retornaLabel(false, ''), 'Configuración de PHP');
-        $info .= $this->retornaElemento($this->retornaLabel(false, ''), 'Configuración de la aplicación');
-        $info .= '<li class="list-group-item list-group-item-info">Paso 2</li>';
-        $info .= $this->retornaElemento($this->retornaLabel(false, ''), 'Configuración de la base de datos');
-        $info .= '<li class="list-group-item list-group-item-info">Paso 3</li>';
-        $info .= $this->retornaElemento($this->retornaLabel(false, ''), 'Creación de Base de datos');
-        $info .= $this->retornaElemento($this->retornaLabel(false, ''), 'Creación del usuario administrador');
-        $info .= '</ul>';
-        $info .= $this->retornaBoton(false, 'index.php', true);
-        $panel = $this->panelMensaje($info, 'success', 'Instalación finalizada.');
-
-        return $panel;
-    }
-}

Inventario.php

@@ -2,11 +2,9 @@
 
 /**
  * Clase Inventario que controla la ejecución principal del programa.
- *
  * @author Ricardo Montañana Gómez <rmontanana@gmail.com>
- *
  * @version 1.0
- *
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -22,14 +20,15 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
 // Clase del objeto principal de la aplicación
-class Inventario
+class Inventario {
-{
+
     // Declaración de miembros
     private $bdd; // Enlace con el SGBD
     private $registrado; // Usuario registrado s/n
-    private $usuario = null; // Nombre del usuario
+    private $usuario = NULL; // Nombre del usuario
     private $clave; //contraseña del usuario
     private $opcActual; // Opción elegida por el usuario
     private $perfil; //Permisos del usuario.
@@ -37,34 +36,27 @@ class Inventario
     private $plant;
 
     // Constructor
-    public function __construct()
+    public function __construct() {
-    {
         // Analizamos la cadena de solicitud para saber
         // qué opción es la actual
         $this->opcActual = $_SERVER['QUERY_STRING'] == '' ? 'principal' : $_SERVER['QUERY_STRING'];
-        //Si el programa no está instalado, llama al instalador.
-        if (INSTALADO == 'no') {
-            header('location: Instalar.php');
-
-            return;
-        }
         // Iniciamos una sesión
         session_start();
         //Conexión con la base de datos.
         $this->bdd = new Sql(SERVIDOR, USUARIO, CLAVE, BASEDATOS);
         if ($this->bdd->error()) {
             echo '<h1>Fallo al conectar con el servidor MySQL.</h1>';
-            echo 'Servidor [ '.SERVIDOR.' ] base de datos ['.BASEDATOS.']';
+            echo SERVIDOR;
+            echo "Servidor [ " . SERVIDOR . " ] usuario [" . USUARIO . "] clave [" . CLAVE . "] base [" . BASEDATOS . "]";
             $this->estado = false;
-
             return;
         } else {
             $this->estado = true;
         }
         //Selecciona la plantilla a utilizar
-        $this->plant = 'plant/';
+        $this->plant='plant/';
-        $this->plant .= PLANTILLA;
+        $this->plant.=PLANTILLA;
-        $this->plant .= '.html';
+        $this->plant.='.html';
         // Comprobamos si el usuario ya está registrado en esta sesión
         $this->registrado = isset($_SESSION['Registrado']);
         if ($this->registrado) {// si está...
@@ -80,16 +72,14 @@ class Inventario
         }
     }
 
-    public function estado()
+    public function estado() {
-    {
         return $this->estado;
     }
 
 //     Esta función pondrá en marcha la aplicación ocupándose
 //     de las acciones que no generan contenido, esto es
 //     iniciar sesión, cerrarla, etc.
-    public function Ejecuta()
+    public function Ejecuta() {
-    {
         // Dependiendo de la opción a procesar
         switch ($this->opcActual) {
             // El usuario quiere cerrar la sesión actual
@@ -114,7 +104,7 @@ class Inventario
                     $_SESSION['Usuario'] = $this->usuario;
                     $_SESSION['Perfil'] = $this->perfil;
                     // y enviamos la cookie para reconocerlo la próxima vez
-                    setcookie('InventarioId', $resultado, time() + 3600 * 24 * 365);
+                    setcookie('InventarioId', $resultado, time() + 3600 * 24);
                     // Lo enviamos a la página de bienvenida
                     header('Location: index.php?bienvenido');
                     exit;
@@ -123,7 +113,7 @@ class Inventario
                 header('location:index.php?usuario_incorrecto');
                 exit;
             case 'usuario_incorrecto':
-                $this->opcActual = 'principal';
+                $this->opcActual = "principal";
                 $contenido = $this->creaContenido();
                 $contenido->usuario_incorrecto();
                 $salida = new Distribucion($this->plant, $contenido);
@@ -134,23 +124,33 @@ class Inventario
                 // Creamos un objeto Distribución facilitándole el
                 // nombre del archivo plantilla y el objeto que aportará
                 // el contenido
+                $opc = $_GET['opc'];
+                list($opcion, $parametro) = explode("&", $this->opcActual);
+                switch ($opc) {
+                    case 'informe':
+                        $enlace = 'xml/informe' . ucfirst($opcion) . '.xml';
+                        //$enlace="tmp/inventarioUbicacion.xml";
+                        $informe = new InformePDF($this->bdd, $enlace, $this->registrado);
+                        $informe->crea($enlace);
+                        $informe->cierraPDF();
+                        $informe->imprimeInforme();
+                        return;
+                    default:
                         $salida = new Distribucion($this->plant, $this->creaContenido());
                         echo $salida->procesaPlantilla();
                         break;
-
+                }
         }
     }
 
-    private function creaContenido()
+    private function creaContenido() {
-    {
         return new AportaContenido($this->bdd, $this->registrado, $this->usuario, $this->perfil, $this->opcActual);
     }
 
     // Esta función comprueba si el usuario está o no registrado,
     // devolviendo su IdSesion en caso afirmativo o false
     // en caso contrario
-    private function usuarioRegistrado()
+    private function usuarioRegistrado() {
-    {
         $this->usuario = $_POST['usuario'];
         $this->clave = $_POST['clave'];
         // ejecuta la consulta para buscar el usuario
@@ -174,11 +174,10 @@ class Inventario
         return false;
     }
 
-    private function creaPerfil($fila)
+    private function creaPerfil($fila) {
-    {
+        return array("Consulta" => $fila['consulta'], "Modificacion" => $fila['modificacion'],
-        return ['Consulta' => $fila['consulta'], 'Modificacion' => $fila['modificacion'],
+            "Alta" => $fila['alta'], "Borrado" => $fila['borrado'], "Informe" => $fila['informe'],
-            'Alta'         => $fila['alta'], 'Borrado' => $fila['borrado'], 'Informe' => $fila['informe'],
+            "Usuarios" => $fila['usuarios'], "Config" => $fila['config']);
-            'Usuarios'     => $fila['usuarios'], 'Config' => $fila['config'], ];
     }
 
     // Esta función intenta recuperar el nombre del usuario
@@ -186,8 +185,7 @@ class Inventario
     // dejando las variables Registrado y Usuario con
     // los valores apropiados
     // @param String Identificador de sesión del usuario actual
-    private function recuperaNombreConId($idSesion)
+    private function recuperaNombreConId($idSesion) {
-    {
         // para ejecutar la consulta para buscar el Id de sesión
         $res = $this->bdd->ejecuta("SELECT * FROM Usuarios WHERE idSesion='$idSesion'");
         // Si no hemos encontrado el ID
@@ -212,4 +210,7 @@ class Inventario
             $_SESSION['Perfil'] = $this->perfil;
         }
     }
+
 }
+
+?>

Menu.php

@@ -1,5 +1,6 @@
 <?php
-/**
+    /**
+     * @package Inventario
      * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
      * @license http://www.gnu.org/licenses/gpl-3.0.txt
      * This file is part of Inventario.
@@ -15,43 +16,37 @@
      * 
      * You should have received a copy of the GNU General Public License
      * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+     *  
      */
 //
 // Esta clase generará el menú de la aplicación.
-class Menu
+class Menu {
-{
     private $opciones;
-
     public function __construct($fichero)
     {
-        $contenido = @file_get_contents($fichero) or
+        $contenido=@file_get_contents($fichero) or
             die("<h1>No puedo generar el menú. No puedo acceder al fichero $fichero</h1>");
         // Obtenemos la lista de pares Opción|Enlace
-        $elementos = explode("\n", $contenido);
+        $elementos=explode("\n", $contenido);
-        foreach ($elementos as $elemento) {
+        foreach($elementos as $elemento) {
-            list($tipo, $opcion, $enlace, $destino, $titulo) = explode('|', $elemento);
+            list($tipo, $opcion, $enlace, $destino, $titulo)=explode('|', $elemento);
             // Los guardamos en la matriz de opciones
-            if ($tipo) {
+            if ($tipo)
-                $this->opciones[] = $tipo.','.$opcion.','.$enlace.','.$destino.','.$titulo;
+                $this->opciones[]=$tipo.",".$opcion.",".$enlace.",".$destino.",".$titulo;
         }
     }
-    }
-
     public function insertaMenu()
     {
-        $salida = '';
+        $salida="";
         reset($this->opciones);
-        foreach ($this->opciones as $opcion) {
+        foreach($this->opciones as $opcion) {
-            list($tipo, $opcion, $enlace, $destino, $titulo) = explode(',', $opcion);
+            list($tipo,$opcion,$enlace,$destino,$titulo)=explode(",",$opcion);
-            if ($tipo == 2) {
+            if ($tipo==2)
-                $salida .= '<li class="active"><a href="'.$enlace.'" target="'.$destino.'" title="'.$titulo.'">'.$opcion.'</a><br /></li>';
+                $salida.='<li class="active"><a href="'.$enlace.'" target="'.$destino.'" title="'.$titulo.'">'.$opcion.'</a><br /></li>';
-            } else {
+            else
-                $salida .=
+                $salida.='<label class="key">'.$opcion.'</label><br/>';
-                    //'<span class="label label-default">'.$opcion.'</span><br>';
-                    '<label class="">'.$opcion.'</label><br/>';
         }
-        }
-
         return $salida;
     }
 }
+?>

Pdf_mysql_table.php

@@ -17,251 +17,224 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
-class Pdf_mysql_table extends FPDF
+
+class Pdf_mysql_table extends Fpdf
 {
     /**
-     * Modificado por Ricardo Montañana 05/2008 para añadir la posibilidad de cálculo de totales.
+     * Modificado por Ricardo Montañana 05/2008 para añadir la posibilidad de cálculo de totales
-     *
+     * @var $totales float[] Vector de totales de las columnas que lo necesiten
-     * @var float[] Vector de totales de las columnas que lo necesiten
      */
-    private $ProcessingTable = false;
+  private $ProcessingTable=false,$aCols=array(),$TableX,$HeaderColor;
-    private $aCols = [];
+  private $RowColors,$ColorIndex;
-    private $TableX;
+  private $bdd,$titulo,$cabecera;
-    private $HeaderColor;
+  private $totales=array(),$procesandoTotales=false;
-    private $RowColors;
-    private $ColorIndex;
-    private $bdd;
-    private $titulo;
-    private $cabecera;
-    private $totales = [];
-    private $procesandoTotales = false;
-
   /**
+   * 
    * @param mixed $bdd Controlador de la base de datos
    * @param string $orientacion Orientación de la página P/L
    * @param string $formato Tamaño de la página p. ej. A4
    * @param string $titulo Título del informe
    * @param string $cabecera Texto para la cabecera
    */
-    public function __construct($bdd, $orientacion, $formato, $titulo = '', $cabecera = '')
-    {
-        $this->bdd = $bdd;
-        $this->titulo = $titulo;
-        $this->cabecera = $cabecera;
-        parent::__construct($orientacion, 'mm', $formato);
-    }
   
+
+    public function __construct($bdd,$orientacion,$formato,$titulo='',$cabecera='')
+    {
+      $this->bdd=$bdd;
+      $this->titulo=$titulo;
+      $this->cabecera=$cabecera;
+      parent::__construct($orientacion,'mm',$formato);
+    }
     public function setTitulo($titulo)
     {
-        $this->titulo = $titulo;
+      $this->titulo=$titulo;
     }
-
     public function iniciaTotales()
     {
-        $this->totales = [];
+        $this->totales = array();
     }
-
+    function Header()
-    public function Header()
     {
       //Modficada por Ricardo Montañana
         //Titulo
-        $fecha = strftime('%d-%b-%Y %H:%M');
+        $fecha=strftime("%d-%b-%Y %H:%M");
-        $this->SetFont('Arial', '', 8);
+        $this->SetFont('Arial','',8);
-        $this->Cell(0, 4, html_entity_decode(CENTRO.' '.PROGRAMA.' v'.VERSION, ENT_COMPAT | ENT_HTML401, 'ISO-8859-1'), 0, 1, 'L');
+        $this->Cell(0,4,html_entity_decode(CENTRO . " " . PROGRAMA . VERSION,ENT_COMPAT | ENT_HTML401,'ISO-8859-1'),0,1,'L');
-        $this->SetFont('Arial', '', 18);
+        $this->SetFont('Arial','',18);
-        $this->Cell(0, 6, utf8_decode($this->titulo), 0, 1, 'C');
+        $this->Cell(0,6,utf8_decode($this->titulo),0,1,'C');
-        $this->SetFont('Arial', '', 8);
+        $this->SetFont('Arial','',8);
-        $this->Cell(0, 3, $fecha, 0, 1, 'R');
+        $this->Cell(0,3,$fecha,0,1,'R');
-        $this->Cell(0, 5, utf8_decode($this->cabecera), 0, 1, 'C');
+        $this->Cell(0,5,utf8_decode($this->cabecera),0,1,'C');
         $this->Ln(10);
         //Print the table header if necessary
-        if ($this->ProcessingTable) {
+        if($this->ProcessingTable)
             $this->TableHeader();
-        }
         //Ensure table header is output
         parent::Header();   
     }
-
     public function Footer()
     {
-        $this->SetFont('Arial', '', 8);
+      $this->SetFont('Arial','',8);
-        $this->setY($this->h - 10);
+      $this->setY($this->h-10);
-        $this->Cell(0, 6, '-'.$this->PageNo().'-', 0, 1, 'C');
+      $this->Cell(0,6,'-'.$this->PageNo().'-',0,1,'C');
       parent::Footer();
     }
 
-    public function TableHeader()
+    function TableHeader()
     {
-        $this->SetFont('Arial', 'B', 12);
+        $this->SetFont('Arial','B',12);
         $this->SetX($this->TableX);
-        $fill = !empty($this->HeaderColor);
+        $fill=!empty($this->HeaderColor);
-        if ($fill) {
+        if($fill)
-            $this->SetFillColor($this->HeaderColor[0], $this->HeaderColor[1], $this->HeaderColor[2]);
+            $this->SetFillColor($this->HeaderColor[0],$this->HeaderColor[1],$this->HeaderColor[2]);
-        }
+        foreach($this->aCols as $col)
-        foreach ($this->aCols as $col) {
+            $this->Cell($col['w'],6,utf8_decode($col['c']),1,0,'C',$fill);
-            $this->Cell($col['w'], 6, utf8_decode($col['c']), 1, 0, 'C', $fill);
-        }
         $this->Ln();
     }
 
-    public function Row($data)
+    function Row($data)
     {
         $this->SetX($this->TableX);
-        $ci = $this->ColorIndex;
+        $ci=$this->ColorIndex;
-        $fill = !empty($this->RowColors[$ci]);
+        $fill=!empty($this->RowColors[$ci]);
-        if ($fill) {
+        if($fill)
-            $this->SetFillColor($this->RowColors[$ci][0], $this->RowColors[$ci][1], $this->RowColors[$ci][2]);
+            $this->SetFillColor($this->RowColors[$ci][0],$this->RowColors[$ci][1],$this->RowColors[$ci][2]);
-        }
+        foreach($this->aCols as $col) {
-        foreach ($this->aCols as $col) {
             switch ($col['a']) {
-                case 'D':$alin = 'R'; break;
+                case 'D':$alin='R';break;
-                case 'I':$alin = 'L'; break;
+                case 'I':$alin='L';break;
-                case 'C':$alin = 'C'; break;
+                case 'C':$alin='C';break;
-                default:$alin = 'L'; break;
+                default:$alin='L';break;
             }
             if ($this->procesandoTotales) {
-                $this->SetFont('Arial', 'B', 12);
+                $this->SetFont('Arial','B',12);
             }
-            $dato = isset($data[$col['f']]) ? $data[$col['f']] : '';
+            $this->Cell($col['w'],5,utf8_decode($data[$col['f']]),1,0,$alin,$fill);
-            $this->Cell($col['w'], 5, utf8_decode($dato), 1, 0, $alin, $fill);
             //$this->Cell($col['w'],5,utf8_decode($data[$col['f']]),1,0,$alin,$fill);
             //$this->Cell($col['w'],5,utf8_decode($data['proveedor']),1,0,$alin,$fill);
             //$this->Write(5,"nombre=".$col['f'].",titulo=".$col['c'].",ancho=".$col['w'].",alin=".$col['a']);
             //$this->Write(5,$data[$col['f']].$col['f']);
             //print_r($data);
             //print_r($this->aCols);
-            if ($col['t'] == 'S' && !$this->procesandoTotales) {
+            if ($col['t']=='S' && !$this->procesandoTotales) {
-                if (isset($this->totales[$col['f']])) {
+                $this->totales[$col['f']]+=$data[$col['f']];
-                    $this->totales[$col['f']] += $data[$col['f']];
-                } else {
-                    $this->totales[$col['f']] = $data[$col['f']];
-                }
             }
+            
         }
         $this->Ln();
-        $this->ColorIndex = 1 - $ci;
+        $this->ColorIndex=1-$ci;
     }
 
-    public function CalcWidths($width, $align)
+    function CalcWidths($width,$align)
     {
         //Compute the widths of the columns
-        $TableWidth = 0;
+        $TableWidth=0;
-        foreach ($this->aCols as $i=>$col) {
+        foreach($this->aCols as $i=>$col)
-            $w = $col['w'];
+        {
-            if ($w == -1) {
+            $w=$col['w'];
-                $w = $width / count($this->aCols);
+            if($w==-1)
-            } elseif (substr($w, -1) == '%') {
+                $w=$width/count($this->aCols);
-                $w = $w / 100 * $width;
+            elseif(substr($w,-1)=='%')
-            }
+                $w=$w/100*$width;
-            $this->aCols[$i]['w'] = $w;
+            $this->aCols[$i]['w']=$w;
-            $TableWidth += $w;
+            $TableWidth+=$w;
         }
         //Compute the abscissa of the table
-        if ($align == 'C') {
+        if($align=='C')
-            $this->TableX = max(($this->w - $TableWidth) / 2, 0);
+            $this->TableX=max(($this->w-$TableWidth)/2,0);
-        } elseif ($align == 'R') {
+        elseif($align=='R')
-            $this->TableX = max($this->w - $this->rMargin - $TableWidth, 0);
+            $this->TableX=max($this->w-$this->rMargin-$TableWidth,0);
-        } else {
+        else
-            $this->TableX = $this->lMargin;
+            $this->TableX=$this->lMargin;
-        }
     }
 
-    public function AddCol($field = -1, $width = -1, $caption = '', $align = 'I', $total = 'N')
+    function AddCol($field=-1,$width=-1,$caption='',$align='I',$total='N')
     {
         //Add a column to the table
-        if ($field == -1) {
+        if($field==-1)
-            $field = count($this->aCols);
+            $field=count($this->aCols);
-        }
+        $this->aCols[]=array('f'=>$field,'c'=>$caption,'w'=>$width,'a'=>$align,'t'=>$total);
-        $this->aCols[] = ['f'=>$field, 'c'=>$caption, 'w'=>$width, 'a'=>$align, 't'=>$total];
     }
 
-    public function Table($query, $prop = [])
+    function Table($query,$prop=array())
     {
         //Issue query
-        $res = $this->bdd->query($query) or die('Error: '.$this->bdd->error."<BR>Query: $query");
+        $res=$this->bdd->query($query) or die('Error: '.$this->bdd->mysql_error()."<BR>Query: $query");
         //Add all columns if none was specified
-        if (count($this->aCols) == 0) {
+        if(count($this->aCols)==0)
-            $nb = $res->field_count;
+        {
-            for ($i = 0; $i < $nb; $i++) {
+            $nb=$res->field_count;
+            for($i=0;$i<$nb;$i++)
                 $this->AddCol();
         }
-        }
         //Retrieve column names when not specified
-        $i = 0;
+        $i=0;
-        foreach ($this->aCols as $i=>$col) {
+        foreach($this->aCols as $i=>$col)
-            if ($col['c'] == '') {
+        {
-                if (is_string($col['f'])) {
+            if($col['c']=='')
-                    $this->aCols[$i]['c'] = ucfirst($col['f']);
+            {
-                } else {
+                if(is_string($col['f']))
-                    $this->aCols[$i]['c'] = ucfirst($res->field_seek($i));
+                    $this->aCols[$i]['c']=ucfirst($col['f']);
-                }
+                else
+                    $this->aCols[$i]['c']=ucfirst($res->field_seek($i));
             }
             $i++;
         }
         //Handle properties
-        if (!isset($prop['width'])) {
+        if(!isset($prop['width']))
-            $prop['width'] = 0;
+            $prop['width']=0;
-        }
+        if($prop['width']==0)
-        if ($prop['width'] == 0) {
+            $prop['width']=$this->w-$this->lMargin-$this->rMargin;
-            $prop['width'] = $this->w - $this->lMargin - $this->rMargin;
+        if(!isset($prop['align']))
-        }
+            $prop['align']='C';
-        if (!isset($prop['align'])) {
+        if(!isset($prop['padding']))
-            $prop['align'] = 'C';
+            $prop['padding']=$this->cMargin;
-        }
+        $cMargin=$this->cMargin;
-        if (!isset($prop['padding'])) {
+        $this->cMargin=$prop['padding'];
-            $prop['padding'] = $this->cMargin;
+        if(!isset($prop['HeaderColor']))
-        }
+            $prop['HeaderColor']=array();
-        $cMargin = $this->cMargin;
+        $this->HeaderColor=$prop['HeaderColor'];
-        $this->cMargin = $prop['padding'];
+        if(!isset($prop['color1']))
-        if (!isset($prop['HeaderColor'])) {
+            $prop['color1']=array();
-            $prop['HeaderColor'] = [];
+        if(!isset($prop['color2']))
-        }
+            $prop['color2']=array();
-        $this->HeaderColor = $prop['HeaderColor'];
+        $this->RowColors=array($prop['color1'],$prop['color2']);
-        if (!isset($prop['color1'])) {
-            $prop['color1'] = [];
-        }
-        if (!isset($prop['color2'])) {
-            $prop['color2'] = [];
-        }
-        $this->RowColors = [$prop['color1'], $prop['color2']];
         //Compute column widths
-        $this->CalcWidths($prop['width'], $prop['align']);
+        $this->CalcWidths($prop['width'],$prop['align']);
         //Print header
         $this->TableHeader();
         //Print rows
-        $this->SetFont('Arial', '', 11);
+        $this->SetFont('Arial','',11);
-        $this->ColorIndex = 0;
+        $this->ColorIndex=0;
-        $this->ProcessingTable = true;
+        $this->ProcessingTable=true;
-        $this->procesandoTotales = false;
+        $this->procesandoTotales=false;
-        while ($row = $res->fetch_assoc()) {
+        while($row=$res->fetch_assoc()) {
             $this->Row($row);
         }
-        $this->procesandoTotales = true;
+        $this->procesandoTotales=true;
         // Procesa los totales
         if ($this->procesaTotales()) {
             $this->Row($this->totales);
         }
-        $this->ProcessingTable = false;
+        $this->ProcessingTable=false;
-        $this->cMargin = $cMargin;
+        $this->cMargin=$cMargin;
-        $this->aCols = [];
+        $this->aCols=array();
     }
-
     /**
-     * Se encarga de generar una línea de totalización si es necesario.
+     * Se encarga de generar una línea de totalización si es necesario
-     *
      * @param array $datos Línea con los totales a imprimir o NULL
-     *
+     * @return boolean Si hay que generar la línea o no
-     * @return bool Si hay que generar la línea o no
      */
     private function procesaTotales()
     {
-        foreach ($this->aCols as $col) {
+        foreach($this->aCols as $col) {
-            if ($col['t'] == 'S') {
+            if ($col['t']=='S') {
                 return true;
             }
         }
-
         return false;
     }
 }
+?>

README.md

@@ -1,4 +1,4 @@
-# Inventario de Centro Educativo [![Project Stats](https://www.ohloh.net/p/inventario2/widgets/project_thin_badge.gif)](https://www.ohloh.net/p/inventario2)
+# Inventario de Centro Educativo
 Copyright (c) 2008-2014, Ricardo Montañana Gómez
 
 Inventario2 is free software: you can redistribute it and/or modify 
@@ -13,12 +13,6 @@ Utiliza:
 *MySQL v. 5.1.x
 *Apache
 
-[Manual de Usuario](http://rmontanana.gitbooks.io/inventario2/)
-
-[Instalación de ejemplo](https://inventario.rmontanana.es)
-
-[Estadísticas del proyecto](https://www.ohloh.net/p/inventario2)
-
 ##Instalación
 Para instalar la aplicación basta con seguir estos pasos:
 ###1. Copiar los archivos en una ubicación a la que tenga acceso el usuario con el que se ejecuta el servidor Apache (apache, _www, etc.).
@@ -32,8 +26,7 @@ Para instalar la aplicación basta con seguir estos pasos:
 ###2. Crear un directorio temporal y dar derechos de escritura a los ficheros de configuración.
     
     mkdir tmp
-    mkdir img.data
+    chown apache tmp
-    chown apache tmp img.data
     chown apache inc/configuracion.inc
     chown apache inc
     
@@ -45,12 +38,14 @@ Para instalar la aplicación basta con seguir estos pasos:
 
     grant all on Inventario.* to usuario identified by "contraseña";
 
-###5. Conectarse a la aplicación en la url donde se ha instalado:
+###5. Crear la estructura de la base de datos para poder comenzar a trabajar:
 
-    http://<url>
+    mysql -u usuario --password=contraseña <sql/setup.sql
 
-Al hacer esto se arrancará automáticamente el programa de instalación con el que terminaremos de configurar la aplicación.
+Con esto queda instalado el programa. Se crean en este proceso dos usuarios:
 
+    Usuario: admin              Usuario: demo
+    Contraseña: pruebas         Contraseña: pruebas
 
 ##Modelo de datos
 El modelo de datos que se ha utilizado ha sido:

Sql.php

@@ -1,11 +1,9 @@
 <?php
-/**
+    /** 
- * Gestión de una base de datos MySQL.
+     * Gestión de una base de datos MySQL
- *
      * @author Ricardo Montañana <rmontanana@gmail.com>
- *
      * @version 1.0
- *
+     * @package Inventario
      * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
      * @license http://www.gnu.org/licenses/gpl-3.0.txt
      * This file is part of Inventario.
@@ -21,69 +19,64 @@
      * 
      * You should have received a copy of the GNU General Public License
      * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+     *  
      */
-class Sql
+class Sql {
-{
     /**
      * @var mixed Manejador de la base de datos.
      */
-    private $bdd = null;
+    private $bdd=NULL;
     /**
      * @var string Mensaje del último mensaje de error generado
      */
-    private $mensajeError = '';
+    private $mensajeError='';
     /**
-     * @var bool Almacena el estado de error o no de la última acción.
+     * @var boolean Almacena el estado de error o no de la última acción.
      */
-    private $error = false;
+    private $error=false;
     /**
-     * @var bool Estado de la conexión con la base de datos.
+     * @var boolean Estado de la conexión con la base de datos.
      */
-    private $estado = false;
+    private $estado=false;
     /**
      * @var mixed Objeto que alberga la última consulta ejecutada.
      */
-    private $peticion = null;
+    private $peticion=NULL;
     /**
-     * @var int Número de tuplas afectadas en la última consulta.
+     * @var integer Número de tuplas afectadas en la última consulta.
      */
-    private $numero = 0;
+    private $numero=0;
     /**
      * @var string vector de cadenas con los resultados de la petición.
      */
-    private $datos = [];
+    private $datos=array();
     /**
-     * Id del último registro insertado.
+     * Id del último registro insertado
-     *
+     * @var integer mysql_
-     * @var int mysql_
      */
     private $id;
-
     /**
      * Crea un objeto Sql y conecta con la Base de Datos.
-     *
      * @param string $servidor
      * @param string $usuario
      * @param string $baseDatos
      */
-    public function __construct($servidor, $usuario, $clave, $baseDatos)
+    public function __construct($servidor,$usuario,$clave,$baseDatos)
     {
-        $this->bdd = @new mysqli($servidor, $usuario, $clave, $baseDatos);
+        $this->bdd=new mysqli($servidor,$usuario,$clave,$baseDatos);
         if (mysqli_connect_errno()) {
-            $this->mensajeError = '<h1>Fallo al conectar con el servidor MySQL.</h1>';
+            $this->mensajeError='<h1>Fallo al conectar con el servidor MySQL.</h1>';
-            $this->mensajeError .= 'Servidor ['.$servidor.'] base de datos ['.$baseDatos.']';
+            $this->mensajeError.="Servidor [".$servidor ."] usuario=[".$usuario."] clave [".$clave."] base [".$baseDatos."]";
-            $this->error = true;
+            $this->error=true;
-            $this->estado = false;
+            $this->estado=false;
         } else {
-            $this->mensajeError = '';
+            $this->mensajeError='';
-            $this->error = false;
+            $this->error=false;
-            $this->estado = true;
+            $this->estado=true;
         }
-        $this->peticion = null;
+        $this->peticion=NULL;
-
         return $this;
     }
-
     public function __destruct()
     {
         //Libera la memoria de una posible consulta.
@@ -95,132 +88,103 @@ class Sql
             $this->bdd->close();
         }
     }
-
     public function filtra($cadena) 
     {
       return $this->bdd->real_escape_string($cadena);
     }
-
     public function ejecuta($comando)
     {
         if (!$this->estado) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No est&aacute; conectado';
+            $this->mensajeError='No est&aacute; conectado';
-
             return false;
         }
         
-        if (!$this->peticion = $this->bdd->query($comando)) {
+        if (!$this->peticion=$this->bdd->query($comando)) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No pudo ejecutar la petici&oacute;n: '.$comando;
+            $this->mensajeError='No pudo ejecutar la petici&oacute;n: '.$comando;
-
             return false;
         }
-        $this->numero = $this->bdd->affected_rows;
+        $this->numero=$this->bdd->affected_rows;
-        $this->id = $this->bdd->insert_id;
+        $this->id=$this->bdd->insert_id;
-        $this->error = false;
+        $this->error=false;
-        $this->mensajeError = '';
+        $this->mensajeError='';
-
         return true;
     }
-
     public function procesaResultado()
     {
         if (!$this->estado) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No está conectado a una base de datos';
+            $this->mensajeError='No está conectado a una base de datos';
-
+            return NULL;
-            return;
         }
         if (!$this->peticion) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No hay un resultado disponible';
+            $this->mensajeError='No hay un resultado disponible';
-
+            return NULL;
-            return;
         }
-        $datos = $this->peticion->fetch_assoc();
+        $datos=$this->peticion->fetch_assoc();
-        $this->error = false;
+        $this->error=false;
-        $this->mensajeError = '';
+        $this->mensajeError='';
-
+        return ($datos);
-        return $datos;
     }
-
         public function camposResultado()
     {
         if (!$this->estado) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No está conectado a una base de datos';
+            $this->mensajeError='No está conectado a una base de datos';
-
+            return NULL;
-            return;
         }
         if (!$this->peticion) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No hay un resultado disponible';
+            $this->mensajeError='No hay un resultado disponible';
-
+            return NULL;
-            return;
         }
-        $datos = $this->peticion->fetch_field();
+        $datos=$this->peticion->fetch_field();
-        $this->error = false;
+        $this->error=false;
-        $this->mensajeError = '';
+        $this->mensajeError='';
-
+        return ($datos);
-        return $datos;
     }
-
     /** 
      * Devuelve el número de tuplas afectadas en la última petición.
-     *
+     * @return integer Número de tuplas.
-     * @return int Número de tuplas.
      */
-    public function numeroTuplas()
+    public function numeroTuplas() {
-    {
         return $this->numero;
     }
-
     /**
      * Devuelve el número de tuplas total si se ha hecho una consulta select
      * con SELECT SQL_CALC_FOUND_ROWS * ...
-     *
+     * @return integer Número de tuplas.
-     * @return int Número de tuplas.
      */
     public function numeroTotalTuplas() 
     {
-        $comando = 'select found_rows();';
+        $comando = "select found_rows();";
-        if (!$peticion = $this->bdd->query($comando)) {
+        if (!$peticion=$this->bdd->query($comando)) {
-            $this->error = true;
+            $this->error=true;
-            $this->mensajeError = 'No pudo ejecutar la petici&oacute;n: '.$comando;
+            $this->mensajeError='No pudo ejecutar la petici&oacute;n: '.$comando;
-
             return false;
         }
         $numero = $peticion->fetch_row();
-
+        return $numero[0] ;
-        return $numero[0];
     }
-
     /**
-     * Devuelve la condición de error de la última petición.
+     * Devuelve la condición de error de la última petición
-     *
+     * @return boolean condición de error.
-     * @return bool condición de error.
      */
-    public function error()
+    public function error() {
-    {
         return $this->error;
     }
-
     /**
-     * Devuelve el mensaje de error de la última petición.
+     * Devuelve el mensaje de error de la última petición
-     *
      * @return <type>
      */
-    public function mensajeError()
+    public function mensajeError() {
-    {
         return $this->mensajeError.$this->bdd->error;
     }
-
     /**
      * Devuelve la estructura de campos de una tabla.
-     *
      * @param string $tabla Nombre de la tabla.
-     *
      * @return string vector asociativo con la descripción de la tabla [campo]->valor
      */
     public function estructura($tabla)
@@ -228,46 +192,40 @@ class Sql
         if ($this->peticion) {
             $this->peticion->free_result();
         }
-        $comando = "show full columns from $tabla";
+        $comando="show full columns from $tabla";
         if (!$this->ejecuta($comando)) {
             return false;
         }
-        while ($dato = $this->procesaResultado()) {
+        while ($dato=$this->procesaResultado()) {
-            $salida[] = $dato;
+            $salida[]=$dato;
         }
-
         return $salida;
     }
-
     public function ultimoId()
     {
         return $this->id;
     }
-
     public function obtieneManejador()
     {
         return $this->bdd;
     }
-
     public function comienzaTransaccion()
     {
         return $this->bdd->autocommit(false);
     }
-
     public function abortaTransaccion()
     {
         $codigo = $this->bdd->rollback();
         $this->bdd->autocommit(true);
-
         return $codigo;     
     }
-
     public function confirmaTransaccion()
     {
         $codigo = $this->bdd->commit();
         $this->bdd->autocommit(true);
         $this->peticion = null;
-
         return $codigo;
     }
 }
+  
+?>

css/bootstrap-datetimepicker.es.js

@@ -2,7 +2,7 @@
 // language : spanish (es)
 // author : Julio Napurí : https://github.com/julionc
 
-(function (factory) {
+(function(factory) {
     if (typeof define === 'function' && define.amd) {
         define(['moment'], factory); // AMD
     } else if (typeof exports === 'object') {
@@ -10,57 +10,57 @@
     } else {
         factory(window.moment); // Browser global
     }
-}(function (moment) {
+}(function(moment) {
     return moment.lang('es', {
-        months : "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),
+        months: "enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),
-        monthsShort : "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),
+        monthsShort: "ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),
-        weekdays : "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),
+        weekdays: "domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),
-        weekdaysShort : "dom._lun._mar._mié._jue._vie._sáb.".split("_"),
+        weekdaysShort: "dom._lun._mar._mié._jue._vie._sáb.".split("_"),
-        weekdaysMin : "Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"),
+        weekdaysMin: "Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"),
-        longDateFormat : {
+        longDateFormat: {
-            LT : "H:mm",
+            LT: "H:mm",
-            L : "DD/MM/YYYY",
+            L: "DD/MM/YYYY",
-            LL : "D [de] MMMM [de] YYYY",
+            LL: "D [de] MMMM [de] YYYY",
-            LLL : "D [de] MMMM [de] YYYY LT",
+            LLL: "D [de] MMMM [de] YYYY LT",
-            LLLL : "dddd, D [de] MMMM [de] YYYY LT"
+            LLLL: "dddd, D [de] MMMM [de] YYYY LT"
         },
-        calendar : {
+        calendar: {
-            sameDay : function () {
+            sameDay: function() {
                 return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
             },
-            nextDay : function () {
+            nextDay: function() {
                 return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
             },
-            nextWeek : function () {
+            nextWeek: function() {
                 return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
             },
-            lastDay : function () {
+            lastDay: function() {
                 return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
             },
-            lastWeek : function () {
+            lastWeek: function() {
                 return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
             },
-            sameElse : 'L'
+            sameElse: 'L'
         },
-        relativeTime : {
+        relativeTime: {
-            future : "en %s",
+            future: "en %s",
-            past : "hace %s",
+            past: "hace %s",
-            s : "unos segundos",
+            s: "unos segundos",
-            m : "un minuto",
+            m: "un minuto",
-            mm : "%d minutos",
+            mm: "%d minutos",
-            h : "una hora",
+            h: "una hora",
-            hh : "%d horas",
+            hh: "%d horas",
-            d : "un día",
+            d: "un día",
-            dd : "%d días",
+            dd: "%d días",
-            M : "un mes",
+            M: "un mes",
-            MM : "%d meses",
+            MM: "%d meses",
-            y : "un año",
+            y: "un año",
-            yy : "%d años"
+            yy: "%d años"
         },
-        ordinal : '%dº',
+        ordinal: '%dº',
-        week : {
+        week: {
-            dow : 1, // Monday is the first day of the week.
+            dow: 1, // Monday is the first day of the week.
-            doy : 4  // The week that contains Jan 4th is the first week of the year.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
         }
     });
 }));

css/bootstrap-select/i18n/defaults-es-CL.js

@@ -1,29 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: ES (Spanish)
- * Region: CL (Chile)
- */
-(function($) {
-	$.fn.selectpicker.defaults = {
-        style: 'btn-default',
-        size: 'auto',
-        title: null,
-        selectedTextFormat : 'values',
-        noneSelectedText : 'No hay selección',
-		noneResultsText : 'No hay resultados',
-		countSelectedText : 'Seleccionados {0} de {1}',
-        maxOptionsText: ['Límite alcanzado ({n} {var} max)', 'Límite del grupo alcanzado({n} {var} max)', ['elementos','element']],
-        width: false,
-        container: false,
-        hideDisabled: false,
-        showSubtext: false,
-        showIcon: true,
-        showContent: true,
-        dropupAuto: true,
-        header: false,
-        liveSearch: false,
-        multipleSeparator: ', ',
-        iconBase: 'glyphicon',
-        tickIcon: 'glyphicon-ok'
-    };
-}(jQuery));

css/bootstrap-select/i18n/defaults-es-CL.min.js

@@ -1,6 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: ES (Spanish)
- * Region: CL (Chile)
- */
-(function(e){e.fn.selectpicker.defaults={style:"btn-default",size:"auto",title:null,selectedTextFormat:"values",noneSelectedText:"No hay selección",noneResultsText:"No hay resultados",countSelectedText:"Seleccionados {0} de {1}",maxOptionsText:["Límite alcanzado ({n} {var} max)","Límite del grupo alcanzado({n} {var} max)",["elementos","element"]],width:false,container:false,hideDisabled:false,showSubtext:false,showIcon:true,showContent:true,dropupAuto:true,header:false,liveSearch:false,multipleSeparator:", ",iconBase:"glyphicon",tickIcon:"glyphicon-ok"}})(jQuery)

css/bootstrap-select/i18n/defaults-eu.js

@@ -1,30 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: EU (Basque)
- * Region: 
- */
-(function($) {
-	$.fn.selectpicker.defaults = {
-        style: 'btn-default',
-        size: 'auto',
-        title: null,
-        selectedTextFormat : 'values',
-        noneSelectedText : 'Hautapenik ez',
-		noneResultsText : 'Emaitzarik ez',
-		countSelectedText : '{1}(e)tik {0} hautatuta',
-        maxOptionsText: ['Mugara iritsita ({n} {var} gehienez)', 'Taldearen mugara iritsita ({n} {var} gehienez)', ['elementu','elementu']],
-        width: false,
-        container: false,
-        hideDisabled: false,
-        showSubtext: false,
-        showIcon: true,
-        showContent: true,
-        dropupAuto: true,
-        header: false,
-        liveSearch: false,
-        multipleSeparator: ', ',
-        iconBase: 'glyphicon',
-        tickIcon: 'glyphicon-ok'
-    };
-}(jQuery));
-

css/bootstrap-select/i18n/defaults-eu.min.js

@@ -1,6 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: EU (Basque)
- * Region: 
- */
-(function(e){e.fn.selectpicker.defaults={style:"btn-default",size:"auto",title:null,selectedTextFormat:"values",noneSelectedText:"Hautapenik ez",noneResultsText:"Emaitzarik ez",countSelectedText:"{1}(e)tik {0} hautatuta",maxOptionsText:["Mugara iritsita ({n} {var} gehienez)","Taldearen mugara iritsita ({n} {var} gehienez)",["elementu","elementu"]],width:false,container:false,hideDisabled:false,showSubtext:false,showIcon:true,showContent:true,dropupAuto:true,header:false,liveSearch:false,multipleSeparator:", ",iconBase:"glyphicon",tickIcon:"glyphicon-ok"}})(jQuery)

css/bootstrap-select/i18n/defaults-pt_BR.js

@@ -1,33 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: PT (Portuguese; português)
- * Region: BR (Brazil; Brasil)
- * Author: Rodrigo de Avila <rodrigo@avila.net.br>
- */
-(function($) {
-	$.fn.selectpicker.defaults = {
-        style: 'btn-default',
-        size: 'auto',
-        title: null,
-        selectedTextFormat : 'values',
-        noneSelectedText : 'Nada selecionado',
-		noneResultsText : 'Nada encontrado contendo',
-		countSelectedText : 'Selecionado {0} de {1}',
-        maxOptionsText: ['Limite excedido (máx. {n} {var})', 'Limite do grupo excedido (máx. {n} {var})', ['itens','item']],
-        width: false,
-        container: false,
-        hideDisabled: false,
-        showSubtext: false,
-        showIcon: true,
-        showContent: true,
-        dropupAuto: true,
-        header: false,
-        liveSearch: false,
-        actionsBox: false,
-        multipleSeparator: ', ',
-        iconBase: 'glyphicon',
-        tickIcon: 'glyphicon-ok',
-        maxOptions: false
-    };
-}(jQuery));
-        

css/bootstrap-select/i18n/defaults-pt_BR.min.js

@@ -1,7 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: PT (Portuguese; português)
- * Region: BR (Brazil; Brasil)
- * Author: Rodrigo de Avila <rodrigo@avila.net.br>
- */
-!function(a){a.fn.selectpicker.defaults={style:"btn-default",size:"auto",title:null,selectedTextFormat:"values",noneSelectedText:"Nada selecionado",noneResultsText:"Nada encontrado contendo",countSelectedText:"Selecionado {0} de {1}",maxOptionsText:["Limite excedido (m\xe1x. {n} {var})","Limite do grupo excedido (m\xe1x. {n} {var})",["itens","item"]],width:!1,container:!1,hideDisabled:!1,showSubtext:!1,showIcon:!0,showContent:!0,dropupAuto:!0,header:!1,liveSearch:!1,actionsBox:!1,multipleSeparator:", ",iconBase:"glyphicon",tickIcon:"glyphicon-ok",maxOptions:!1}}(jQuery);

css/bootstrap-select/i18n/defaults-ru-RU.js

@@ -1,31 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: RU (Russian; русский)
- * Region: RU (Russian Federation)
- */
-(function($) {
-	$.fn.selectpicker.defaults = {
-      style: 'btn-default',
-      size: 'auto',
-      title: null,
-      selectedTextFormat : 'values',
-      noneSelectedText : 'Ничего не выбрано',
-	    noneResultsText : 'Не нейдено совпадений',
-		  countSelectedText : 'Выбрано {0} из {1}',
-      maxOptionsText: ['Достигнут предел ({n} {var} максимум)', 'Достигнут предел в группе ({n} {var} максимум)', ['items','item']],
-      width: false,
-      container: false,
-      hideDisabled: false,
-      showSubtext: false,
-      showIcon: true,
-      showContent: true,
-      dropupAuto: true,
-      header: false,
-      liveSearch: false,
-      actionsBox: false,
-      multipleSeparator: ', ',
-      iconBase: 'glyphicon',
-      tickIcon: 'glyphicon-ok',
-      maxOptions: false
-  };
-}(jQuery));

css/bootstrap-select/i18n/defaults-ru_RU.min.js

@@ -1,6 +0,0 @@
-/*
- * Translated default messages for bootstrap-select.
- * Locale: RU (Russian; русский)
- * Region: RU (Russian Federation)
- */
-(function(e){e.fn.selectpicker.defaults={style:"btn-default",size:"auto",title:null,selectedTextFormat:"values",noneSelectedText:"Ничего не выбрано",noneResultsText:"Не нейдено совпадений",countSelectedText:"Выбрано {0} из {1}",maxOptionsText:["Достигнут предел ({n} {var} максимум)","Достигнут предел в группе ({n} {var} максимум)",["items","item"]],width:false,container:false,hideDisabled:false,showSubtext:false,showIcon:true,showContent:true,dropupAuto:true,header:false,liveSearch:false,actionsBox:false,multipleSeparator:", ",iconBase:"glyphicon",tickIcon:"glyphicon-ok",maxOptions:false}})(jQuery)

css/bootstrap/css/bootstrap.css

@@ -4500,18 +4500,18 @@ a.thumbnail.active {
 @-webkit-keyframes progress-bar-stripes {
     from {
     background-position: 40px 0;
-  }
+}
-  to {
+to {
     background-position: 0 0;
-  }
+}
 }
 @keyframes progress-bar-stripes {
     from {
     background-position: 40px 0;
-  }
+}
-  to {
+to {
     background-position: 0 0;
-  }
+}
 }
 .progress {
     height: 20px;

css/bootstrap/fonts/glyphicons-halflings-regular.svg

@@ -1,229 +1,230 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
+    <metadata></metadata>
-<defs>
+    <defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+        <font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
+            <font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
+            <missing-glyph horiz-adv-x="500" />
-<glyph />
+            <glyph />
-<glyph />
+            <glyph />
-<glyph unicode="&#xd;" />
+            <glyph unicode="&#xd;" />
-<glyph unicode=" " />
+            <glyph unicode=" " />
-<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
+            <glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
-<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+            <glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
-<glyph unicode="&#xa0;" />
+            <glyph unicode="&#xa0;" />
-<glyph unicode="&#x2000;" horiz-adv-x="652" />
+            <glyph unicode="&#x2000;" horiz-adv-x="652" />
-<glyph unicode="&#x2001;" horiz-adv-x="1304" />
+            <glyph unicode="&#x2001;" horiz-adv-x="1304" />
-<glyph unicode="&#x2002;" horiz-adv-x="652" />
+            <glyph unicode="&#x2002;" horiz-adv-x="652" />
-<glyph unicode="&#x2003;" horiz-adv-x="1304" />
+            <glyph unicode="&#x2003;" horiz-adv-x="1304" />
-<glyph unicode="&#x2004;" horiz-adv-x="434" />
+            <glyph unicode="&#x2004;" horiz-adv-x="434" />
-<glyph unicode="&#x2005;" horiz-adv-x="326" />
+            <glyph unicode="&#x2005;" horiz-adv-x="326" />
-<glyph unicode="&#x2006;" horiz-adv-x="217" />
+            <glyph unicode="&#x2006;" horiz-adv-x="217" />
-<glyph unicode="&#x2007;" horiz-adv-x="217" />
+            <glyph unicode="&#x2007;" horiz-adv-x="217" />
-<glyph unicode="&#x2008;" horiz-adv-x="163" />
+            <glyph unicode="&#x2008;" horiz-adv-x="163" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
+            <glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
+            <glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
+            <glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="326" />
+            <glyph unicode="&#x205f;" horiz-adv-x="326" />
-<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
+            <glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
-<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
+            <glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+            <glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+            <glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
-<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
+            <glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
-<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
+            <glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
-<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
+            <glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
-<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+            <glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
-<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
+            <glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
-<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
+            <glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
-<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
+            <glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
-<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
+            <glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
-<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
+            <glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
-<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
+            <glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
-<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
+            <glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
+            <glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
+            <glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
+            <glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
-<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
+            <glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
-<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
+            <glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
-<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
+            <glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
-<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
+            <glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
-<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
+            <glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
-<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
+            <glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
-<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
+            <glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
-<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
+            <glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
-<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
+            <glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
-<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
+            <glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
-<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
+            <glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
+            <glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
-<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
+            <glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
-<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
+            <glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
-<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
+            <glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
-<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
+            <glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
-<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
+            <glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
-<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
+            <glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
-<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
+            <glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
-<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
+            <glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
-<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
+            <glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
-<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
+            <glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
-<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
+            <glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
-<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
+            <glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
-<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
+            <glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
-<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
+            <glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
-<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
+            <glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
-<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
+            <glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
-<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
+            <glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
-<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
+            <glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
-<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
+            <glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
-<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
+            <glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
-<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
+            <glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
-<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
+            <glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
-<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
+            <glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
-<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
+            <glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
-<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
+            <glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
-<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
+            <glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
-<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+            <glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+            <glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
+            <glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
+            <glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
+            <glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
+            <glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
+            <glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
-<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
+            <glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
+            <glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
-<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
+            <glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
-<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
+            <glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
-<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
+            <glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
-<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
+            <glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
-<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
+            <glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
-<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
+            <glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
-<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
+            <glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
-<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+            <glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+            <glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
+            <glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
-<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
+            <glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
-<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+            <glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+            <glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
+            <glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
-<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
+            <glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
-<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
+            <glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
-<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
+            <glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
-<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
+            <glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
-<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
+            <glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
-<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
+            <glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
-<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
+            <glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
-<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
+            <glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
-<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
+            <glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
-<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
+            <glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
-<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
+            <glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
-<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
+            <glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
-<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
+            <glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
-<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
+            <glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
-<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
+            <glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
-<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
+            <glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
-<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
+            <glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
-<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
+            <glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
-<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
+            <glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
-<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
+            <glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
-<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
+            <glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
-<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
+            <glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
-<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
+            <glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
+            <glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
-<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
+            <glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
-<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
+            <glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
-<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
+            <glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
-<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
+            <glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
-<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
+            <glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
-<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
+            <glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
-<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
+            <glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
-<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
+            <glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
-<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
+            <glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
+            <glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
-<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
+            <glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
-<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
+            <glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
-<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
+            <glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
-<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
+            <glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
-<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
+            <glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
-<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
+            <glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
-<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
+            <glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
-<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
+            <glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
-<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
+            <glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
-<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
+            <glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
+            <glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
-<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
+            <glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
-<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
+            <glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
-<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
+            <glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
-<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
+            <glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
-<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
+            <glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
-<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
+            <glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
-<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
+            <glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
-<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
+            <glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
-<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
+            <glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
-<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
+            <glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
-<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
+            <glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
-<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
+            <glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
-<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
+            <glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
+            <glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
-<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
+            <glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
-<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
+            <glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
-<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
+            <glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
-<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
+            <glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
-<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
+            <glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
-<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
+            <glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
-<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
+            <glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
-<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
+            <glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
-<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
+            <glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
-<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
+            <glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
-<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
+            <glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
-<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
+            <glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
-<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
+            <glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
-<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
+            <glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
-<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
+            <glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
-<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
+            <glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
-<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
+            <glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
-<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
+            <glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
-<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
+            <glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
-<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
+            <glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
-<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
+            <glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
-<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
+            <glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
-<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
+            <glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
-<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
+            <glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
-<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
+            <glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
-<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
+            <glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
-<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
+            <glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
-<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
+            <glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
+            <glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
+            <glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
+            <glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
+            <glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
+            <glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
-<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
+            <glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
-<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
+            <glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
-<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
+            <glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
-<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
+            <glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
-<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
+            <glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
-<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
+            <glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
-<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
+            <glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
-<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
+            <glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
-<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
+            <glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
-<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
+            <glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
-<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
+            <glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
-<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
+            <glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
-<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
+            <glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
-<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
+            <glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
-<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+            <glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+            <glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
+            <glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
-<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
+            <glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
-<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
+            <glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
-<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+            <glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+            <glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
+            <glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
-<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
+            <glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
-<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
+            <glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
-<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
+            <glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
-<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
+            <glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
-<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
+            <glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
-<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+            <glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
-</font>
+        </font>
-</defs></svg> 
+    </defs>
+</svg> 

css/bootstrap3-editable/css/bootstrap-editable.css

@@ -1,663 +0,0 @@
-/*! X-editable - v1.5.1 
-* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
-* http://github.com/vitalets/x-editable
-* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
-.editableform {
-    margin-bottom: 0; /* overwrites bootstrap margin */
-}
-
-.editableform .control-group {
-    margin-bottom: 0; /* overwrites bootstrap margin */
-    white-space: nowrap; /* prevent wrapping buttons on new line */
-    line-height: 20px; /* overwriting bootstrap line-height. See #133 */
-}
-
-/* 
-  BS3 width:1005 for inputs breaks editable form in popup 
-  See: https://github.com/vitalets/x-editable/issues/393
-*/
-.editableform .form-control {
-    width: auto;
-}
-
-.editable-buttons {
-   display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
-   vertical-align: top;
-   margin-left: 7px;
-   /* inline-block emulation for IE7*/
-   zoom: 1; 
-   *display: inline;
-}
-
-.editable-buttons.editable-buttons-bottom {
-   display: block; 
-   margin-top: 7px;
-   margin-left: 0;
-}
-
-.editable-input {
-    vertical-align: top; 
-    display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
-    width: auto; /* bootstrap-responsive has width: 100% that breakes layout */
-    white-space: normal; /* reset white-space decalred in parent*/
-   /* display-inline emulation for IE7*/
-   zoom: 1; 
-   *display: inline;   
-}
-
-.editable-buttons .editable-cancel {
-   margin-left: 7px; 
-}
-
-/*for jquery-ui buttons need set height to look more pretty*/
-.editable-buttons button.ui-button-icon-only {
-   height: 24px; 
-   width: 30px;
-}
-
-.editableform-loading {
-    background: url('../img/loading.gif') center center no-repeat;  
-    height: 25px;
-    width: auto; 
-    min-width: 25px; 
-}
-
-.editable-inline .editableform-loading {
-    background-position: left 5px;      
-}
-
- .editable-error-block {
-    max-width: 300px;
-    margin: 5px 0 0 0;
-    width: auto;
-    white-space: normal;
-}
-
-/*add padding for jquery ui*/
-.editable-error-block.ui-state-error {
-    padding: 3px;  
-}  
-
-.editable-error {
-   color: red;  
-}
-
-/* ---- For specific types ---- */
-
-.editableform .editable-date {
-    padding: 0; 
-    margin: 0;
-    float: left;
-}
-
-/* move datepicker icon to center of add-on button. See https://github.com/vitalets/x-editable/issues/183 */
-.editable-inline .add-on .icon-th {
-   margin-top: 3px;
-   margin-left: 1px; 
-}
-
-
-/* checklist vertical alignment */
-.editable-checklist label input[type="checkbox"], 
-.editable-checklist label span {
-    vertical-align: middle;
-    margin: 0;
-}
-
-.editable-checklist label {
-    white-space: nowrap; 
-}
-
-/* set exact width of textarea to fit buttons toolbar */
-.editable-wysihtml5 {
-    width: 566px; 
-    height: 250px; 
-}
-
-/* clear button shown as link in date inputs */
-.editable-clear {
-   clear: both;
-   font-size: 0.9em;
-   text-decoration: none;
-   text-align: right;
-}
-
-/* IOS-style clear button for text inputs */
-.editable-clear-x {
-   background: url('../img/clear.png') center center no-repeat;
-   display: block;
-   width: 13px;    
-   height: 13px;
-   position: absolute;
-   opacity: 0.6;
-   z-index: 100;
-   
-   top: 50%;
-   right: 6px;
-   margin-top: -6px;
-   
-}
-
-.editable-clear-x:hover {
-   opacity: 1;
-}
-
-.editable-pre-wrapped {
-   white-space: pre-wrap;
-}
-.editable-container.editable-popup {
-    max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
-}  
-
-.editable-container.popover {
-    width: auto; /* without this rule popover does not stretch */
-}
-
-.editable-container.editable-inline {
-    display: inline-block; 
-    vertical-align: middle;
-    width: auto;
-    /* inline-block emulation for IE7*/
-    zoom: 1; 
-    *display: inline;    
-}
-
-.editable-container.ui-widget {
-   font-size: inherit;  /* jqueryui widget font 1.1em too big, overwrite it */
-   z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */
-}
-.editable-click, 
-a.editable-click, 
-a.editable-click:hover {
-    text-decoration: none;
-    border-bottom: dashed 1px #0088cc;
-}
-
-.editable-click.editable-disabled, 
-a.editable-click.editable-disabled, 
-a.editable-click.editable-disabled:hover {
-   color: #585858;  
-   cursor: default;
-   border-bottom: none;
-}
-
-.editable-empty, .editable-empty:hover, .editable-empty:focus{
-  font-style: italic; 
-  color: #DD1144;  
-  /* border-bottom: none; */
-  text-decoration: none;
-}
-
-.editable-unsaved {
-  font-weight: bold; 
-}
-
-.editable-unsaved:after {
-/*    content: '*'*/
-}
-
-.editable-bg-transition {
-  -webkit-transition: background-color 1400ms ease-out;
-  -moz-transition: background-color 1400ms ease-out;
-  -o-transition: background-color 1400ms ease-out;
-  -ms-transition: background-color 1400ms ease-out;
-  transition: background-color 1400ms ease-out;  
-}
-
-/*see https://github.com/vitalets/x-editable/issues/139 */
-.form-horizontal .editable
-{ 
-    padding-top: 5px;
-    display:inline-block;
-}
-
-
-/*!
- * Datepicker for Bootstrap
- *
- * Copyright 2012 Stefan Petre
- * Improvements by Andrew Rowls
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- */
-.datepicker {
-  padding: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  direction: ltr;
-  /*.dow {
-		border-top: 1px solid #ddd !important;
-	}*/
-
-}
-.datepicker-inline {
-  width: 220px;
-}
-.datepicker.datepicker-rtl {
-  direction: rtl;
-}
-.datepicker.datepicker-rtl table tr td span {
-  float: right;
-}
-.datepicker-dropdown {
-  top: 0;
-  left: 0;
-}
-.datepicker-dropdown:before {
-  content: '';
-  display: inline-block;
-  border-left: 7px solid transparent;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  position: absolute;
-  top: -7px;
-  left: 6px;
-}
-.datepicker-dropdown:after {
-  content: '';
-  display: inline-block;
-  border-left: 6px solid transparent;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  position: absolute;
-  top: -6px;
-  left: 7px;
-}
-.datepicker > div {
-  display: none;
-}
-.datepicker.days div.datepicker-days {
-  display: block;
-}
-.datepicker.months div.datepicker-months {
-  display: block;
-}
-.datepicker.years div.datepicker-years {
-  display: block;
-}
-.datepicker table {
-  margin: 0;
-}
-.datepicker td,
-.datepicker th {
-  text-align: center;
-  width: 20px;
-  height: 20px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  border: none;
-}
-.table-striped .datepicker table tr td,
-.table-striped .datepicker table tr th {
-  background-color: transparent;
-}
-.datepicker table tr td.day:hover {
-  background: #eeeeee;
-  cursor: pointer;
-}
-.datepicker table tr td.old,
-.datepicker table tr td.new {
-  color: #999999;
-}
-.datepicker table tr td.disabled,
-.datepicker table tr td.disabled:hover {
-  background: none;
-  color: #999999;
-  cursor: default;
-}
-.datepicker table tr td.today,
-.datepicker table tr td.today:hover,
-.datepicker table tr td.today.disabled,
-.datepicker table tr td.today.disabled:hover {
-  background-color: #fde19a;
-  background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
-  background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
-  background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
-  background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
-  background-image: linear-gradient(top, #fdd49a, #fdf59a);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
-  border-color: #fdf59a #fdf59a #fbed50;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  color: #000;
-}
-.datepicker table tr td.today:hover,
-.datepicker table tr td.today:hover:hover,
-.datepicker table tr td.today.disabled:hover,
-.datepicker table tr td.today.disabled:hover:hover,
-.datepicker table tr td.today:active,
-.datepicker table tr td.today:hover:active,
-.datepicker table tr td.today.disabled:active,
-.datepicker table tr td.today.disabled:hover:active,
-.datepicker table tr td.today.active,
-.datepicker table tr td.today:hover.active,
-.datepicker table tr td.today.disabled.active,
-.datepicker table tr td.today.disabled:hover.active,
-.datepicker table tr td.today.disabled,
-.datepicker table tr td.today:hover.disabled,
-.datepicker table tr td.today.disabled.disabled,
-.datepicker table tr td.today.disabled:hover.disabled,
-.datepicker table tr td.today[disabled],
-.datepicker table tr td.today:hover[disabled],
-.datepicker table tr td.today.disabled[disabled],
-.datepicker table tr td.today.disabled:hover[disabled] {
-  background-color: #fdf59a;
-}
-.datepicker table tr td.today:active,
-.datepicker table tr td.today:hover:active,
-.datepicker table tr td.today.disabled:active,
-.datepicker table tr td.today.disabled:hover:active,
-.datepicker table tr td.today.active,
-.datepicker table tr td.today:hover.active,
-.datepicker table tr td.today.disabled.active,
-.datepicker table tr td.today.disabled:hover.active {
-  background-color: #fbf069 \9;
-}
-.datepicker table tr td.today:hover:hover {
-  color: #000;
-}
-.datepicker table tr td.today.active:hover {
-  color: #fff;
-}
-.datepicker table tr td.range,
-.datepicker table tr td.range:hover,
-.datepicker table tr td.range.disabled,
-.datepicker table tr td.range.disabled:hover {
-  background: #eeeeee;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.datepicker table tr td.range.today,
-.datepicker table tr td.range.today:hover,
-.datepicker table tr td.range.today.disabled,
-.datepicker table tr td.range.today.disabled:hover {
-  background-color: #f3d17a;
-  background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
-  background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
-  background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
-  background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
-  background-image: linear-gradient(top, #f3c17a, #f3e97a);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
-  border-color: #f3e97a #f3e97a #edde34;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-.datepicker table tr td.range.today:hover,
-.datepicker table tr td.range.today:hover:hover,
-.datepicker table tr td.range.today.disabled:hover,
-.datepicker table tr td.range.today.disabled:hover:hover,
-.datepicker table tr td.range.today:active,
-.datepicker table tr td.range.today:hover:active,
-.datepicker table tr td.range.today.disabled:active,
-.datepicker table tr td.range.today.disabled:hover:active,
-.datepicker table tr td.range.today.active,
-.datepicker table tr td.range.today:hover.active,
-.datepicker table tr td.range.today.disabled.active,
-.datepicker table tr td.range.today.disabled:hover.active,
-.datepicker table tr td.range.today.disabled,
-.datepicker table tr td.range.today:hover.disabled,
-.datepicker table tr td.range.today.disabled.disabled,
-.datepicker table tr td.range.today.disabled:hover.disabled,
-.datepicker table tr td.range.today[disabled],
-.datepicker table tr td.range.today:hover[disabled],
-.datepicker table tr td.range.today.disabled[disabled],
-.datepicker table tr td.range.today.disabled:hover[disabled] {
-  background-color: #f3e97a;
-}
-.datepicker table tr td.range.today:active,
-.datepicker table tr td.range.today:hover:active,
-.datepicker table tr td.range.today.disabled:active,
-.datepicker table tr td.range.today.disabled:hover:active,
-.datepicker table tr td.range.today.active,
-.datepicker table tr td.range.today:hover.active,
-.datepicker table tr td.range.today.disabled.active,
-.datepicker table tr td.range.today.disabled:hover.active {
-  background-color: #efe24b \9;
-}
-.datepicker table tr td.selected,
-.datepicker table tr td.selected:hover,
-.datepicker table tr td.selected.disabled,
-.datepicker table tr td.selected.disabled:hover {
-  background-color: #9e9e9e;
-  background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
-  background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
-  background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
-  background-image: -o-linear-gradient(top, #b3b3b3, #808080);
-  background-image: linear-gradient(top, #b3b3b3, #808080);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
-  border-color: #808080 #808080 #595959;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datepicker table tr td.selected:hover,
-.datepicker table tr td.selected:hover:hover,
-.datepicker table tr td.selected.disabled:hover,
-.datepicker table tr td.selected.disabled:hover:hover,
-.datepicker table tr td.selected:active,
-.datepicker table tr td.selected:hover:active,
-.datepicker table tr td.selected.disabled:active,
-.datepicker table tr td.selected.disabled:hover:active,
-.datepicker table tr td.selected.active,
-.datepicker table tr td.selected:hover.active,
-.datepicker table tr td.selected.disabled.active,
-.datepicker table tr td.selected.disabled:hover.active,
-.datepicker table tr td.selected.disabled,
-.datepicker table tr td.selected:hover.disabled,
-.datepicker table tr td.selected.disabled.disabled,
-.datepicker table tr td.selected.disabled:hover.disabled,
-.datepicker table tr td.selected[disabled],
-.datepicker table tr td.selected:hover[disabled],
-.datepicker table tr td.selected.disabled[disabled],
-.datepicker table tr td.selected.disabled:hover[disabled] {
-  background-color: #808080;
-}
-.datepicker table tr td.selected:active,
-.datepicker table tr td.selected:hover:active,
-.datepicker table tr td.selected.disabled:active,
-.datepicker table tr td.selected.disabled:hover:active,
-.datepicker table tr td.selected.active,
-.datepicker table tr td.selected:hover.active,
-.datepicker table tr td.selected.disabled.active,
-.datepicker table tr td.selected.disabled:hover.active {
-  background-color: #666666 \9;
-}
-.datepicker table tr td.active,
-.datepicker table tr td.active:hover,
-.datepicker table tr td.active.disabled,
-.datepicker table tr td.active.disabled:hover {
-  background-color: #006dcc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(top, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datepicker table tr td.active:hover,
-.datepicker table tr td.active:hover:hover,
-.datepicker table tr td.active.disabled:hover,
-.datepicker table tr td.active.disabled:hover:hover,
-.datepicker table tr td.active:active,
-.datepicker table tr td.active:hover:active,
-.datepicker table tr td.active.disabled:active,
-.datepicker table tr td.active.disabled:hover:active,
-.datepicker table tr td.active.active,
-.datepicker table tr td.active:hover.active,
-.datepicker table tr td.active.disabled.active,
-.datepicker table tr td.active.disabled:hover.active,
-.datepicker table tr td.active.disabled,
-.datepicker table tr td.active:hover.disabled,
-.datepicker table tr td.active.disabled.disabled,
-.datepicker table tr td.active.disabled:hover.disabled,
-.datepicker table tr td.active[disabled],
-.datepicker table tr td.active:hover[disabled],
-.datepicker table tr td.active.disabled[disabled],
-.datepicker table tr td.active.disabled:hover[disabled] {
-  background-color: #0044cc;
-}
-.datepicker table tr td.active:active,
-.datepicker table tr td.active:hover:active,
-.datepicker table tr td.active.disabled:active,
-.datepicker table tr td.active.disabled:hover:active,
-.datepicker table tr td.active.active,
-.datepicker table tr td.active:hover.active,
-.datepicker table tr td.active.disabled.active,
-.datepicker table tr td.active.disabled:hover.active {
-  background-color: #003399 \9;
-}
-.datepicker table tr td span {
-  display: block;
-  width: 23%;
-  height: 54px;
-  line-height: 54px;
-  float: left;
-  margin: 1%;
-  cursor: pointer;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.datepicker table tr td span:hover {
-  background: #eeeeee;
-}
-.datepicker table tr td span.disabled,
-.datepicker table tr td span.disabled:hover {
-  background: none;
-  color: #999999;
-  cursor: default;
-}
-.datepicker table tr td span.active,
-.datepicker table tr td span.active:hover,
-.datepicker table tr td span.active.disabled,
-.datepicker table tr td span.active.disabled:hover {
-  background-color: #006dcc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(top, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-.datepicker table tr td span.active:hover,
-.datepicker table tr td span.active:hover:hover,
-.datepicker table tr td span.active.disabled:hover,
-.datepicker table tr td span.active.disabled:hover:hover,
-.datepicker table tr td span.active:active,
-.datepicker table tr td span.active:hover:active,
-.datepicker table tr td span.active.disabled:active,
-.datepicker table tr td span.active.disabled:hover:active,
-.datepicker table tr td span.active.active,
-.datepicker table tr td span.active:hover.active,
-.datepicker table tr td span.active.disabled.active,
-.datepicker table tr td span.active.disabled:hover.active,
-.datepicker table tr td span.active.disabled,
-.datepicker table tr td span.active:hover.disabled,
-.datepicker table tr td span.active.disabled.disabled,
-.datepicker table tr td span.active.disabled:hover.disabled,
-.datepicker table tr td span.active[disabled],
-.datepicker table tr td span.active:hover[disabled],
-.datepicker table tr td span.active.disabled[disabled],
-.datepicker table tr td span.active.disabled:hover[disabled] {
-  background-color: #0044cc;
-}
-.datepicker table tr td span.active:active,
-.datepicker table tr td span.active:hover:active,
-.datepicker table tr td span.active.disabled:active,
-.datepicker table tr td span.active.disabled:hover:active,
-.datepicker table tr td span.active.active,
-.datepicker table tr td span.active:hover.active,
-.datepicker table tr td span.active.disabled.active,
-.datepicker table tr td span.active.disabled:hover.active {
-  background-color: #003399 \9;
-}
-.datepicker table tr td span.old,
-.datepicker table tr td span.new {
-  color: #999999;
-}
-.datepicker th.datepicker-switch {
-  width: 145px;
-}
-.datepicker thead tr:first-child th,
-.datepicker tfoot tr th {
-  cursor: pointer;
-}
-.datepicker thead tr:first-child th:hover,
-.datepicker tfoot tr th:hover {
-  background: #eeeeee;
-}
-.datepicker .cw {
-  font-size: 10px;
-  width: 12px;
-  padding: 0 2px 0 5px;
-  vertical-align: middle;
-}
-.datepicker thead tr:first-child th.cw {
-  cursor: default;
-  background-color: transparent;
-}
-.input-append.date .add-on i,
-.input-prepend.date .add-on i {
-  display: block;
-  cursor: pointer;
-  width: 16px;
-  height: 16px;
-}
-.input-daterange input {
-  text-align: center;
-}
-.input-daterange input:first-child {
-  -webkit-border-radius: 3px 0 0 3px;
-  -moz-border-radius: 3px 0 0 3px;
-  border-radius: 3px 0 0 3px;
-}
-.input-daterange input:last-child {
-  -webkit-border-radius: 0 3px 3px 0;
-  -moz-border-radius: 0 3px 3px 0;
-  border-radius: 0 3px 3px 0;
-}
-.input-daterange .add-on {
-  display: inline-block;
-  width: auto;
-  min-width: 16px;
-  height: 18px;
-  padding: 4px 5px;
-  font-weight: normal;
-  line-height: 18px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  vertical-align: middle;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
-  margin-left: -5px;
-  margin-right: -5px;
-}

css/dashboard.php

@@ -1,6 +1,6 @@
 <?php
-include '../inc/configuracion.inc';
+include('../inc/configuracion.inc');
-header('Content-type: text/css');
+header("Content-type: text/css");
 ?>
 /*
 * Base structure
@@ -33,7 +33,7 @@ display: none;
 }
 @media (max-width: 767px) {
 .sidebar {
-top: 60px;
+top: 50px;
 bottom: 150px;
 background-color: <?php echo COLORLAT; ?>
 }

css/estilo.css

@@ -1,6 +1,6 @@
 /* Generated by CaScadeS, a stylesheet editor for Mozilla Composer */
 
-  body { margin: 15px 10px;
+body { margin: 15px 10px;
        padding: 0px;
        /*background: rgb(51, 51, 255) url(images/paper.gif) repeat fixed 0% 50%;*/
        background: #000066; /*rgb(0,0,153);*/
@@ -10,116 +10,116 @@
        font-family: Arial,Helvetica,sans-serif;
        font-size: small;
        color: rgb(255, 255, 255);
-    }
+}
 
-  p, table { margin-top: 0.3em;
+p, table { margin-top: 0.3em;
            margin-right: 0pt;
            margin-bottom: 0.3em;
            color: rgb(255, 255, 153);
            background: rgb(0,0,153);
-    }
+}
 
-  ol, ul { margin: 0em 0em 0em 4em;
+ol, ul { margin: 0em 0em 0em 4em;
          padding: 0pt;
          list-style-position: inside;
-    }
+}
 
-  li { margin: 0pt;
+li { margin: 0pt;
      padding: 0pt;
-    }
+}
 
-  li ul { margin: 0em 0em 0em 2em;
+li ul { margin: 0em 0em 0em 2em;
         list-style-type: none;
-    }
+}
 
-  h1, h2, h3, h4 { color: red;
+h1, h2, h3, h4 { color: red;
-    }
+}
 
-  h1 { font-size: x-large;
+h1 { font-size: x-large;
      margin-top: 1em;
      margin-bottom: 0.5em;
      text-align: center;
-    }
+}
 
-  h2 { margin: 2em 0pt 0.3em;
+h2 { margin: 2em 0pt 0.3em;
      font-size: medium;
-    }
+}
 
-  h3, h4 { margin: 0.5em 0pt 0em;
+h3, h4 { margin: 0.5em 0pt 0em;
          font-size: small;
-    }
+}
 
-  td { padding-left: 4px;
+td { padding-left: 4px;
      padding-right: 4px;
-    }
+}
 
-  blockquote { margin-top: 0.3em;
+blockquote { margin-top: 0.3em;
              margin-bottom: 0.3em;
-    }
+}
 
-  code { font-family: Courier New,Courier,Monospace;
+code { font-family: Courier New,Courier,Monospace;
        font-size: small;
-    }
+}
 
-  a:link { text-decoration: underline;
+a:link { text-decoration: underline;
          color: white;
-    }
+}
 
-  a:visited { color: orange;
+a:visited { color: orange;
-    }
+}
 
-  a:hover { text-decoration: none;
+a:hover { text-decoration: none;
           color: rgb(66, 137, 181);
           background-color: rgb(255, 255, 102);
-    }
+}
 
-  a:focus { color: yellow;
+a:focus { color: yellow;
           background-color: rgb(73, 149, 196);
-    }
+}
 
-  .cent { text-align: center;
+.cent { text-align: center;
-    }
+}
 .error {
     color:yellow;
     background-color: red;
 }
-  .key { background-color: rgb(102, 102, 204);
+.key { background-color: rgb(102, 102, 204);
        font-weight: bold;
        color: yellow;
        white-space: nowrap;
        font-size: 115%;
        padding-right: 2px;
        padding-left: 2px;
-    }
+}
 
-  .left { float: left;
+.left { float: left;
-    }
+}
 
-  .madewithnvu { margin-left: 50px;
+.madewithnvu { margin-left: 50px;
                margin-right: auto;
                margin-top: 10px;
-    }
+}
 
-  .note { margin-left: 4em;
+.note { margin-left: 4em;
         margin-right: 1em;
         padding-left: 0.35em;
         padding-right: 0pt;
         background-color: rgb(255, 255, 204);
-    }
+}
 
-  .noteflush { margin-left: 0pt;
+.noteflush { margin-left: 0pt;
              margin-right: 1em;
              padding-right: 0pt;
              background-color: rgb(255, 255, 204);
-    }
+}
 
-  .right { float: right;
+.right { float: right;
-    }
+}
 
-  .tsp { font-size: x-small;
+.tsp { font-size: x-small;
-    }
+}
 
-  .warn { border-style: solid none;
+.warn { border-style: solid none;
         border-color: rgb(0, 0, 0);
         border-width: 1px;
         margin-left: 4em;
@@ -127,18 +127,18 @@
         padding-left: 0.35em;
         padding-right: 0pt;
         background-color: rgb(255, 186, 144);
-    }
+}
 
-  .warnflush { border-style: solid none;
+.warnflush { border-style: solid none;
              border-color: rgb(0, 0, 0);
              border-width: 1px;
              margin-left: 0pt;
              margin-right: 1em;
              padding-right: 0pt;
              background-color: rgb(255, 186, 144);
-    }
+}
 
-  .zonaCabecera { position: fixed;
+.zonaCabecera { position: fixed;
                 width: 100%;
                 height: 12%;
                 visibility: visible;
@@ -146,9 +146,9 @@
                 overflow: visible;
                 opacity: 1;
                 z-index: 1;
-    }
+}
 
-  .zonaMenu { height: 85%;
+.zonaMenu { height: 85%;
             overflow: auto;
             width: 10%;
             position: fixed;
@@ -156,7 +156,7 @@
             background-color: #CC9999;
             background-color: #6633FF;
             color: #33FFFF;
-    }
+}
 div.zonaMenu a:link{
     color: #00FFCC;
 }
@@ -179,7 +179,7 @@ div.zonaMenu key {
     color: #FFFF33;
 }
 
-  .zonaPrincipal { border-style: none;
+.zonaPrincipal { border-style: none;
                  z-index: 100;
                  visibility: visible;
                  height: 85%;
@@ -190,118 +190,118 @@ div.zonaMenu key {
                  max-width: 88%;
                  margin-left: 11%;
                  top: 14%;
-    }
+}
 
-  div.zonaCabecera p { margin: 0pt 0pt 0pt 2px;
+div.zonaCabecera p { margin: 0pt 0pt 0pt 2px;
                      font-weight: bold;
                      color: rgb(66, 137, 181);
-    }
+}
 
-  div.zonaCabecera a:link { text-decoration: none;
+div.zonaCabecera a:link { text-decoration: none;
                           color: rgb(66, 137, 181);
-    }
+}
 
-  div.zonaCabecera a:visited { text-decoration: none;
+div.zonaCabecera a:visited { text-decoration: none;
                              color: rgb(66, 137, 181);
-    }
+}
 
-  div.zonaCabecera a:hover { margin: -2px;
+div.zonaCabecera a:hover { margin: -2px;
                            padding: 0px 8px 0px 2px;
                            color: rgb(73, 149, 196);
                            background-color: rgb(238, 238, 238);
-    }
+}
 
-  div.zonaCabecera a:focus { color: rgb(73, 149, 196);
+div.zonaCabecera a:focus { color: rgb(73, 149, 196);
                            background-color: rgb(238, 238, 238);
-    }
+}
 
-  div.zonaCabecera ul { border: 1px solid rgb(66, 137, 181);
+div.zonaCabecera ul { border: 1px solid rgb(66, 137, 181);
                       margin-left: 1em;
                       padding-left: 0.25em;
                       margin-right: 0.25em;
                       list-style-type: none;
-    }
+}
 
-  div.zonaCabecera ul a:link { text-decoration: none;
+div.zonaCabecera ul a:link { text-decoration: none;
                              color: rgb(33, 80, 100);
                              font-weight: normal;
                              visibility: visible;
-    }
+}
 
-  div.zonaCabecera ul a:visited { text-decoration: none;
+div.zonaCabecera ul a:visited { text-decoration: none;
                                 color: rgb(33, 80, 100);
                                 font-weight: normal;
-    }
+}
 
-  div.zonaCabecera ul a:hover { color: rgb(73, 149, 196);
+div.zonaCabecera ul a:hover { color: rgb(73, 149, 196);
                               background-color: rgb(238, 238, 238);
-    }
+}
 
-  div.zonaCabecera ul a:focus { color: rgb(73, 149, 196);
+div.zonaCabecera ul a:focus { color: rgb(73, 149, 196);
                               background-color: rgb(238, 238, 238);
-    }
+}
 
-  div.tip { border: 4px solid rgb(66, 137, 181);
+div.tip { border: 4px solid rgb(66, 137, 181);
           background-color: rgb(244, 248, 255);
           border-collapse: collapse;
           width: 25%;
           float: right;
-    }
+}
 
-  div.tip p { padding: 4px;
+div.tip p { padding: 4px;
             margin-left: 0pt;
-    }
+}
 
-  div.tip li { padding: 4px;
+div.tip li { padding: 4px;
              margin-left: 0pt;
-    }
+}
 
-  div.tip ul { padding: 4px;
+div.tip ul { padding: 4px;
              margin-left: 0.75em;
-    }
+}
 
 
 
-  table.bordered { border: 2px solid rgb(66, 137, 181);
+table.bordered { border: 2px solid rgb(66, 137, 181);
                  background-color: white;
                  border-collapse: collapse;
                  margin-left: auto;
                  margin-right: auto;
-    }
+}
 
-  table.borderedright { border: 2px solid rgb(66, 137, 181);
+table.borderedright { border: 2px solid rgb(66, 137, 181);
                       background-color: white;
                       border-collapse: collapse;
                       float: right;
-    }
+}
 
-  table .key { font-size: 80%;
+table .key { font-size: 80%;
-    }
+}
 
-  table.menu { border: 1px solid yellow;
+table.menu { border: 1px solid yellow;
              visibility: hidden;
              cursor: pointer;
              position: absolute;
-    }
+}
 
-  #mainmenu { position: static;
+#mainmenu { position: static;
-    }
+}
 
-  table.menu td { border: 0px none ;
+table.menu td { border: 0px none ;
                 padding: 0px 8px 2px;
                 color: rgb(255, 255, 0);
                 background-color: rgb(132, 112, 255);
                 font-size: 12pt;
                 font-family: Arial;
                 white-space: nowrap;
-    }
+}
 
-  table.tablaDatos th { border-color: rgb(51, 255, 255);
+table.tablaDatos th { border-color: rgb(51, 255, 255);
                       color: rgb(51,255,255);
                       font-size: 14pt;
-    }
+}
 
-  .tablaCabecera { border: 1px solid ;
+.tablaCabecera { border: 1px solid ;
                  padding: 2px;
                  background-color: rgb(102, 0, 204);
                  color: rgb(255, 255, 153);
@@ -310,16 +310,16 @@ div.zonaMenu key {
                  text-align: center;
                  width: 98%;
                  font-size: 10pt;
-    }
+}
 
-  .tablaDatos { border: 1px solid ;
+.tablaDatos { border: 1px solid ;
               border-color: rgb(51,255,255);
               padding: 2px;
               max-width: 98%;
               font-size: 12pt;
-    }
+}
 
-  .title { border: 0px none ;
+.title { border: 0px none ;
          position: absolute;
          width: 120px;
          height: 20px;
@@ -330,9 +330,9 @@ div.zonaMenu key {
          font-family: "verdana";
          font-weight: bold;
          font-size: 12px;
-    }
+}
 
-  .submenu { position: absolute;
+.submenu { position: absolute;
            left: 20px;
            width: 120px;
            color: rgb(255, 255, 102);
@@ -341,5 +341,5 @@ div.zonaMenu key {
            font-size: 11px;
            line-height: 16px;
            visibility: hidden;
-    }
+}
 

css/jquery.simplecolorpicker.js

@@ -22,7 +22,6 @@
      */
     SimpleColorPicker.prototype = {
         constructor: SimpleColorPicker,
-
         init: function(type, select, options) {
             var self = this;
 
@@ -103,7 +102,6 @@
                 }
             });
         },
-
         /**
          * Changes the selected color.
          *
@@ -122,7 +120,6 @@
                 console.error("The given color '" + color + "' could not be found");
             }
         },
-
         showPicker: function() {
             var pos = this.$icon.offset();
             this.$picker.css({
@@ -133,11 +130,9 @@
 
             this.$picker.show(this.options.pickerDelay);
         },
-
         hidePicker: function() {
             this.$picker.hide(this.options.pickerDelay);
         },
-
         /**
          * Selects the given span inside $colorList.
          *
@@ -161,7 +156,6 @@
             // Change HTML select value
             this.$select.val(color);
         },
-
         /**
          * The user clicked on a color inside $colorList.
          */
@@ -172,7 +166,6 @@
                 this.$select.trigger('change');
             }
         },
-
         /**
          * Prevents the mousedown event from "eating" the click event.
          */
@@ -180,7 +173,6 @@
             e.stopPropagation();
             e.preventDefault();
         },
-
         destroy: function() {
             if (this.options.picker === true) {
                 this.$icon.off('.' + this.type);
@@ -224,10 +216,8 @@
     $.fn.simplecolorpicker.defaults = {
         // No theme by default
         theme: '',
-
         // Show the picker or make it inline
         picker: false,
-
         // Animation delay in milliseconds
         pickerDelay: 0
     };

css/validator.min.js

@@ -1,9 +0,0 @@
-/*!
- * Validator v0.2.1 for Bootstrap 3, by @1000hz
- * Copyright 2014 Spiceworks, Inc.
- * Licensed under http://opensource.org/licenses/MIT
- *
- * https://github.com/1000hz/bootstrap-validator
- */
-
-+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.toggleSubmit(),this.$element.on("input.bs.validator blur.bs.validator",":input",a.proxy(this.validateInput,this)),this.$element.find("[data-match]").each(function(){var b=a(this),c=b.data("match");a(c).on("input.bs.validator",function(){b.val()&&b.trigger("input")})})};b.DEFAULTS={delay:500,errors:{match:"Does not match",minlength:"Not long enough"}},b.VALIDATORS={"native":function(a){var b=a[0];return b.checkValidity?b.checkValidity():!0},match:function(b){var c=b.data("match");return!b.val()||b.val()===a(c).val()},minlength:function(a){var b=a.data("minlength");return!a.val()||a.val().length>=b}},b.prototype.validateInput=function(b){var c,d=a(b.target),e=d.data("bs.errors");this.$element.trigger(b=a.Event("validate.bs.validator",{relatedTarget:d[0]})),b.isDefaultPrevented()||(d.data("bs.errors",c=this.runValidators(d)),c.length?this.showErrors(d):this.clearErrors(d),e&&c.toString()===e.toString()||(b=c.length?a.Event("invalid.bs.validator",{relatedTarget:d[0],detail:c}):a.Event("valid.bs.validator",{relatedTarget:d[0],detail:e}),this.$element.trigger(b)),this.toggleSubmit(),this.$element.trigger(a.Event("validated.bs.validator",{relatedTarget:d[0]})))},b.prototype.runValidators=function(c){{var d=[];[b.VALIDATORS.native]}return a.each(b.VALIDATORS,a.proxy(function(a,b){if((c.data(a)||"native"==a)&&!b.call(this,c)){var e=c.data(a+"-error")||c.data("error")||"native"==a&&c[0].validationMessage||this.options.errors[a];!~d.indexOf(e)&&d.push(e)}},this)),d},b.prototype.validate=function(){var a=this.options.delay;return this.options.delay=0,this.$element.find(":input").trigger("input"),this.options.delay=a,this},b.prototype.showErrors=function(b){function c(){var c=b.closest(".form-group"),d=c.find(".help-block.with-errors"),e=b.data("bs.errors");e.length&&(e=a("<ul/>").addClass("list-unstyled").append(a.map(e,function(b){return a("<li/>").text(b)})),void 0===d.data("bs.originalContent")&&d.data("bs.originalContent",d.html()),d.empty().append(e),c.addClass("has-error"))}this.options.delay?(window.clearTimeout(b.data("bs.timeout")),b.data("bs.timeout",window.setTimeout(c,this.options.delay))):c()},b.prototype.clearErrors=function(a){var b=a.closest(".form-group"),c=b.find(".help-block.with-errors");c.html(c.data("bs.originalContent")),b.removeClass("has-error")},b.prototype.hasErrors=function(){function b(){return!!(a(this).data("bs.errors")||[]).length}return!!this.$element.find(":input").filter(b).length},b.prototype.isIncomplete=function(){function b(){return""===a.trim(this.value)}return!!this.$element.find("[required]").filter(b).length},b.prototype.toggleSubmit=function(){var a=this.$element.find(":submit");a.attr("disabled",this.isIncomplete()||this.hasErrors())};var c=a.fn.validator;a.fn.validator=function(c){return this.each(function(){var d=a(this),e=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),f=d.data("bs.validator");f||d.data("bs.validator",f=new b(this,e)),"string"==typeof c&&f[c]()})},a.fn.validator.Constructor=b,a.fn.validator.noConflict=function(){return a.fn.validator=c,this},a(window).on("load",function(){a('form[data-toggle="validator"]').each(function(){var b=a(this);b.validator(b.data())})})}(jQuery);

font/courier.php

@@ -4,6 +4,6 @@ $type = 'Core';
 $name = 'Courier';
 $up = -100;
 $ut = 50;
-for ($i = 0; $i <= 255; $i++) {
+for ($i = 0; $i <= 255; $i++)
     $cw[chr($i)] = 600;
-}
+?>

font/courierb.php

@@ -4,6 +4,6 @@ $type = 'Core';
 $name = 'Courier-Bold';
 $up = -100;
 $ut = 50;
-for ($i = 0; $i <= 255; $i++) {
+for ($i = 0; $i <= 255; $i++)
     $cw[chr($i)] = 600;
-}
+?>

font/courierbi.php

@@ -4,6 +4,6 @@ $type = 'Core';
 $name = 'Courier-BoldOblique';
 $up = -100;
 $ut = 50;
-for ($i = 0; $i <= 255; $i++) {
+for ($i = 0; $i <= 255; $i++)
     $cw[chr($i)] = 600;
-}
+?>

font/courieri.php

@@ -4,6 +4,6 @@ $type = 'Core';
 $name = 'Courier-Oblique';
 $up = -100;
 $ut = 50;
-for ($i = 0; $i <= 255; $i++) {
+for ($i = 0; $i <= 255; $i++)
     $cw[chr($i)] = 600;
-}
+?>

font/helvetica.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Helvetica';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
+    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,
+    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 278, '"' => 355, '#' => 556, '$' => 556, '%' => 889, '&' => 667, '\'' => 191, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ','     => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667,
+    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 278, ';' => 278, '<' => 584, '=' => 584, '>' => 584, '?' => 556, '@' => 1015, 'A' => 667,
-    'B'     => 667, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>500, 'K'=>667, 'L'=>556, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,
+    'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 500, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X'     => 667, 'Y'=>667, 'Z'=>611, '['=>278, '\\'=>278, ']'=>278, '^'=>469, '_'=>556, '`'=>333, 'a'=>556, 'b'=>556, 'c'=>500, 'd'=>556, 'e'=>556, 'f'=>278, 'g'=>556, 'h'=>556, 'i'=>222, 'j'=>222, 'k'=>500, 'l'=>222, 'm'=>833,
+    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 278, '\\' => 278, ']' => 278, '^' => 469, '_' => 556, '`' => 333, 'a' => 556, 'b' => 556, 'c' => 500, 'd' => 556, 'e' => 556, 'f' => 278, 'g' => 556, 'h' => 556, 'i' => 222, 'j' => 222, 'k' => 500, 'l' => 222, 'm' => 833,
-    'n'     => 556, 'o'=>556, 'p'=>556, 'q'=>556, 'r'=>333, 's'=>500, 't'=>278, 'u'=>556, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>500, '{'=>334, '|'=>260, '}'=>334, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>222, chr(131)=>556,
+    'n' => 556, 'o' => 556, 'p' => 556, 'q' => 556, 'r' => 333, 's' => 500, 't' => 278, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 500, '{' => 334, '|' => 260, '}' => 334, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 222, chr(131) => 556,
-    chr(132)=> 333, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>222, chr(146)=>222, chr(147)=>333, chr(148)=>333, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+    chr(132) => 333, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 222, chr(146) => 222, chr(147) => 333, chr(148) => 333, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154)=> 500, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>260, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,
+    chr(154) => 500, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 260, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
+    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 556, chr(182) => 537, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 667, chr(193) => 667, chr(194) => 667, chr(195) => 667, chr(196) => 667, chr(197) => 667,
-    chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556,
+    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 500, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 556, chr(241) => 556,
-    chr(242)=> 556, chr(243)=>556, chr(244)=>556, chr(245)=>556, chr(246)=>556, chr(247)=>584, chr(248)=>611, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500, ];
+    chr(242) => 556, chr(243) => 556, chr(244) => 556, chr(245) => 556, chr(246) => 556, chr(247) => 584, chr(248) => 611, chr(249) => 556, chr(250) => 556, chr(251) => 556, chr(252) => 556, chr(253) => 500, chr(254) => 556, chr(255) => 500);
+?>

font/helveticab.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Helvetica-Bold';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
+    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584,
+    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 333, '"' => 474, '#' => 556, '$' => 556, '%' => 889, '&' => 722, '\'' => 238, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ','     => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722,
+    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 333, ';' => 333, '<' => 584, '=' => 584, '>' => 584, '?' => 611, '@' => 975, 'A' => 722,
-    'B'     => 722, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>556, 'K'=>722, 'L'=>611, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,
+    'B' => 722, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 556, 'K' => 722, 'L' => 611, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X'     => 667, 'Y'=>667, 'Z'=>611, '['=>333, '\\'=>278, ']'=>333, '^'=>584, '_'=>556, '`'=>333, 'a'=>556, 'b'=>611, 'c'=>556, 'd'=>611, 'e'=>556, 'f'=>333, 'g'=>611, 'h'=>611, 'i'=>278, 'j'=>278, 'k'=>556, 'l'=>278, 'm'=>889,
+    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 584, '_' => 556, '`' => 333, 'a' => 556, 'b' => 611, 'c' => 556, 'd' => 611, 'e' => 556, 'f' => 333, 'g' => 611, 'h' => 611, 'i' => 278, 'j' => 278, 'k' => 556, 'l' => 278, 'm' => 889,
-    'n'     => 611, 'o'=>611, 'p'=>611, 'q'=>611, 'r'=>389, 's'=>556, 't'=>333, 'u'=>611, 'v'=>556, 'w'=>778, 'x'=>556, 'y'=>556, 'z'=>500, '{'=>389, '|'=>280, '}'=>389, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>278, chr(131)=>556,
+    'n' => 611, 'o' => 611, 'p' => 611, 'q' => 611, 'r' => 389, 's' => 556, 't' => 333, 'u' => 611, 'v' => 556, 'w' => 778, 'x' => 556, 'y' => 556, 'z' => 500, '{' => 389, '|' => 280, '}' => 389, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 278, chr(131) => 556,
-    chr(132)=> 500, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>278, chr(146)=>278, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+    chr(132) => 500, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 278, chr(146) => 278, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154)=> 556, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>280, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,
+    chr(154) => 556, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 280, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 611, chr(182) => 556, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 722, chr(193) => 722, chr(194) => 722, chr(195) => 722, chr(196) => 722, chr(197) => 722,
-    chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611,
+    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 556, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 611, chr(241) => 611,
-    chr(242)=> 611, chr(243)=>611, chr(244)=>611, chr(245)=>611, chr(246)=>611, chr(247)=>584, chr(248)=>611, chr(249)=>611, chr(250)=>611, chr(251)=>611, chr(252)=>611, chr(253)=>556, chr(254)=>611, chr(255)=>556, ];
+    chr(242) => 611, chr(243) => 611, chr(244) => 611, chr(245) => 611, chr(246) => 611, chr(247) => 584, chr(248) => 611, chr(249) => 611, chr(250) => 611, chr(251) => 611, chr(252) => 611, chr(253) => 556, chr(254) => 611, chr(255) => 556);
+?>

font/helveticabi.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Helvetica-BoldOblique';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
+    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>333, '"'=>474, '#'=>556, '$'=>556, '%'=>889, '&'=>722, '\''=>238, '('=>333, ')'=>333, '*'=>389, '+'=>584,
+    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 333, '"' => 474, '#' => 556, '$' => 556, '%' => 889, '&' => 722, '\'' => 238, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ','     => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>333, ';'=>333, '<'=>584, '='=>584, '>'=>584, '?'=>611, '@'=>975, 'A'=>722,
+    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 333, ';' => 333, '<' => 584, '=' => 584, '>' => 584, '?' => 611, '@' => 975, 'A' => 722,
-    'B'     => 722, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>556, 'K'=>722, 'L'=>611, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,
+    'B' => 722, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 556, 'K' => 722, 'L' => 611, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X'     => 667, 'Y'=>667, 'Z'=>611, '['=>333, '\\'=>278, ']'=>333, '^'=>584, '_'=>556, '`'=>333, 'a'=>556, 'b'=>611, 'c'=>556, 'd'=>611, 'e'=>556, 'f'=>333, 'g'=>611, 'h'=>611, 'i'=>278, 'j'=>278, 'k'=>556, 'l'=>278, 'm'=>889,
+    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 584, '_' => 556, '`' => 333, 'a' => 556, 'b' => 611, 'c' => 556, 'd' => 611, 'e' => 556, 'f' => 333, 'g' => 611, 'h' => 611, 'i' => 278, 'j' => 278, 'k' => 556, 'l' => 278, 'm' => 889,
-    'n'     => 611, 'o'=>611, 'p'=>611, 'q'=>611, 'r'=>389, 's'=>556, 't'=>333, 'u'=>611, 'v'=>556, 'w'=>778, 'x'=>556, 'y'=>556, 'z'=>500, '{'=>389, '|'=>280, '}'=>389, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>278, chr(131)=>556,
+    'n' => 611, 'o' => 611, 'p' => 611, 'q' => 611, 'r' => 389, 's' => 556, 't' => 333, 'u' => 611, 'v' => 556, 'w' => 778, 'x' => 556, 'y' => 556, 'z' => 500, '{' => 389, '|' => 280, '}' => 389, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 278, chr(131) => 556,
-    chr(132)=> 500, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>278, chr(146)=>278, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+    chr(132) => 500, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 278, chr(146) => 278, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154)=> 556, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>280, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,
+    chr(154) => 556, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 280, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>611, chr(182)=>556, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 611, chr(182) => 556, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 722, chr(193) => 722, chr(194) => 722, chr(195) => 722, chr(196) => 722, chr(197) => 722,
-    chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>556, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>611, chr(241)=>611,
+    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 556, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 611, chr(241) => 611,
-    chr(242)=> 611, chr(243)=>611, chr(244)=>611, chr(245)=>611, chr(246)=>611, chr(247)=>584, chr(248)=>611, chr(249)=>611, chr(250)=>611, chr(251)=>611, chr(252)=>611, chr(253)=>556, chr(254)=>611, chr(255)=>556, ];
+    chr(242) => 611, chr(243) => 611, chr(244) => 611, chr(245) => 611, chr(246) => 611, chr(247) => 584, chr(248) => 611, chr(249) => 611, chr(250) => 611, chr(251) => 611, chr(252) => 611, chr(253) => 556, chr(254) => 611, chr(255) => 556);
+?>

font/helveticai.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Helvetica-Oblique';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 278, chr(1)=>278, chr(2)=>278, chr(3)=>278, chr(4)=>278, chr(5)=>278, chr(6)=>278, chr(7)=>278, chr(8)=>278, chr(9)=>278, chr(10)=>278, chr(11)=>278, chr(12)=>278, chr(13)=>278, chr(14)=>278, chr(15)=>278, chr(16)=>278, chr(17)=>278, chr(18)=>278, chr(19)=>278, chr(20)=>278, chr(21)=>278,
+    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23)=>278, chr(24)=>278, chr(25)=>278, chr(26)=>278, chr(27)=>278, chr(28)=>278, chr(29)=>278, chr(30)=>278, chr(31)=>278, ' '=>278, '!'=>278, '"'=>355, '#'=>556, '$'=>556, '%'=>889, '&'=>667, '\''=>191, '('=>333, ')'=>333, '*'=>389, '+'=>584,
+    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 278, '"' => 355, '#' => 556, '$' => 556, '%' => 889, '&' => 667, '\'' => 191, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ','     => 278, '-'=>333, '.'=>278, '/'=>278, '0'=>556, '1'=>556, '2'=>556, '3'=>556, '4'=>556, '5'=>556, '6'=>556, '7'=>556, '8'=>556, '9'=>556, ':'=>278, ';'=>278, '<'=>584, '='=>584, '>'=>584, '?'=>556, '@'=>1015, 'A'=>667,
+    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 278, ';' => 278, '<' => 584, '=' => 584, '>' => 584, '?' => 556, '@' => 1015, 'A' => 667,
-    'B'     => 667, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>722, 'I'=>278, 'J'=>500, 'K'=>667, 'L'=>556, 'M'=>833, 'N'=>722, 'O'=>778, 'P'=>667, 'Q'=>778, 'R'=>722, 'S'=>667, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>944,
+    'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 500, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X'     => 667, 'Y'=>667, 'Z'=>611, '['=>278, '\\'=>278, ']'=>278, '^'=>469, '_'=>556, '`'=>333, 'a'=>556, 'b'=>556, 'c'=>500, 'd'=>556, 'e'=>556, 'f'=>278, 'g'=>556, 'h'=>556, 'i'=>222, 'j'=>222, 'k'=>500, 'l'=>222, 'm'=>833,
+    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 278, '\\' => 278, ']' => 278, '^' => 469, '_' => 556, '`' => 333, 'a' => 556, 'b' => 556, 'c' => 500, 'd' => 556, 'e' => 556, 'f' => 278, 'g' => 556, 'h' => 556, 'i' => 222, 'j' => 222, 'k' => 500, 'l' => 222, 'm' => 833,
-    'n'     => 556, 'o'=>556, 'p'=>556, 'q'=>556, 'r'=>333, 's'=>500, 't'=>278, 'u'=>556, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>500, '{'=>334, '|'=>260, '}'=>334, '~'=>584, chr(127)=>350, chr(128)=>556, chr(129)=>350, chr(130)=>222, chr(131)=>556,
+    'n' => 556, 'o' => 556, 'p' => 556, 'q' => 556, 'r' => 333, 's' => 500, 't' => 278, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 500, '{' => 334, '|' => 260, '}' => 334, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 222, chr(131) => 556,
-    chr(132)=> 333, chr(133)=>1000, chr(134)=>556, chr(135)=>556, chr(136)=>333, chr(137)=>1000, chr(138)=>667, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>222, chr(146)=>222, chr(147)=>333, chr(148)=>333, chr(149)=>350, chr(150)=>556, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+    chr(132) => 333, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 222, chr(146) => 222, chr(147) => 333, chr(148) => 333, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154)=> 500, chr(155)=>333, chr(156)=>944, chr(157)=>350, chr(158)=>500, chr(159)=>667, chr(160)=>278, chr(161)=>333, chr(162)=>556, chr(163)=>556, chr(164)=>556, chr(165)=>556, chr(166)=>260, chr(167)=>556, chr(168)=>333, chr(169)=>737, chr(170)=>370, chr(171)=>556, chr(172)=>584, chr(173)=>333, chr(174)=>737, chr(175)=>333,
+    chr(154) => 500, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 260, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>584, chr(178)=>333, chr(179)=>333, chr(180)=>333, chr(181)=>556, chr(182)=>537, chr(183)=>278, chr(184)=>333, chr(185)=>333, chr(186)=>365, chr(187)=>556, chr(188)=>834, chr(189)=>834, chr(190)=>834, chr(191)=>611, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
+    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 556, chr(182) => 537, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 667, chr(193) => 667, chr(194) => 667, chr(195) => 667, chr(196) => 667, chr(197) => 667,
-    chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>278, chr(205)=>278, chr(206)=>278, chr(207)=>278, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>584, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>667, chr(222)=>667, chr(223)=>611, chr(224)=>556, chr(225)=>556, chr(226)=>556, chr(227)=>556, chr(228)=>556, chr(229)=>556, chr(230)=>889, chr(231)=>500, chr(232)=>556, chr(233)=>556, chr(234)=>556, chr(235)=>556, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>556, chr(241)=>556,
+    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 500, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 556, chr(241) => 556,
-    chr(242)=> 556, chr(243)=>556, chr(244)=>556, chr(245)=>556, chr(246)=>556, chr(247)=>584, chr(248)=>611, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500, ];
+    chr(242) => 556, chr(243) => 556, chr(244) => 556, chr(245) => 556, chr(246) => 556, chr(247) => 584, chr(248) => 611, chr(249) => 556, chr(250) => 556, chr(251) => 556, chr(252) => 556, chr(253) => 500, chr(254) => 556, chr(255) => 500);
+?>

font/makefont/makefont.php

@@ -1,21 +1,21 @@
 <?php
-/*******************************************************************************
+
-* Utility to generate font definition files                                    *
+/* * *****************************************************************************
-*                                                                              *
+ * Utility to generate font definition files                                    *
-* Version: 1.14                                                                *
+ *                                                                              *
-* Date:    2008-08-03                                                          *
+ * Version: 1.14                                                                *
-* Author:  Olivier PLATHEY                                                     *
+ * Date:    2008-08-03                                                          *
-*******************************************************************************/
+ * Author:  Olivier PLATHEY                                                     *
+ * ***************************************************************************** */
 
 function ReadMap($enc)
 {
     //Read a map file
-    $file = dirname(__FILE__).'/'.strtolower($enc).'.map';
+    $file = dirname(__FILE__) . '/' . strtolower($enc) . '.map';
     $a = file($file);
-    if (empty($a)) {
+    if (empty($a))
-        die('<b>Error:</b> encoding not found: '.$enc);
+        die('<b>Error:</b> encoding not found: ' . $enc);
-    }
+    $cc2gn = array();
-    $cc2gn = [];
     foreach ($a as $l) {
         if ($l[0] == '!') {
             $e = preg_split('/[ \\t]+/', rtrim($l));
@@ -25,11 +25,9 @@ function ReadMap($enc)
         }
     }
     for ($i = 0; $i <= 255; $i++) {
-        if (!isset($cc2gn[$i])) {
+        if (!isset($cc2gn[$i]))
             $cc2gn[$i] = '.notdef';
     }
-    }
-
     return $cc2gn;
 }
 
@@ -37,24 +35,22 @@ function ReadAFM($file, &$map)
 {
     //Read a font metric file
     $a = file($file);
-    if (empty($a)) {
+    if (empty($a))
         die('File not found');
-    }
+    $widths = array();
-    $widths = [];
+    $fm = array();
-    $fm = [];
+    $fix = array('Edot' => 'Edotaccent', 'edot' => 'edotaccent', 'Idot' => 'Idotaccent', 'Zdot' => 'Zdotaccent', 'zdot' => 'zdotaccent',
-    $fix = ['Edot'            => 'Edotaccent', 'edot'=>'edotaccent', 'Idot'=>'Idotaccent', 'Zdot'=>'Zdotaccent', 'zdot'=>'zdotaccent',
+        'Odblacute' => 'Ohungarumlaut', 'odblacute' => 'ohungarumlaut', 'Udblacute' => 'Uhungarumlaut', 'udblacute' => 'uhungarumlaut',
-        'Odblacute'           => 'Ohungarumlaut', 'odblacute'=>'ohungarumlaut', 'Udblacute'=>'Uhungarumlaut', 'udblacute'=>'uhungarumlaut',
+        'Gcedilla' => 'Gcommaaccent', 'gcedilla' => 'gcommaaccent', 'Kcedilla' => 'Kcommaaccent', 'kcedilla' => 'kcommaaccent',
-        'Gcedilla'            => 'Gcommaaccent', 'gcedilla'=>'gcommaaccent', 'Kcedilla'=>'Kcommaaccent', 'kcedilla'=>'kcommaaccent',
+        'Lcedilla' => 'Lcommaaccent', 'lcedilla' => 'lcommaaccent', 'Ncedilla' => 'Ncommaaccent', 'ncedilla' => 'ncommaaccent',
-        'Lcedilla'            => 'Lcommaaccent', 'lcedilla'=>'lcommaaccent', 'Ncedilla'=>'Ncommaaccent', 'ncedilla'=>'ncommaaccent',
+        'Rcedilla' => 'Rcommaaccent', 'rcedilla' => 'rcommaaccent', 'Scedilla' => 'Scommaaccent', 'scedilla' => 'scommaaccent',
-        'Rcedilla'            => 'Rcommaaccent', 'rcedilla'=>'rcommaaccent', 'Scedilla'=>'Scommaaccent', 'scedilla'=>'scommaaccent',
+        'Tcedilla' => 'Tcommaaccent', 'tcedilla' => 'tcommaaccent', 'Dslash' => 'Dcroat', 'dslash' => 'dcroat', 'Dmacron' => 'Dcroat', 'dmacron' => 'dcroat',
-        'Tcedilla'            => 'Tcommaaccent', 'tcedilla'=>'tcommaaccent', 'Dslash'=>'Dcroat', 'dslash'=>'dcroat', 'Dmacron'=>'Dcroat', 'dmacron'=>'dcroat',
+        'combininggraveaccent' => 'gravecomb', 'combininghookabove' => 'hookabovecomb', 'combiningtildeaccent' => 'tildecomb',
-        'combininggraveaccent'=> 'gravecomb', 'combininghookabove'=>'hookabovecomb', 'combiningtildeaccent'=>'tildecomb',
+        'combiningacuteaccent' => 'acutecomb', 'combiningdotbelow' => 'dotbelowcomb', 'dongsign' => 'dong');
-        'combiningacuteaccent'=> 'acutecomb', 'combiningdotbelow'=>'dotbelowcomb', 'dongsign'=>'dong', ];
     foreach ($a as $l) {
         $e = explode(' ', rtrim($l));
-        if (count($e) < 2) {
+        if (count($e) < 2)
             continue;
-        }
         $code = $e[0];
         $param = $e[1];
         if ($code == 'C') {
@@ -62,75 +58,67 @@ function ReadAFM($file, &$map)
             $cc = (int) $e[1];
             $w = $e[4];
             $gn = $e[7];
-            if (substr($gn, -4) == '20AC') {
+            if (substr($gn, -4) == '20AC')
                 $gn = 'Euro';
-            }
             if (isset($fix[$gn])) {
                 //Fix incorrect glyph name
-                foreach ($map as $c=>$n) {
+                foreach ($map as $c => $n) {
-                    if ($n == $fix[$gn]) {
+                    if ($n == $fix[$gn])
                         $map[$c] = $gn;
                 }
             }
-            }
             if (empty($map)) {
                 //Symbolic font: use built-in encoding
                 $widths[$cc] = $w;
             } else {
                 $widths[$gn] = $w;
-                if ($gn == 'X') {
+                if ($gn == 'X')
                     $fm['CapXHeight'] = $e[13];
             }
-            }
+            if ($gn == '.notdef')
-            if ($gn == '.notdef') {
                 $fm['MissingWidth'] = $w;
         }
-        } elseif ($code == 'FontName') {
+        elseif ($code == 'FontName')
             $fm['FontName'] = $param;
-        } elseif ($code == 'Weight') {
+        elseif ($code == 'Weight')
             $fm['Weight'] = $param;
-        } elseif ($code == 'ItalicAngle') {
+        elseif ($code == 'ItalicAngle')
-            $fm['ItalicAngle'] = (float) $param;
+            $fm['ItalicAngle'] = (double) $param;
-        } elseif ($code == 'Ascender') {
+        elseif ($code == 'Ascender')
             $fm['Ascender'] = (int) $param;
-        } elseif ($code == 'Descender') {
+        elseif ($code == 'Descender')
             $fm['Descender'] = (int) $param;
-        } elseif ($code == 'UnderlineThickness') {
+        elseif ($code == 'UnderlineThickness')
             $fm['UnderlineThickness'] = (int) $param;
-        } elseif ($code == 'UnderlinePosition') {
+        elseif ($code == 'UnderlinePosition')
             $fm['UnderlinePosition'] = (int) $param;
-        } elseif ($code == 'IsFixedPitch') {
+        elseif ($code == 'IsFixedPitch')
             $fm['IsFixedPitch'] = ($param == 'true');
-        } elseif ($code == 'FontBBox') {
+        elseif ($code == 'FontBBox')
-            $fm['FontBBox'] = [$e[1], $e[2], $e[3], $e[4]];
+            $fm['FontBBox'] = array($e[1], $e[2], $e[3], $e[4]);
-        } elseif ($code == 'CapHeight') {
+        elseif ($code == 'CapHeight')
             $fm['CapHeight'] = (int) $param;
-        } elseif ($code == 'StdVW') {
+        elseif ($code == 'StdVW')
             $fm['StdVW'] = (int) $param;
     }
-    }
+    if (!isset($fm['FontName']))
-    if (!isset($fm['FontName'])) {
         die('FontName not found');
-    }
     if (!empty($map)) {
-        if (!isset($widths['.notdef'])) {
+        if (!isset($widths['.notdef']))
             $widths['.notdef'] = 600;
-        }
+        if (!isset($widths['Delta']) && isset($widths['increment']))
-        if (!isset($widths['Delta']) && isset($widths['increment'])) {
             $widths['Delta'] = $widths['increment'];
-        }
         //Order widths according to map
         for ($i = 0; $i <= 255; $i++) {
             if (!isset($widths[$map[$i]])) {
-                echo '<b>Warning:</b> character '.$map[$i].' is missing<br>';
+                echo '<b>Warning:</b> character ' . $map[$i] . ' is missing<br>';
                 $widths[$i] = $widths['.notdef'];
-            } else {
+            }
+            else
                 $widths[$i] = $widths[$map[$i]];
         }
     }
-    }
     $fm['Widths'] = $widths;
-
     return $fm;
 }
 
@@ -138,59 +126,50 @@ function MakeFontDescriptor($fm, $symbolic)
 {
     //Ascent
     $asc = (isset($fm['Ascender']) ? $fm['Ascender'] : 1000);
-    $fd = "array('Ascent'=>".$asc;
+    $fd = "array('Ascent'=>" . $asc;
     //Descent
     $desc = (isset($fm['Descender']) ? $fm['Descender'] : -200);
-    $fd .= ",'Descent'=>".$desc;
+    $fd.=",'Descent'=>" . $desc;
     //CapHeight
-    if (isset($fm['CapHeight'])) {
+    if (isset($fm['CapHeight']))
         $ch = $fm['CapHeight'];
-    } elseif (isset($fm['CapXHeight'])) {
+    elseif (isset($fm['CapXHeight']))
         $ch = $fm['CapXHeight'];
-    } else {
+    else
         $ch = $asc;
-    }
+    $fd.=",'CapHeight'=>" . $ch;
-    $fd .= ",'CapHeight'=>".$ch;
     //Flags
     $flags = 0;
-    if (isset($fm['IsFixedPitch']) && $fm['IsFixedPitch']) {
+    if (isset($fm['IsFixedPitch']) && $fm['IsFixedPitch'])
-        $flags += 1 << 0;
+        $flags+=1 << 0;
-    }
+    if ($symbolic)
-    if ($symbolic) {
+        $flags+=1 << 2;
-        $flags += 1 << 2;
+    if (!$symbolic)
-    }
+        $flags+=1 << 5;
-    if (!$symbolic) {
+    if (isset($fm['ItalicAngle']) && $fm['ItalicAngle'] != 0)
-        $flags += 1 << 5;
+        $flags+=1 << 6;
-    }
+    $fd.=",'Flags'=>" . $flags;
-    if (isset($fm['ItalicAngle']) && $fm['ItalicAngle'] != 0) {
-        $flags += 1 << 6;
-    }
-    $fd .= ",'Flags'=>".$flags;
     //FontBBox
-    if (isset($fm['FontBBox'])) {
+    if (isset($fm['FontBBox']))
         $fbb = $fm['FontBBox'];
-    } else {
+    else
-        $fbb = [0, $desc - 100, 1000, $asc + 100];
+        $fbb = array(0, $desc - 100, 1000, $asc + 100);
-    }
+    $fd.=",'FontBBox'=>'[" . $fbb[0] . ' ' . $fbb[1] . ' ' . $fbb[2] . ' ' . $fbb[3] . "]'";
-    $fd .= ",'FontBBox'=>'[".$fbb[0].' '.$fbb[1].' '.$fbb[2].' '.$fbb[3]."]'";
     //ItalicAngle
     $ia = (isset($fm['ItalicAngle']) ? $fm['ItalicAngle'] : 0);
-    $fd .= ",'ItalicAngle'=>".$ia;
+    $fd.=",'ItalicAngle'=>" . $ia;
     //StemV
-    if (isset($fm['StdVW'])) {
+    if (isset($fm['StdVW']))
         $stemv = $fm['StdVW'];
-    } elseif (isset($fm['Weight']) && preg_match('/bold|black/i', $fm['Weight'])) {
+    elseif (isset($fm['Weight']) && preg_match('/bold|black/i', $fm['Weight']))
         $stemv = 120;
-    } else {
+    else
         $stemv = 70;
-    }
+    $fd.=",'StemV'=>" . $stemv;
-    $fd .= ",'StemV'=>".$stemv;
     //MissingWidth
-    if (isset($fm['MissingWidth'])) {
+    if (isset($fm['MissingWidth']))
-        $fd .= ",'MissingWidth'=>".$fm['MissingWidth'];
+        $fd.=",'MissingWidth'=>" . $fm['MissingWidth'];
-    }
+    $fd.=')';
-    $fd .= ')';
-
     return $fd;
 }
 
@@ -200,25 +179,21 @@ function MakeWidthArray($fm)
     $s = "array(\n\t";
     $cw = $fm['Widths'];
     for ($i = 0; $i <= 255; $i++) {
-        if (chr($i) == "'") {
+        if (chr($i) == "'")
-            $s .= "'\\''";
+            $s.="'\\''";
-        } elseif (chr($i) == '\\') {
+        elseif (chr($i) == "\\")
-            $s .= "'\\\\'";
+            $s.="'\\\\'";
-        } elseif ($i >= 32 && $i <= 126) {
+        elseif ($i >= 32 && $i <= 126)
-            $s .= "'".chr($i)."'";
+            $s.="'" . chr($i) . "'";
-        } else {
+        else
-            $s .= "chr($i)";
+            $s.="chr($i)";
+        $s.='=>' . $fm['Widths'][$i];
+        if ($i < 255)
+            $s.=',';
+        if (($i + 1) % 22 == 0)
+            $s.="\n\t";
     }
-        $s .= '=>'.$fm['Widths'][$i];
+    $s.=')';
-        if ($i < 255) {
-            $s .= ',';
-        }
-        if (($i + 1) % 22 == 0) {
-            $s .= "\n\t";
-        }
-    }
-    $s .= ')';
-
     return $s;
 }
 
@@ -230,23 +205,20 @@ function MakeFontEncoding($map)
     $last = 0;
     for ($i = 32; $i <= 255; $i++) {
         if ($map[$i] != $ref[$i]) {
-            if ($i != $last + 1) {
+            if ($i != $last + 1)
-                $s .= $i.' ';
+                $s.=$i . ' ';
-            }
             $last = $i;
-            $s .= '/'.$map[$i].' ';
+            $s.='/' . $map[$i] . ' ';
         }
     }
-
     return rtrim($s);
 }
 
 function SaveToFile($file, $s, $mode)
 {
-    $f = fopen($file, 'w'.$mode);
+    $f = fopen($file, 'w' . $mode);
-    if (!$f) {
+    if (!$f)
-        die('Can\'t write to file '.$file);
+        die('Can\'t write to file ' . $file);
-    }
     fwrite($f, $s, strlen($s));
     fclose($f);
 }
@@ -254,14 +226,12 @@ function SaveToFile($file, $s, $mode)
 function ReadShort($f)
 {
     $a = unpack('n1n', fread($f, 2));
-
     return $a['n'];
 }
 
 function ReadLong($f)
 {
     $a = unpack('N1N', fread($f, 4));
-
     return $a['N'];
 }
 
@@ -269,9 +239,8 @@ function CheckTTF($file)
 {
     //Check if font license allows embedding
     $f = fopen($file, 'rb');
-    if (!$f) {
+    if (!$f)
-        die('<b>Error:</b> Can\'t open '.$file);
+        die('<b>Error:</b> Can\'t open ' . $file);
-    }
     //Extract number of tables
     fseek($f, 4, SEEK_CUR);
     $nb = ReadShort($f);
@@ -287,7 +256,6 @@ function CheckTTF($file)
     }
     if (!$found) {
         fclose($f);
-
         return;
     }
     fseek($f, 4, SEEK_CUR);
@@ -300,88 +268,78 @@ function CheckTTF($file)
     $pp = ($fsType & 0x04) != 0;
     $e = ($fsType & 0x08) != 0;
     fclose($f);
-    if ($rl && !$pp && !$e) {
+    if ($rl && !$pp && !$e)
         echo '<b>Warning:</b> font license does not allow embedding';
-    }
 }
 
-/*******************************************************************************
+/* * *****************************************************************************
-* fontfile: path to TTF file (or empty string if not to be embedded)           *
+ * fontfile: path to TTF file (or empty string if not to be embedded)           *
-* afmfile:  path to AFM file                                                   *
+ * afmfile:  path to AFM file                                                   *
-* enc:      font encoding (or empty string for symbolic fonts)                 *
+ * enc:      font encoding (or empty string for symbolic fonts)                 *
-* patch:    optional patch for encoding                                        *
+ * patch:    optional patch for encoding                                        *
-* type:     font type if fontfile is empty                                     *
+ * type:     font type if fontfile is empty                                     *
-*******************************************************************************/
+ * ***************************************************************************** */
-function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = [], $type = 'TrueType')
+
+function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = array(), $type = 'TrueType')
 {
     //Generate a font definition file
-    if (get_magic_quotes_runtime()) {
+    if (get_magic_quotes_runtime())
         @set_magic_quotes_runtime(0);
-    }
     ini_set('auto_detect_line_endings', '1');
     if ($enc) {
         $map = ReadMap($enc);
-        foreach ($patch as $cc=>$gn) {
+        foreach ($patch as $cc => $gn)
             $map[$cc] = $gn;
     }
-    } else {
+    else
-        $map = [];
+        $map = array();
-    }
+    if (!file_exists($afmfile))
-    if (!file_exists($afmfile)) {
+        die('<b>Error:</b> AFM file not found: ' . $afmfile);
-        die('<b>Error:</b> AFM file not found: '.$afmfile);
-    }
     $fm = ReadAFM($afmfile, $map);
-    if ($enc) {
+    if ($enc)
         $diff = MakeFontEncoding($map);
-    } else {
+    else
         $diff = '';
-    }
     $fd = MakeFontDescriptor($fm, empty($map));
     //Find font type
     if ($fontfile) {
         $ext = strtolower(substr($fontfile, -3));
-        if ($ext == 'ttf') {
+        if ($ext == 'ttf')
             $type = 'TrueType';
-        } elseif ($ext == 'pfb') {
+        elseif ($ext == 'pfb')
             $type = 'Type1';
-        } else {
+        else
-            die('<b>Error:</b> unrecognized font file extension: '.$ext);
+            die('<b>Error:</b> unrecognized font file extension: ' . $ext);
-        }
-    } else {
-        if ($type != 'TrueType' && $type != 'Type1') {
-            die('<b>Error:</b> incorrect font type: '.$type);
     }
+    else {
+        if ($type != 'TrueType' && $type != 'Type1')
+            die('<b>Error:</b> incorrect font type: ' . $type);
     }
     //Start generation
-    $s = '<?php'."\n";
+    $s = '<?php' . "\n";
-    $s .= '$type=\''.$type."';\n";
+    $s.='$type=\'' . $type . "';\n";
-    $s .= '$name=\''.$fm['FontName']."';\n";
+    $s.='$name=\'' . $fm['FontName'] . "';\n";
-    $s .= '$desc='.$fd.";\n";
+    $s.='$desc=' . $fd . ";\n";
-    if (!isset($fm['UnderlinePosition'])) {
+    if (!isset($fm['UnderlinePosition']))
         $fm['UnderlinePosition'] = -100;
-    }
+    if (!isset($fm['UnderlineThickness']))
-    if (!isset($fm['UnderlineThickness'])) {
         $fm['UnderlineThickness'] = 50;
-    }
+    $s.='$up=' . $fm['UnderlinePosition'] . ";\n";
-    $s .= '$up='.$fm['UnderlinePosition'].";\n";
+    $s.='$ut=' . $fm['UnderlineThickness'] . ";\n";
-    $s .= '$ut='.$fm['UnderlineThickness'].";\n";
     $w = MakeWidthArray($fm);
-    $s .= '$cw='.$w.";\n";
+    $s.='$cw=' . $w . ";\n";
-    $s .= '$enc=\''.$enc."';\n";
+    $s.='$enc=\'' . $enc . "';\n";
-    $s .= '$diff=\''.$diff."';\n";
+    $s.='$diff=\'' . $diff . "';\n";
     $basename = substr(basename($afmfile), 0, -4);
     if ($fontfile) {
         //Embedded font
-        if (!file_exists($fontfile)) {
+        if (!file_exists($fontfile))
-            die('<b>Error:</b> font file not found: '.$fontfile);
+            die('<b>Error:</b> font file not found: ' . $fontfile);
-        }
+        if ($type == 'TrueType')
-        if ($type == 'TrueType') {
             CheckTTF($fontfile);
-        }
         $f = fopen($fontfile, 'rb');
-        if (!$f) {
+        if (!$f)
-            die('<b>Error:</b> Can\'t open '.$fontfile);
+            die('<b>Error:</b> Can\'t open ' . $fontfile);
-        }
         $file = fread($f, filesize($fontfile));
         fclose($f);
         if ($type == 'Type1') {
@@ -392,41 +350,42 @@ function MakeFont($fontfile, $afmfile, $enc = 'cp1252', $patch = [], $type = 'Tr
                 $file = substr($file, 6);
             }
             $pos = strpos($file, 'eexec');
-            if (!$pos) {
+            if (!$pos)
                 die('<b>Error:</b> font file does not seem to be valid Type1');
-            }
             $size1 = $pos + 6;
             if ($header && ord($file[$size1]) == 128) {
                 //Strip second binary header
-                $file = substr($file, 0, $size1).substr($file, $size1 + 6);
+                $file = substr($file, 0, $size1) . substr($file, $size1 + 6);
             }
             $pos = strpos($file, '00000000');
-            if (!$pos) {
+            if (!$pos)
                 die('<b>Error:</b> font file does not seem to be valid Type1');
-            }
             $size2 = $pos - $size1;
             $file = substr($file, 0, $size1 + $size2);
         }
         if (function_exists('gzcompress')) {
-            $cmp = $basename.'.z';
+            $cmp = $basename . '.z';
             SaveToFile($cmp, gzcompress($file), 'b');
-            $s .= '$file=\''.$cmp."';\n";
+            $s.='$file=\'' . $cmp . "';\n";
-            echo 'Font file compressed ('.$cmp.')<br>';
+            echo 'Font file compressed (' . $cmp . ')<br>';
         } else {
-            $s .= '$file=\''.basename($fontfile)."';\n";
+            $s.='$file=\'' . basename($fontfile) . "';\n";
             echo '<b>Notice:</b> font file could not be compressed (zlib extension not available)<br>';
         }
         if ($type == 'Type1') {
-            $s .= '$size1='.$size1.";\n";
+            $s.='$size1=' . $size1 . ";\n";
-            $s .= '$size2='.$size2.";\n";
+            $s.='$size2=' . $size2 . ";\n";
-        } else {
-            $s .= '$originalsize='.filesize($fontfile).";\n";
         }
-    } else {
+        else
+            $s.='$originalsize=' . filesize($fontfile) . ";\n";
+    }
+    else {
         //Not embedded font
-        $s .= '$file='."'';\n";
+        $s.='$file=' . "'';\n";
     }
-    $s .= "?>\n";
+    $s.="?>\n";
-    SaveToFile($basename.'.php', $s, 't');
+    SaveToFile($basename . '.php', $s, 't');
-    echo 'Font definition file generated ('.$basename.'.php'.')<br>';
+    echo 'Font definition file generated (' . $basename . '.php' . ')<br>';
 }
+
+?>

font/symbol.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Symbol';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+    chr(0) => 250, chr(1) => 250, chr(2) => 250, chr(3) => 250, chr(4) => 250, chr(5) => 250, chr(6) => 250, chr(7) => 250, chr(8) => 250, chr(9) => 250, chr(10) => 250, chr(11) => 250, chr(12) => 250, chr(13) => 250, chr(14) => 250, chr(15) => 250, chr(16) => 250, chr(17) => 250, chr(18) => 250, chr(19) => 250, chr(20) => 250, chr(21) => 250,
-    chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>713, '#'=>500, '$'=>549, '%'=>833, '&'=>778, '\''=>439, '('=>333, ')'=>333, '*'=>500, '+'=>549,
+    chr(22) => 250, chr(23) => 250, chr(24) => 250, chr(25) => 250, chr(26) => 250, chr(27) => 250, chr(28) => 250, chr(29) => 250, chr(30) => 250, chr(31) => 250, ' ' => 250, '!' => 333, '"' => 713, '#' => 500, '$' => 549, '%' => 833, '&' => 778, '\'' => 439, '(' => 333, ')' => 333, '*' => 500, '+' => 549,
-    ','     => 250, '-'=>549, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>549, '='=>549, '>'=>549, '?'=>444, '@'=>549, 'A'=>722,
+    ',' => 250, '-' => 549, '.' => 250, '/' => 278, '0' => 500, '1' => 500, '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 278, ';' => 278, '<' => 549, '=' => 549, '>' => 549, '?' => 444, '@' => 549, 'A' => 722,
-    'B'     => 667, 'C'=>722, 'D'=>612, 'E'=>611, 'F'=>763, 'G'=>603, 'H'=>722, 'I'=>333, 'J'=>631, 'K'=>722, 'L'=>686, 'M'=>889, 'N'=>722, 'O'=>722, 'P'=>768, 'Q'=>741, 'R'=>556, 'S'=>592, 'T'=>611, 'U'=>690, 'V'=>439, 'W'=>768,
+    'B' => 667, 'C' => 722, 'D' => 612, 'E' => 611, 'F' => 763, 'G' => 603, 'H' => 722, 'I' => 333, 'J' => 631, 'K' => 722, 'L' => 686, 'M' => 889, 'N' => 722, 'O' => 722, 'P' => 768, 'Q' => 741, 'R' => 556, 'S' => 592, 'T' => 611, 'U' => 690, 'V' => 439, 'W' => 768,
-    'X'     => 645, 'Y'=>795, 'Z'=>611, '['=>333, '\\'=>863, ']'=>333, '^'=>658, '_'=>500, '`'=>500, 'a'=>631, 'b'=>549, 'c'=>549, 'd'=>494, 'e'=>439, 'f'=>521, 'g'=>411, 'h'=>603, 'i'=>329, 'j'=>603, 'k'=>549, 'l'=>549, 'm'=>576,
+    'X' => 645, 'Y' => 795, 'Z' => 611, '[' => 333, '\\' => 863, ']' => 333, '^' => 658, '_' => 500, '`' => 500, 'a' => 631, 'b' => 549, 'c' => 549, 'd' => 494, 'e' => 439, 'f' => 521, 'g' => 411, 'h' => 603, 'i' => 329, 'j' => 603, 'k' => 549, 'l' => 549, 'm' => 576,
-    'n'     => 521, 'o'=>549, 'p'=>549, 'q'=>521, 'r'=>549, 's'=>603, 't'=>439, 'u'=>576, 'v'=>713, 'w'=>686, 'x'=>493, 'y'=>686, 'z'=>494, '{'=>480, '|'=>200, '}'=>480, '~'=>549, chr(127)=>0, chr(128)=>0, chr(129)=>0, chr(130)=>0, chr(131)=>0,
+    'n' => 521, 'o' => 549, 'p' => 549, 'q' => 521, 'r' => 549, 's' => 603, 't' => 439, 'u' => 576, 'v' => 713, 'w' => 686, 'x' => 493, 'y' => 686, 'z' => 494, '{' => 480, '|' => 200, '}' => 480, '~' => 549, chr(127) => 0, chr(128) => 0, chr(129) => 0, chr(130) => 0, chr(131) => 0,
-    chr(132)=> 0, chr(133)=>0, chr(134)=>0, chr(135)=>0, chr(136)=>0, chr(137)=>0, chr(138)=>0, chr(139)=>0, chr(140)=>0, chr(141)=>0, chr(142)=>0, chr(143)=>0, chr(144)=>0, chr(145)=>0, chr(146)=>0, chr(147)=>0, chr(148)=>0, chr(149)=>0, chr(150)=>0, chr(151)=>0, chr(152)=>0, chr(153)=>0,
+    chr(132) => 0, chr(133) => 0, chr(134) => 0, chr(135) => 0, chr(136) => 0, chr(137) => 0, chr(138) => 0, chr(139) => 0, chr(140) => 0, chr(141) => 0, chr(142) => 0, chr(143) => 0, chr(144) => 0, chr(145) => 0, chr(146) => 0, chr(147) => 0, chr(148) => 0, chr(149) => 0, chr(150) => 0, chr(151) => 0, chr(152) => 0, chr(153) => 0,
-    chr(154)=> 0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>750, chr(161)=>620, chr(162)=>247, chr(163)=>549, chr(164)=>167, chr(165)=>713, chr(166)=>500, chr(167)=>753, chr(168)=>753, chr(169)=>753, chr(170)=>753, chr(171)=>1042, chr(172)=>987, chr(173)=>603, chr(174)=>987, chr(175)=>603,
+    chr(154) => 0, chr(155) => 0, chr(156) => 0, chr(157) => 0, chr(158) => 0, chr(159) => 0, chr(160) => 750, chr(161) => 620, chr(162) => 247, chr(163) => 549, chr(164) => 167, chr(165) => 713, chr(166) => 500, chr(167) => 753, chr(168) => 753, chr(169) => 753, chr(170) => 753, chr(171) => 1042, chr(172) => 987, chr(173) => 603, chr(174) => 987, chr(175) => 603,
-    chr(176)=> 400, chr(177)=>549, chr(178)=>411, chr(179)=>549, chr(180)=>549, chr(181)=>713, chr(182)=>494, chr(183)=>460, chr(184)=>549, chr(185)=>549, chr(186)=>549, chr(187)=>549, chr(188)=>1000, chr(189)=>603, chr(190)=>1000, chr(191)=>658, chr(192)=>823, chr(193)=>686, chr(194)=>795, chr(195)=>987, chr(196)=>768, chr(197)=>768,
+    chr(176) => 400, chr(177) => 549, chr(178) => 411, chr(179) => 549, chr(180) => 549, chr(181) => 713, chr(182) => 494, chr(183) => 460, chr(184) => 549, chr(185) => 549, chr(186) => 549, chr(187) => 549, chr(188) => 1000, chr(189) => 603, chr(190) => 1000, chr(191) => 658, chr(192) => 823, chr(193) => 686, chr(194) => 795, chr(195) => 987, chr(196) => 768, chr(197) => 768,
-    chr(198)=> 823, chr(199)=>768, chr(200)=>768, chr(201)=>713, chr(202)=>713, chr(203)=>713, chr(204)=>713, chr(205)=>713, chr(206)=>713, chr(207)=>713, chr(208)=>768, chr(209)=>713, chr(210)=>790, chr(211)=>790, chr(212)=>890, chr(213)=>823, chr(214)=>549, chr(215)=>250, chr(216)=>713, chr(217)=>603, chr(218)=>603, chr(219)=>1042,
+    chr(198) => 823, chr(199) => 768, chr(200) => 768, chr(201) => 713, chr(202) => 713, chr(203) => 713, chr(204) => 713, chr(205) => 713, chr(206) => 713, chr(207) => 713, chr(208) => 768, chr(209) => 713, chr(210) => 790, chr(211) => 790, chr(212) => 890, chr(213) => 823, chr(214) => 549, chr(215) => 250, chr(216) => 713, chr(217) => 603, chr(218) => 603, chr(219) => 1042,
-    chr(220)=> 987, chr(221)=>603, chr(222)=>987, chr(223)=>603, chr(224)=>494, chr(225)=>329, chr(226)=>790, chr(227)=>790, chr(228)=>786, chr(229)=>713, chr(230)=>384, chr(231)=>384, chr(232)=>384, chr(233)=>384, chr(234)=>384, chr(235)=>384, chr(236)=>494, chr(237)=>494, chr(238)=>494, chr(239)=>494, chr(240)=>0, chr(241)=>329,
+    chr(220) => 987, chr(221) => 603, chr(222) => 987, chr(223) => 603, chr(224) => 494, chr(225) => 329, chr(226) => 790, chr(227) => 790, chr(228) => 786, chr(229) => 713, chr(230) => 384, chr(231) => 384, chr(232) => 384, chr(233) => 384, chr(234) => 384, chr(235) => 384, chr(236) => 494, chr(237) => 494, chr(238) => 494, chr(239) => 494, chr(240) => 0, chr(241) => 329,
-    chr(242)=> 274, chr(243)=>686, chr(244)=>686, chr(245)=>686, chr(246)=>384, chr(247)=>384, chr(248)=>384, chr(249)=>384, chr(250)=>384, chr(251)=>384, chr(252)=>494, chr(253)=>494, chr(254)=>494, chr(255)=>0, ];
+    chr(242) => 274, chr(243) => 686, chr(244) => 686, chr(245) => 686, chr(246) => 384, chr(247) => 384, chr(248) => 384, chr(249) => 384, chr(250) => 384, chr(251) => 384, chr(252) => 494, chr(253) => 494, chr(254) => 494, chr(255) => 0);
+?>

font/times.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Times-Roman';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+    chr(0) => 250, chr(1) => 250, chr(2) => 250, chr(3) => 250, chr(4) => 250, chr(5) => 250, chr(6) => 250, chr(7) => 250, chr(8) => 250, chr(9) => 250, chr(10) => 250, chr(11) => 250, chr(12) => 250, chr(13) => 250, chr(14) => 250, chr(15) => 250, chr(16) => 250, chr(17) => 250, chr(18) => 250, chr(19) => 250, chr(20) => 250, chr(21) => 250,
-    chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>408, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>180, '('=>333, ')'=>333, '*'=>500, '+'=>564,
+    chr(22) => 250, chr(23) => 250, chr(24) => 250, chr(25) => 250, chr(26) => 250, chr(27) => 250, chr(28) => 250, chr(29) => 250, chr(30) => 250, chr(31) => 250, ' ' => 250, '!' => 333, '"' => 408, '#' => 500, '$' => 500, '%' => 833, '&' => 778, '\'' => 180, '(' => 333, ')' => 333, '*' => 500, '+' => 564,
-    ','     => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>278, ';'=>278, '<'=>564, '='=>564, '>'=>564, '?'=>444, '@'=>921, 'A'=>722,
+    ',' => 250, '-' => 333, '.' => 250, '/' => 278, '0' => 500, '1' => 500, '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 278, ';' => 278, '<' => 564, '=' => 564, '>' => 564, '?' => 444, '@' => 921, 'A' => 722,
-    'B'     => 667, 'C'=>667, 'D'=>722, 'E'=>611, 'F'=>556, 'G'=>722, 'H'=>722, 'I'=>333, 'J'=>389, 'K'=>722, 'L'=>611, 'M'=>889, 'N'=>722, 'O'=>722, 'P'=>556, 'Q'=>722, 'R'=>667, 'S'=>556, 'T'=>611, 'U'=>722, 'V'=>722, 'W'=>944,
+    'B' => 667, 'C' => 667, 'D' => 722, 'E' => 611, 'F' => 556, 'G' => 722, 'H' => 722, 'I' => 333, 'J' => 389, 'K' => 722, 'L' => 611, 'M' => 889, 'N' => 722, 'O' => 722, 'P' => 556, 'Q' => 722, 'R' => 667, 'S' => 556, 'T' => 611, 'U' => 722, 'V' => 722, 'W' => 944,
-    'X'     => 722, 'Y'=>722, 'Z'=>611, '['=>333, '\\'=>278, ']'=>333, '^'=>469, '_'=>500, '`'=>333, 'a'=>444, 'b'=>500, 'c'=>444, 'd'=>500, 'e'=>444, 'f'=>333, 'g'=>500, 'h'=>500, 'i'=>278, 'j'=>278, 'k'=>500, 'l'=>278, 'm'=>778,
+    'X' => 722, 'Y' => 722, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 469, '_' => 500, '`' => 333, 'a' => 444, 'b' => 500, 'c' => 444, 'd' => 500, 'e' => 444, 'f' => 333, 'g' => 500, 'h' => 500, 'i' => 278, 'j' => 278, 'k' => 500, 'l' => 278, 'm' => 778,
-    'n'     => 500, 'o'=>500, 'p'=>500, 'q'=>500, 'r'=>333, 's'=>389, 't'=>278, 'u'=>500, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>444, '{'=>480, '|'=>200, '}'=>480, '~'=>541, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
+    'n' => 500, 'o' => 500, 'p' => 500, 'q' => 500, 'r' => 333, 's' => 389, 't' => 278, 'u' => 500, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 444, '{' => 480, '|' => 200, '}' => 480, '~' => 541, chr(127) => 350, chr(128) => 500, chr(129) => 350, chr(130) => 333, chr(131) => 500,
-    chr(132)=> 444, chr(133)=>1000, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>556, chr(139)=>333, chr(140)=>889, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>444, chr(148)=>444, chr(149)=>350, chr(150)=>500, chr(151)=>1000, chr(152)=>333, chr(153)=>980,
+    chr(132) => 444, chr(133) => 1000, chr(134) => 500, chr(135) => 500, chr(136) => 333, chr(137) => 1000, chr(138) => 556, chr(139) => 333, chr(140) => 889, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 333, chr(146) => 333, chr(147) => 444, chr(148) => 444, chr(149) => 350, chr(150) => 500, chr(151) => 1000, chr(152) => 333, chr(153) => 980,
-    chr(154)=> 389, chr(155)=>333, chr(156)=>722, chr(157)=>350, chr(158)=>444, chr(159)=>722, chr(160)=>250, chr(161)=>333, chr(162)=>500, chr(163)=>500, chr(164)=>500, chr(165)=>500, chr(166)=>200, chr(167)=>500, chr(168)=>333, chr(169)=>760, chr(170)=>276, chr(171)=>500, chr(172)=>564, chr(173)=>333, chr(174)=>760, chr(175)=>333,
+    chr(154) => 389, chr(155) => 333, chr(156) => 722, chr(157) => 350, chr(158) => 444, chr(159) => 722, chr(160) => 250, chr(161) => 333, chr(162) => 500, chr(163) => 500, chr(164) => 500, chr(165) => 500, chr(166) => 200, chr(167) => 500, chr(168) => 333, chr(169) => 760, chr(170) => 276, chr(171) => 500, chr(172) => 564, chr(173) => 333, chr(174) => 760, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>564, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>453, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>444, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+    chr(176) => 400, chr(177) => 564, chr(178) => 300, chr(179) => 300, chr(180) => 333, chr(181) => 500, chr(182) => 453, chr(183) => 250, chr(184) => 333, chr(185) => 300, chr(186) => 310, chr(187) => 500, chr(188) => 750, chr(189) => 750, chr(190) => 750, chr(191) => 444, chr(192) => 722, chr(193) => 722, chr(194) => 722, chr(195) => 722, chr(196) => 722, chr(197) => 722,
-    chr(198)=> 889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>564, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 889, chr(199) => 667, chr(200) => 611, chr(201) => 611, chr(202) => 611, chr(203) => 611, chr(204) => 333, chr(205) => 333, chr(206) => 333, chr(207) => 333, chr(208) => 722, chr(209) => 722, chr(210) => 722, chr(211) => 722, chr(212) => 722, chr(213) => 722, chr(214) => 722, chr(215) => 564, chr(216) => 722, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>722, chr(222)=>556, chr(223)=>500, chr(224)=>444, chr(225)=>444, chr(226)=>444, chr(227)=>444, chr(228)=>444, chr(229)=>444, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500,
+    chr(220) => 722, chr(221) => 722, chr(222) => 556, chr(223) => 500, chr(224) => 444, chr(225) => 444, chr(226) => 444, chr(227) => 444, chr(228) => 444, chr(229) => 444, chr(230) => 667, chr(231) => 444, chr(232) => 444, chr(233) => 444, chr(234) => 444, chr(235) => 444, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 500, chr(241) => 500,
-    chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>564, chr(248)=>500, chr(249)=>500, chr(250)=>500, chr(251)=>500, chr(252)=>500, chr(253)=>500, chr(254)=>500, chr(255)=>500, ];
+    chr(242) => 500, chr(243) => 500, chr(244) => 500, chr(245) => 500, chr(246) => 500, chr(247) => 564, chr(248) => 500, chr(249) => 500, chr(250) => 500, chr(251) => 500, chr(252) => 500, chr(253) => 500, chr(254) => 500, chr(255) => 500);
+?>

font/timesb.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Times-Bold';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+    chr(0) => 250, chr(1) => 250, chr(2) => 250, chr(3) => 250, chr(4) => 250, chr(5) => 250, chr(6) => 250, chr(7) => 250, chr(8) => 250, chr(9) => 250, chr(10) => 250, chr(11) => 250, chr(12) => 250, chr(13) => 250, chr(14) => 250, chr(15) => 250, chr(16) => 250, chr(17) => 250, chr(18) => 250, chr(19) => 250, chr(20) => 250, chr(21) => 250,
-    chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>555, '#'=>500, '$'=>500, '%'=>1000, '&'=>833, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570,
+    chr(22) => 250, chr(23) => 250, chr(24) => 250, chr(25) => 250, chr(26) => 250, chr(27) => 250, chr(28) => 250, chr(29) => 250, chr(30) => 250, chr(31) => 250, ' ' => 250, '!' => 333, '"' => 555, '#' => 500, '$' => 500, '%' => 1000, '&' => 833, '\'' => 278, '(' => 333, ')' => 333, '*' => 500, '+' => 570,
-    ','     => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>930, 'A'=>722,
+    ',' => 250, '-' => 333, '.' => 250, '/' => 278, '0' => 500, '1' => 500, '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 333, ';' => 333, '<' => 570, '=' => 570, '>' => 570, '?' => 500, '@' => 930, 'A' => 722,
-    'B'     => 667, 'C'=>722, 'D'=>722, 'E'=>667, 'F'=>611, 'G'=>778, 'H'=>778, 'I'=>389, 'J'=>500, 'K'=>778, 'L'=>667, 'M'=>944, 'N'=>722, 'O'=>778, 'P'=>611, 'Q'=>778, 'R'=>722, 'S'=>556, 'T'=>667, 'U'=>722, 'V'=>722, 'W'=>1000,
+    'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 778, 'I' => 389, 'J' => 500, 'K' => 778, 'L' => 667, 'M' => 944, 'N' => 722, 'O' => 778, 'P' => 611, 'Q' => 778, 'R' => 722, 'S' => 556, 'T' => 667, 'U' => 722, 'V' => 722, 'W' => 1000,
-    'X'     => 722, 'Y'=>722, 'Z'=>667, '['=>333, '\\'=>278, ']'=>333, '^'=>581, '_'=>500, '`'=>333, 'a'=>500, 'b'=>556, 'c'=>444, 'd'=>556, 'e'=>444, 'f'=>333, 'g'=>500, 'h'=>556, 'i'=>278, 'j'=>333, 'k'=>556, 'l'=>278, 'm'=>833,
+    'X' => 722, 'Y' => 722, 'Z' => 667, '[' => 333, '\\' => 278, ']' => 333, '^' => 581, '_' => 500, '`' => 333, 'a' => 500, 'b' => 556, 'c' => 444, 'd' => 556, 'e' => 444, 'f' => 333, 'g' => 500, 'h' => 556, 'i' => 278, 'j' => 333, 'k' => 556, 'l' => 278, 'm' => 833,
-    'n'     => 556, 'o'=>500, 'p'=>556, 'q'=>556, 'r'=>444, 's'=>389, 't'=>333, 'u'=>556, 'v'=>500, 'w'=>722, 'x'=>500, 'y'=>500, 'z'=>444, '{'=>394, '|'=>220, '}'=>394, '~'=>520, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
+    'n' => 556, 'o' => 500, 'p' => 556, 'q' => 556, 'r' => 444, 's' => 389, 't' => 333, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 444, '{' => 394, '|' => 220, '}' => 394, '~' => 520, chr(127) => 350, chr(128) => 500, chr(129) => 350, chr(130) => 333, chr(131) => 500,
-    chr(132)=> 500, chr(133)=>1000, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>556, chr(139)=>333, chr(140)=>1000, chr(141)=>350, chr(142)=>667, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>500, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+    chr(132) => 500, chr(133) => 1000, chr(134) => 500, chr(135) => 500, chr(136) => 333, chr(137) => 1000, chr(138) => 556, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 667, chr(143) => 350, chr(144) => 350, chr(145) => 333, chr(146) => 333, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 500, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154)=> 389, chr(155)=>333, chr(156)=>722, chr(157)=>350, chr(158)=>444, chr(159)=>722, chr(160)=>250, chr(161)=>333, chr(162)=>500, chr(163)=>500, chr(164)=>500, chr(165)=>500, chr(166)=>220, chr(167)=>500, chr(168)=>333, chr(169)=>747, chr(170)=>300, chr(171)=>500, chr(172)=>570, chr(173)=>333, chr(174)=>747, chr(175)=>333,
+    chr(154) => 389, chr(155) => 333, chr(156) => 722, chr(157) => 350, chr(158) => 444, chr(159) => 722, chr(160) => 250, chr(161) => 333, chr(162) => 500, chr(163) => 500, chr(164) => 500, chr(165) => 500, chr(166) => 220, chr(167) => 500, chr(168) => 333, chr(169) => 747, chr(170) => 300, chr(171) => 500, chr(172) => 570, chr(173) => 333, chr(174) => 747, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>556, chr(182)=>540, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>330, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>722, chr(193)=>722, chr(194)=>722, chr(195)=>722, chr(196)=>722, chr(197)=>722,
+    chr(176) => 400, chr(177) => 570, chr(178) => 300, chr(179) => 300, chr(180) => 333, chr(181) => 556, chr(182) => 540, chr(183) => 250, chr(184) => 333, chr(185) => 300, chr(186) => 330, chr(187) => 500, chr(188) => 750, chr(189) => 750, chr(190) => 750, chr(191) => 500, chr(192) => 722, chr(193) => 722, chr(194) => 722, chr(195) => 722, chr(196) => 722, chr(197) => 722,
-    chr(198)=> 1000, chr(199)=>722, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>778, chr(211)=>778, chr(212)=>778, chr(213)=>778, chr(214)=>778, chr(215)=>570, chr(216)=>778, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 389, chr(205) => 389, chr(206) => 389, chr(207) => 389, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 570, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>722, chr(222)=>611, chr(223)=>556, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556,
+    chr(220) => 722, chr(221) => 722, chr(222) => 611, chr(223) => 556, chr(224) => 500, chr(225) => 500, chr(226) => 500, chr(227) => 500, chr(228) => 500, chr(229) => 500, chr(230) => 722, chr(231) => 444, chr(232) => 444, chr(233) => 444, chr(234) => 444, chr(235) => 444, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 500, chr(241) => 556,
-    chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>570, chr(248)=>500, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>500, chr(254)=>556, chr(255)=>500, ];
+    chr(242) => 500, chr(243) => 500, chr(244) => 500, chr(245) => 500, chr(246) => 500, chr(247) => 570, chr(248) => 500, chr(249) => 556, chr(250) => 556, chr(251) => 556, chr(252) => 556, chr(253) => 500, chr(254) => 556, chr(255) => 500);
+?>

font/timesbi.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Times-BoldItalic';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+    chr(0) => 250, chr(1) => 250, chr(2) => 250, chr(3) => 250, chr(4) => 250, chr(5) => 250, chr(6) => 250, chr(7) => 250, chr(8) => 250, chr(9) => 250, chr(10) => 250, chr(11) => 250, chr(12) => 250, chr(13) => 250, chr(14) => 250, chr(15) => 250, chr(16) => 250, chr(17) => 250, chr(18) => 250, chr(19) => 250, chr(20) => 250, chr(21) => 250,
-    chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>389, '"'=>555, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>278, '('=>333, ')'=>333, '*'=>500, '+'=>570,
+    chr(22) => 250, chr(23) => 250, chr(24) => 250, chr(25) => 250, chr(26) => 250, chr(27) => 250, chr(28) => 250, chr(29) => 250, chr(30) => 250, chr(31) => 250, ' ' => 250, '!' => 389, '"' => 555, '#' => 500, '$' => 500, '%' => 833, '&' => 778, '\'' => 278, '(' => 333, ')' => 333, '*' => 500, '+' => 570,
-    ','     => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>570, '='=>570, '>'=>570, '?'=>500, '@'=>832, 'A'=>667,
+    ',' => 250, '-' => 333, '.' => 250, '/' => 278, '0' => 500, '1' => 500, '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 333, ';' => 333, '<' => 570, '=' => 570, '>' => 570, '?' => 500, '@' => 832, 'A' => 667,
-    'B'     => 667, 'C'=>667, 'D'=>722, 'E'=>667, 'F'=>667, 'G'=>722, 'H'=>778, 'I'=>389, 'J'=>500, 'K'=>667, 'L'=>611, 'M'=>889, 'N'=>722, 'O'=>722, 'P'=>611, 'Q'=>722, 'R'=>667, 'S'=>556, 'T'=>611, 'U'=>722, 'V'=>667, 'W'=>889,
+    'B' => 667, 'C' => 667, 'D' => 722, 'E' => 667, 'F' => 667, 'G' => 722, 'H' => 778, 'I' => 389, 'J' => 500, 'K' => 667, 'L' => 611, 'M' => 889, 'N' => 722, 'O' => 722, 'P' => 611, 'Q' => 722, 'R' => 667, 'S' => 556, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 889,
-    'X'     => 667, 'Y'=>611, 'Z'=>611, '['=>333, '\\'=>278, ']'=>333, '^'=>570, '_'=>500, '`'=>333, 'a'=>500, 'b'=>500, 'c'=>444, 'd'=>500, 'e'=>444, 'f'=>333, 'g'=>500, 'h'=>556, 'i'=>278, 'j'=>278, 'k'=>500, 'l'=>278, 'm'=>778,
+    'X' => 667, 'Y' => 611, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 570, '_' => 500, '`' => 333, 'a' => 500, 'b' => 500, 'c' => 444, 'd' => 500, 'e' => 444, 'f' => 333, 'g' => 500, 'h' => 556, 'i' => 278, 'j' => 278, 'k' => 500, 'l' => 278, 'm' => 778,
-    'n'     => 556, 'o'=>500, 'p'=>500, 'q'=>500, 'r'=>389, 's'=>389, 't'=>278, 'u'=>556, 'v'=>444, 'w'=>667, 'x'=>500, 'y'=>444, 'z'=>389, '{'=>348, '|'=>220, '}'=>348, '~'=>570, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
+    'n' => 556, 'o' => 500, 'p' => 500, 'q' => 500, 'r' => 389, 's' => 389, 't' => 278, 'u' => 556, 'v' => 444, 'w' => 667, 'x' => 500, 'y' => 444, 'z' => 389, '{' => 348, '|' => 220, '}' => 348, '~' => 570, chr(127) => 350, chr(128) => 500, chr(129) => 350, chr(130) => 333, chr(131) => 500,
-    chr(132)=> 500, chr(133)=>1000, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>556, chr(139)=>333, chr(140)=>944, chr(141)=>350, chr(142)=>611, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>500, chr(148)=>500, chr(149)=>350, chr(150)=>500, chr(151)=>1000, chr(152)=>333, chr(153)=>1000,
+    chr(132) => 500, chr(133) => 1000, chr(134) => 500, chr(135) => 500, chr(136) => 333, chr(137) => 1000, chr(138) => 556, chr(139) => 333, chr(140) => 944, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 333, chr(146) => 333, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 500, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154)=> 389, chr(155)=>333, chr(156)=>722, chr(157)=>350, chr(158)=>389, chr(159)=>611, chr(160)=>250, chr(161)=>389, chr(162)=>500, chr(163)=>500, chr(164)=>500, chr(165)=>500, chr(166)=>220, chr(167)=>500, chr(168)=>333, chr(169)=>747, chr(170)=>266, chr(171)=>500, chr(172)=>606, chr(173)=>333, chr(174)=>747, chr(175)=>333,
+    chr(154) => 389, chr(155) => 333, chr(156) => 722, chr(157) => 350, chr(158) => 389, chr(159) => 611, chr(160) => 250, chr(161) => 389, chr(162) => 500, chr(163) => 500, chr(164) => 500, chr(165) => 500, chr(166) => 220, chr(167) => 500, chr(168) => 333, chr(169) => 747, chr(170) => 266, chr(171) => 500, chr(172) => 606, chr(173) => 333, chr(174) => 747, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>570, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>576, chr(182)=>500, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>300, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>667, chr(193)=>667, chr(194)=>667, chr(195)=>667, chr(196)=>667, chr(197)=>667,
+    chr(176) => 400, chr(177) => 570, chr(178) => 300, chr(179) => 300, chr(180) => 333, chr(181) => 576, chr(182) => 500, chr(183) => 250, chr(184) => 333, chr(185) => 300, chr(186) => 300, chr(187) => 500, chr(188) => 750, chr(189) => 750, chr(190) => 750, chr(191) => 500, chr(192) => 667, chr(193) => 667, chr(194) => 667, chr(195) => 667, chr(196) => 667, chr(197) => 667,
-    chr(198)=> 944, chr(199)=>667, chr(200)=>667, chr(201)=>667, chr(202)=>667, chr(203)=>667, chr(204)=>389, chr(205)=>389, chr(206)=>389, chr(207)=>389, chr(208)=>722, chr(209)=>722, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>570, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 944, chr(199) => 667, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 389, chr(205) => 389, chr(206) => 389, chr(207) => 389, chr(208) => 722, chr(209) => 722, chr(210) => 722, chr(211) => 722, chr(212) => 722, chr(213) => 722, chr(214) => 722, chr(215) => 570, chr(216) => 722, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>611, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>722, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>556,
+    chr(220) => 722, chr(221) => 611, chr(222) => 611, chr(223) => 500, chr(224) => 500, chr(225) => 500, chr(226) => 500, chr(227) => 500, chr(228) => 500, chr(229) => 500, chr(230) => 722, chr(231) => 444, chr(232) => 444, chr(233) => 444, chr(234) => 444, chr(235) => 444, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 500, chr(241) => 556,
-    chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>570, chr(248)=>500, chr(249)=>556, chr(250)=>556, chr(251)=>556, chr(252)=>556, chr(253)=>444, chr(254)=>500, chr(255)=>444, ];
+    chr(242) => 500, chr(243) => 500, chr(244) => 500, chr(245) => 500, chr(246) => 500, chr(247) => 570, chr(248) => 500, chr(249) => 556, chr(250) => 556, chr(251) => 556, chr(252) => 556, chr(253) => 444, chr(254) => 500, chr(255) => 444);
+?>

font/timesi.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'Times-Italic';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 250, chr(1)=>250, chr(2)=>250, chr(3)=>250, chr(4)=>250, chr(5)=>250, chr(6)=>250, chr(7)=>250, chr(8)=>250, chr(9)=>250, chr(10)=>250, chr(11)=>250, chr(12)=>250, chr(13)=>250, chr(14)=>250, chr(15)=>250, chr(16)=>250, chr(17)=>250, chr(18)=>250, chr(19)=>250, chr(20)=>250, chr(21)=>250,
+    chr(0) => 250, chr(1) => 250, chr(2) => 250, chr(3) => 250, chr(4) => 250, chr(5) => 250, chr(6) => 250, chr(7) => 250, chr(8) => 250, chr(9) => 250, chr(10) => 250, chr(11) => 250, chr(12) => 250, chr(13) => 250, chr(14) => 250, chr(15) => 250, chr(16) => 250, chr(17) => 250, chr(18) => 250, chr(19) => 250, chr(20) => 250, chr(21) => 250,
-    chr(22) => 250, chr(23)=>250, chr(24)=>250, chr(25)=>250, chr(26)=>250, chr(27)=>250, chr(28)=>250, chr(29)=>250, chr(30)=>250, chr(31)=>250, ' '=>250, '!'=>333, '"'=>420, '#'=>500, '$'=>500, '%'=>833, '&'=>778, '\''=>214, '('=>333, ')'=>333, '*'=>500, '+'=>675,
+    chr(22) => 250, chr(23) => 250, chr(24) => 250, chr(25) => 250, chr(26) => 250, chr(27) => 250, chr(28) => 250, chr(29) => 250, chr(30) => 250, chr(31) => 250, ' ' => 250, '!' => 333, '"' => 420, '#' => 500, '$' => 500, '%' => 833, '&' => 778, '\'' => 214, '(' => 333, ')' => 333, '*' => 500, '+' => 675,
-    ','     => 250, '-'=>333, '.'=>250, '/'=>278, '0'=>500, '1'=>500, '2'=>500, '3'=>500, '4'=>500, '5'=>500, '6'=>500, '7'=>500, '8'=>500, '9'=>500, ':'=>333, ';'=>333, '<'=>675, '='=>675, '>'=>675, '?'=>500, '@'=>920, 'A'=>611,
+    ',' => 250, '-' => 333, '.' => 250, '/' => 278, '0' => 500, '1' => 500, '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 333, ';' => 333, '<' => 675, '=' => 675, '>' => 675, '?' => 500, '@' => 920, 'A' => 611,
-    'B'     => 611, 'C'=>667, 'D'=>722, 'E'=>611, 'F'=>611, 'G'=>722, 'H'=>722, 'I'=>333, 'J'=>444, 'K'=>667, 'L'=>556, 'M'=>833, 'N'=>667, 'O'=>722, 'P'=>611, 'Q'=>722, 'R'=>611, 'S'=>500, 'T'=>556, 'U'=>722, 'V'=>611, 'W'=>833,
+    'B' => 611, 'C' => 667, 'D' => 722, 'E' => 611, 'F' => 611, 'G' => 722, 'H' => 722, 'I' => 333, 'J' => 444, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 667, 'O' => 722, 'P' => 611, 'Q' => 722, 'R' => 611, 'S' => 500, 'T' => 556, 'U' => 722, 'V' => 611, 'W' => 833,
-    'X'     => 611, 'Y'=>556, 'Z'=>556, '['=>389, '\\'=>278, ']'=>389, '^'=>422, '_'=>500, '`'=>333, 'a'=>500, 'b'=>500, 'c'=>444, 'd'=>500, 'e'=>444, 'f'=>278, 'g'=>500, 'h'=>500, 'i'=>278, 'j'=>278, 'k'=>444, 'l'=>278, 'm'=>722,
+    'X' => 611, 'Y' => 556, 'Z' => 556, '[' => 389, '\\' => 278, ']' => 389, '^' => 422, '_' => 500, '`' => 333, 'a' => 500, 'b' => 500, 'c' => 444, 'd' => 500, 'e' => 444, 'f' => 278, 'g' => 500, 'h' => 500, 'i' => 278, 'j' => 278, 'k' => 444, 'l' => 278, 'm' => 722,
-    'n'     => 500, 'o'=>500, 'p'=>500, 'q'=>500, 'r'=>389, 's'=>389, 't'=>278, 'u'=>500, 'v'=>444, 'w'=>667, 'x'=>444, 'y'=>444, 'z'=>389, '{'=>400, '|'=>275, '}'=>400, '~'=>541, chr(127)=>350, chr(128)=>500, chr(129)=>350, chr(130)=>333, chr(131)=>500,
+    'n' => 500, 'o' => 500, 'p' => 500, 'q' => 500, 'r' => 389, 's' => 389, 't' => 278, 'u' => 500, 'v' => 444, 'w' => 667, 'x' => 444, 'y' => 444, 'z' => 389, '{' => 400, '|' => 275, '}' => 400, '~' => 541, chr(127) => 350, chr(128) => 500, chr(129) => 350, chr(130) => 333, chr(131) => 500,
-    chr(132)=> 556, chr(133)=>889, chr(134)=>500, chr(135)=>500, chr(136)=>333, chr(137)=>1000, chr(138)=>500, chr(139)=>333, chr(140)=>944, chr(141)=>350, chr(142)=>556, chr(143)=>350, chr(144)=>350, chr(145)=>333, chr(146)=>333, chr(147)=>556, chr(148)=>556, chr(149)=>350, chr(150)=>500, chr(151)=>889, chr(152)=>333, chr(153)=>980,
+    chr(132) => 556, chr(133) => 889, chr(134) => 500, chr(135) => 500, chr(136) => 333, chr(137) => 1000, chr(138) => 500, chr(139) => 333, chr(140) => 944, chr(141) => 350, chr(142) => 556, chr(143) => 350, chr(144) => 350, chr(145) => 333, chr(146) => 333, chr(147) => 556, chr(148) => 556, chr(149) => 350, chr(150) => 500, chr(151) => 889, chr(152) => 333, chr(153) => 980,
-    chr(154)=> 389, chr(155)=>333, chr(156)=>667, chr(157)=>350, chr(158)=>389, chr(159)=>556, chr(160)=>250, chr(161)=>389, chr(162)=>500, chr(163)=>500, chr(164)=>500, chr(165)=>500, chr(166)=>275, chr(167)=>500, chr(168)=>333, chr(169)=>760, chr(170)=>276, chr(171)=>500, chr(172)=>675, chr(173)=>333, chr(174)=>760, chr(175)=>333,
+    chr(154) => 389, chr(155) => 333, chr(156) => 667, chr(157) => 350, chr(158) => 389, chr(159) => 556, chr(160) => 250, chr(161) => 389, chr(162) => 500, chr(163) => 500, chr(164) => 500, chr(165) => 500, chr(166) => 275, chr(167) => 500, chr(168) => 333, chr(169) => 760, chr(170) => 276, chr(171) => 500, chr(172) => 675, chr(173) => 333, chr(174) => 760, chr(175) => 333,
-    chr(176)=> 400, chr(177)=>675, chr(178)=>300, chr(179)=>300, chr(180)=>333, chr(181)=>500, chr(182)=>523, chr(183)=>250, chr(184)=>333, chr(185)=>300, chr(186)=>310, chr(187)=>500, chr(188)=>750, chr(189)=>750, chr(190)=>750, chr(191)=>500, chr(192)=>611, chr(193)=>611, chr(194)=>611, chr(195)=>611, chr(196)=>611, chr(197)=>611,
+    chr(176) => 400, chr(177) => 675, chr(178) => 300, chr(179) => 300, chr(180) => 333, chr(181) => 500, chr(182) => 523, chr(183) => 250, chr(184) => 333, chr(185) => 300, chr(186) => 310, chr(187) => 500, chr(188) => 750, chr(189) => 750, chr(190) => 750, chr(191) => 500, chr(192) => 611, chr(193) => 611, chr(194) => 611, chr(195) => 611, chr(196) => 611, chr(197) => 611,
-    chr(198)=> 889, chr(199)=>667, chr(200)=>611, chr(201)=>611, chr(202)=>611, chr(203)=>611, chr(204)=>333, chr(205)=>333, chr(206)=>333, chr(207)=>333, chr(208)=>722, chr(209)=>667, chr(210)=>722, chr(211)=>722, chr(212)=>722, chr(213)=>722, chr(214)=>722, chr(215)=>675, chr(216)=>722, chr(217)=>722, chr(218)=>722, chr(219)=>722,
+    chr(198) => 889, chr(199) => 667, chr(200) => 611, chr(201) => 611, chr(202) => 611, chr(203) => 611, chr(204) => 333, chr(205) => 333, chr(206) => 333, chr(207) => 333, chr(208) => 722, chr(209) => 667, chr(210) => 722, chr(211) => 722, chr(212) => 722, chr(213) => 722, chr(214) => 722, chr(215) => 675, chr(216) => 722, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220)=> 722, chr(221)=>556, chr(222)=>611, chr(223)=>500, chr(224)=>500, chr(225)=>500, chr(226)=>500, chr(227)=>500, chr(228)=>500, chr(229)=>500, chr(230)=>667, chr(231)=>444, chr(232)=>444, chr(233)=>444, chr(234)=>444, chr(235)=>444, chr(236)=>278, chr(237)=>278, chr(238)=>278, chr(239)=>278, chr(240)=>500, chr(241)=>500,
+    chr(220) => 722, chr(221) => 556, chr(222) => 611, chr(223) => 500, chr(224) => 500, chr(225) => 500, chr(226) => 500, chr(227) => 500, chr(228) => 500, chr(229) => 500, chr(230) => 667, chr(231) => 444, chr(232) => 444, chr(233) => 444, chr(234) => 444, chr(235) => 444, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 500, chr(241) => 500,
-    chr(242)=> 500, chr(243)=>500, chr(244)=>500, chr(245)=>500, chr(246)=>500, chr(247)=>675, chr(248)=>500, chr(249)=>500, chr(250)=>500, chr(251)=>500, chr(252)=>500, chr(253)=>444, chr(254)=>500, chr(255)=>444, ];
+    chr(242) => 500, chr(243) => 500, chr(244) => 500, chr(245) => 500, chr(246) => 500, chr(247) => 675, chr(248) => 500, chr(249) => 500, chr(250) => 500, chr(251) => 500, chr(252) => 500, chr(253) => 444, chr(254) => 500, chr(255) => 444);
+?>

font/zapfdingbats.php

@@ -4,16 +4,17 @@ $type = 'Core';
 $name = 'ZapfDingbats';
 $up = -100;
 $ut = 50;
-$cw = [
+$cw = array(
-    chr(0)  => 0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0,
+    chr(0) => 0, chr(1) => 0, chr(2) => 0, chr(3) => 0, chr(4) => 0, chr(5) => 0, chr(6) => 0, chr(7) => 0, chr(8) => 0, chr(9) => 0, chr(10) => 0, chr(11) => 0, chr(12) => 0, chr(13) => 0, chr(14) => 0, chr(15) => 0, chr(16) => 0, chr(17) => 0, chr(18) => 0, chr(19) => 0, chr(20) => 0, chr(21) => 0,
-    chr(22) => 0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939,
+    chr(22) => 0, chr(23) => 0, chr(24) => 0, chr(25) => 0, chr(26) => 0, chr(27) => 0, chr(28) => 0, chr(29) => 0, chr(30) => 0, chr(31) => 0, ' ' => 278, '!' => 974, '"' => 961, '#' => 974, '$' => 980, '%' => 719, '&' => 789, '\'' => 790, '(' => 791, ')' => 690, '*' => 960, '+' => 939,
-    ','     => 549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692,
+    ',' => 549, '-' => 855, '.' => 911, '/' => 933, '0' => 911, '1' => 945, '2' => 974, '3' => 755, '4' => 846, '5' => 762, '6' => 761, '7' => 571, '8' => 677, '9' => 763, ':' => 760, ';' => 759, '<' => 754, '=' => 494, '>' => 552, '?' => 537, '@' => 577, 'A' => 692,
-    'B'     => 786, 'C'=>788, 'D'=>788, 'E'=>790, 'F'=>793, 'G'=>794, 'H'=>816, 'I'=>823, 'J'=>789, 'K'=>841, 'L'=>823, 'M'=>833, 'N'=>816, 'O'=>831, 'P'=>923, 'Q'=>744, 'R'=>723, 'S'=>749, 'T'=>790, 'U'=>792, 'V'=>695, 'W'=>776,
+    'B' => 786, 'C' => 788, 'D' => 788, 'E' => 790, 'F' => 793, 'G' => 794, 'H' => 816, 'I' => 823, 'J' => 789, 'K' => 841, 'L' => 823, 'M' => 833, 'N' => 816, 'O' => 831, 'P' => 923, 'Q' => 744, 'R' => 723, 'S' => 749, 'T' => 790, 'U' => 792, 'V' => 695, 'W' => 776,
-    'X'     => 768, 'Y'=>792, 'Z'=>759, '['=>707, '\\'=>708, ']'=>682, '^'=>701, '_'=>826, '`'=>815, 'a'=>789, 'b'=>789, 'c'=>707, 'd'=>687, 'e'=>696, 'f'=>689, 'g'=>786, 'h'=>787, 'i'=>713, 'j'=>791, 'k'=>785, 'l'=>791, 'm'=>873,
+    'X' => 768, 'Y' => 792, 'Z' => 759, '[' => 707, '\\' => 708, ']' => 682, '^' => 701, '_' => 826, '`' => 815, 'a' => 789, 'b' => 789, 'c' => 707, 'd' => 687, 'e' => 696, 'f' => 689, 'g' => 786, 'h' => 787, 'i' => 713, 'j' => 791, 'k' => 785, 'l' => 791, 'm' => 873,
-    'n'     => 761, 'o'=>762, 'p'=>762, 'q'=>759, 'r'=>759, 's'=>892, 't'=>892, 'u'=>788, 'v'=>784, 'w'=>438, 'x'=>138, 'y'=>277, 'z'=>415, '{'=>392, '|'=>392, '}'=>668, '~'=>668, chr(127)=>0, chr(128)=>390, chr(129)=>390, chr(130)=>317, chr(131)=>317,
+    'n' => 761, 'o' => 762, 'p' => 762, 'q' => 759, 'r' => 759, 's' => 892, 't' => 892, 'u' => 788, 'v' => 784, 'w' => 438, 'x' => 138, 'y' => 277, 'z' => 415, '{' => 392, '|' => 392, '}' => 668, '~' => 668, chr(127) => 0, chr(128) => 390, chr(129) => 390, chr(130) => 317, chr(131) => 317,
-    chr(132)=> 276, chr(133)=>276, chr(134)=>509, chr(135)=>509, chr(136)=>410, chr(137)=>410, chr(138)=>234, chr(139)=>234, chr(140)=>334, chr(141)=>334, chr(142)=>0, chr(143)=>0, chr(144)=>0, chr(145)=>0, chr(146)=>0, chr(147)=>0, chr(148)=>0, chr(149)=>0, chr(150)=>0, chr(151)=>0, chr(152)=>0, chr(153)=>0,
+    chr(132) => 276, chr(133) => 276, chr(134) => 509, chr(135) => 509, chr(136) => 410, chr(137) => 410, chr(138) => 234, chr(139) => 234, chr(140) => 334, chr(141) => 334, chr(142) => 0, chr(143) => 0, chr(144) => 0, chr(145) => 0, chr(146) => 0, chr(147) => 0, chr(148) => 0, chr(149) => 0, chr(150) => 0, chr(151) => 0, chr(152) => 0, chr(153) => 0,
-    chr(154)=> 0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>0, chr(161)=>732, chr(162)=>544, chr(163)=>544, chr(164)=>910, chr(165)=>667, chr(166)=>760, chr(167)=>760, chr(168)=>776, chr(169)=>595, chr(170)=>694, chr(171)=>626, chr(172)=>788, chr(173)=>788, chr(174)=>788, chr(175)=>788,
+    chr(154) => 0, chr(155) => 0, chr(156) => 0, chr(157) => 0, chr(158) => 0, chr(159) => 0, chr(160) => 0, chr(161) => 732, chr(162) => 544, chr(163) => 544, chr(164) => 910, chr(165) => 667, chr(166) => 760, chr(167) => 760, chr(168) => 776, chr(169) => 595, chr(170) => 694, chr(171) => 626, chr(172) => 788, chr(173) => 788, chr(174) => 788, chr(175) => 788,
-    chr(176)=> 788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788,
+    chr(176) => 788, chr(177) => 788, chr(178) => 788, chr(179) => 788, chr(180) => 788, chr(181) => 788, chr(182) => 788, chr(183) => 788, chr(184) => 788, chr(185) => 788, chr(186) => 788, chr(187) => 788, chr(188) => 788, chr(189) => 788, chr(190) => 788, chr(191) => 788, chr(192) => 788, chr(193) => 788, chr(194) => 788, chr(195) => 788, chr(196) => 788, chr(197) => 788,
-    chr(198)=> 788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918,
+    chr(198) => 788, chr(199) => 788, chr(200) => 788, chr(201) => 788, chr(202) => 788, chr(203) => 788, chr(204) => 788, chr(205) => 788, chr(206) => 788, chr(207) => 788, chr(208) => 788, chr(209) => 788, chr(210) => 788, chr(211) => 788, chr(212) => 894, chr(213) => 838, chr(214) => 1016, chr(215) => 458, chr(216) => 748, chr(217) => 924, chr(218) => 748, chr(219) => 918,
-    chr(220)=> 927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874,
+    chr(220) => 927, chr(221) => 928, chr(222) => 928, chr(223) => 834, chr(224) => 873, chr(225) => 828, chr(226) => 924, chr(227) => 924, chr(228) => 917, chr(229) => 930, chr(230) => 931, chr(231) => 463, chr(232) => 883, chr(233) => 836, chr(234) => 836, chr(235) => 867, chr(236) => 867, chr(237) => 696, chr(238) => 696, chr(239) => 874, chr(240) => 0, chr(241) => 874,
-    chr(242)=> 760, chr(243)=>946, chr(244)=>771, chr(245)=>865, chr(246)=>771, chr(247)=>888, chr(248)=>967, chr(249)=>888, chr(250)=>831, chr(251)=>873, chr(252)=>927, chr(253)=>970, chr(254)=>918, chr(255)=>0, ];
+    chr(242) => 760, chr(243) => 946, chr(244) => 771, chr(245) => 865, chr(246) => 771, chr(247) => 888, chr(248) => 967, chr(249) => 888, chr(250) => 831, chr(251) => 873, chr(252) => 927, chr(253) => 970, chr(254) => 918, chr(255) => 0);
+?>

img.data/.gitignore

@@ -1,5 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
-

inc/configuracion.inc

@@ -24,7 +24,6 @@
 require_once 'version.inc';
 
 define('SERVIDOR', 'localhost'); //Ubicación del servidor MySQL
-define('PUERTO', '3306'); //Puerto donde se conecta a MySQL
 define('BASEDATOS', 'Inventario2'); //Nombre de la base de datos.
 define('BASEDATOSTEST', 'Inventario_test'); //Base de datos para los tests.
 define('USUARIO', 'test'); //Usuario con permisos de lectura/escritura en la base de datos
@@ -33,13 +32,10 @@ define('PROGRAMA', 'Gestión de Inventario.');
 define('CENTRO', 'I.E.S.O. Pascual Serrano');
 define('NUMFILAS', '17'); // Número de registros a mostrar en las pantallas de consulta iniciales
 define('PAUSA', '2'); //Nº segundos de pausa para mostrar mensaje id insertado
-define('ESTILO', 'bootstrap'); //Estilo de los iconos de edición (bootstrap, bootstrap, bootstrap)
+define('ESTILO', 'personal'); //Estilo de los iconos de edición (personal, personal, personal)
 define('PLANTILLA', 'bootstrap'); //Estilo de la plantilla y recursos a utilizar
-define('COLORLAT', '#a4bdfc'); //Color de la barra de menú lateral
+define('COLORLAT', '#46d6db'); //Color de la barra de menú lateral
-define('COLORFON', '#ffb878'); //Color del fondo de la pantalla
+define('COLORFON', '#a4bdfc'); //Color del fondo de la pantalla
 define('MYSQLDUMP', '/usr/local/bin/mysqldump'); //camino a mysqldump
 define('GZIP', '/usr/bin/gzip'); //Camino a gzip
-define('IMAGEDATA', 'img.data'); //Directorio donde se almacenarán las imágenes
-define('TMP', './tmp'); //Directorio para archivos temporales
-define('INSTALADO', 'sí'); //Indicador que permite ejecutar instalar.php
 ?>

inc/inventario.menu

@@ -6,8 +6,8 @@
 1|Inventario|||
 2|Ubicación|index.php?informeInventario&opc=Ubicacion|_self|Inventario de una ubicación
 2|Artículo|index.php?informeInventario&opc=Articulo|_self|Inventario de un Artículo
-2|Total|index.php?informeInventario&opc=Total|_self|Inventario de todas las ubicaciones
+2|Total|index.php?informeInventario&opc=Total|_blank|Inventario de todas las ubicaciones
-2|Descuadres|index.php?informeInventario&opc=descuadres|_self|Diferencias entre artículos y elementos
+2|Descuadres|index.php?descuadres|_blank|Diferencias entre artículos y elementos
 1|Varios|||
 2|Configuración|index.php?configuracion|_self|Opciones configurables de la aplicación
 2|Importación|index.php?importacion&opc=form|_self|Importa datos de una hoja de cálculo

inc/version.inc

@@ -23,5 +23,5 @@
  */
 
 define('AUTOR', 'Ricardo Montañana Gómez');
-define('VERSION', '1.17');
+define('VERSION', '1.03b');
 ?>

index.php

@@ -1,11 +1,9 @@
 <?php
     /** 
      * Genera una instancia de la aplicación y la ejecuta.
-     *
      * @author Ricardo Montañana <rmontanana@gmail.com>
-     *
      * @version 1.0
-     *
+     * @package Inventario
      * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
      * @license http://www.gnu.org/licenses/gpl-3.0.txt
      * This file is part of Inventario.
@@ -21,15 +19,15 @@
      * 
      * You should have received a copy of the GNU General Public License
      * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+     *  
      */
     //Se incluyen los módulos necesarios
-    function __autoload($class_name)
+    function __autoload($class_name) {
-    {
+        require_once $class_name . '.php';
-        require_once $class_name.'.php';
     }
-    include 'inc/configuracion.inc';
+    include('inc/configuracion.inc');
 
-    $aplicacion = new Inventario();
+    $aplicacion=new Inventario();
-    if ($aplicacion->estado()) {
+    if ($aplicacion->estado())
         $aplicacion->Ejecuta();
-    }
+?>

plant/bootstrap.html

@@ -16,16 +16,12 @@
         <link href="css/bootstrap-datetimepicker.min.css" rel="stylesheet">
         <link rel="stylesheet" href="css/jquery.simplecolorpicker.css">
         <link rel="stylesheet" href="css/jquery.simplecolorpicker-glyphicons.css">
-        <link rel="stylesheet" href="css/jasny-bootstrap.min.css">
-        <link rel="stylesheet" href="css/bootstrap-select/bootstrap-select.min.css">
         <style type="text/css"></style>
 
         <script type="text/javascript" src="./css/jquery.min.js"></script>
-        <script type="text/javascript" src="./css/bootstrap-select/bootstrap-select.min.js"></script>
     </head>
     <body>
-    <!--<body style="background-image:url(img/fondos/old_map.png); background-repeat:repeat">-->
+        <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-        <div class="navbar navbar-inverse navbar-fixed-top" role="navigation" style="background-image: url(img/fondos/bo_play_pattern.png); background-repeat: repeat">
             <div class="container-fluid">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar">
@@ -34,11 +30,10 @@
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="http://rmontanana.gitbooks.io/Inventario2/" target="_blank" title="Ayuda"><span class="glyphicon glyphicon-book"></span></a>
                     <a class="navbar-brand" href="index.php">{aplicacion}</a>
                 </div>
                 <div class="navbar-brand">
-                    <span class="label label-primary col-sm-12 col-sm-offset-2 col-xs-12 col-xs-offset-0">{opcion}</span>
+                    <span class="label label-primary col-sm-14 col-sm-offset-3">{opcion}</span>
                     <!--<label class="warn">{opcion}</label>-->
                 </div>
                 <div class="navbar-collapse collapse">
@@ -51,23 +46,36 @@
                       <input type="text" class="form-control" placeholder="Buscar...">
                     </form>-->
                 </div>
-                <div class="visible-xs">
-                    <ul class="nav navbar-nav navbar-right">
-                        <li>{control}</li>
-                    </ul>
-                </div>
             </div>
         </div>
         <div class="container-fluid">
             <div class="row">
-                <div class="col-sm-2 col-md-1 sidebar" >
+                <div class="col-sm-2 col-md-1 sidebar">
                     <!--<ul class="nav nav-sidebar">-->
                     <ul class="nav nav-sidebar">
                         <!--<li class="active">{menu}</li>-->
                         {menu}
                     </ul>
                 </div>
-                <div class="col-sm-10 col-sm-offset-2 col-md-11 col-md-offset-1 main">
+                <div class="col-sm-10 col-sm-offset-1 col-md-11 col-md-offset-1 main">
+                    <!--<h1 class="page-header">{opcion}</h1>-->
+                    <!--<div id="divBarra" class="progress progress-striped active">
+                        <div class="progress-bar" id="barra" role="progressbar" aria-valuenow="0" aria-valuemin="40" aria-valuemax="100" style="width: 0%">
+                            <span id="barra-valor">0% Completado</span>
+                        </div>
+                    </div>
+                    <script>
+                        function actProgreso(valor) {
+                            $('.progress-bar').width(valor+"%")
+                            $("#barra-valor").text(valor+"% Completado");
+                        }
+                        function visualizaProgreso() {
+                            $('#divBarra').style.visibility = "visible";
+                        }
+                        function escondeProgreso() {
+                            $('#divBara').style.visibility = "hidden";
+                        }
+                    </script>-->
                     {contenido}
                 </div>
             </div>
@@ -81,7 +89,5 @@
         <script type="text/javascript" src="./css/bootstrap-datetimepicker.min.js"></script>
         <script type="text/javascript" src="./css/bootstrap-datetimepicker.es.js"></script>
         <script type="text/javascript" src="./css/jquery.simplecolorpicker.js"></script>        
-        <script type="text/javascript" src="./css/jasny-bootstrap.min.js"></script>
-        <script src="css/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
     </body>
 </html>

plant/normal.html

@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html lang="es">
-<head>
+    <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" >
         <title>Gesti&oacute;n de Inventario</title>
         <link rel="stylesheet" href="css/estilo.css" type="text/css">
         <link rel="shortcut icon" href="img/tux.ico">
-</head>
+    </head>
 
 
-<body>
+    <body>
 
 
-<div class="zonaCabecera">
+        <div class="zonaCabecera">
-<table class="tablaCabecera">
+            <table class="tablaCabecera">
 
                 <tbody>
 
@@ -35,19 +35,19 @@
                     </tr>
 
                 </tbody>
-</table>
+            </table>
 
-</div>
+        </div>
 
-<div class="zonaMenu">{menu}<br>
+        <div class="zonaMenu">{menu}<br>
 
-</div>
+        </div>
 
-<div class="zonaPrincipal">
+        <div class="zonaPrincipal">
 
-{contenido}<br>
+            {contenido}<br>
 
-</div>
+        </div>
 
-</body>
+    </body>
 </html>

sql/inv-iso.sql

@@ -15,6 +15,23 @@
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
+--
+-- Table structure for table `Articulos`
+--
+
+DROP TABLE IF EXISTS `Articulos`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `Articulos` (
+  `id` smallint(6) NOT NULL auto_increment,
+  `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,link/Articulo',
+  `marca` varchar(20) default NULL COMMENT 'ordenable',
+  `modelo` varchar(20) default NULL COMMENT 'ordenable',
+  `cantidad` int(11) default NULL COMMENT 'ordenable',
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=785 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Dumping data for table `Articulos`
 --
@@ -25,6 +42,29 @@ INSERT INTO `Articulos` VALUES (589,'Armario con puertas y cajones','M. E. C.','
 /*!40000 ALTER TABLE `Articulos` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `Elementos`
+--
+
+DROP TABLE IF EXISTS `Elementos`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `Elementos` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
+  `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
+  `numserie` varchar(30) default NULL COMMENT 'ordenable',
+  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable',
+  `fechaCompra` date NOT NULL COMMENT 'ordenable',
+  PRIMARY KEY  (`id`),
+  KEY `id` (`id`),
+  KEY `id_Articulo` (`id_Articulo`),
+  KEY `id_Ubicacion` (`id_Ubicacion`),
+  CONSTRAINT `Elementos_ibfk_1` FOREIGN KEY (`id_Articulo`) REFERENCES `Articulos` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `Elementos_ibfk_2` FOREIGN KEY (`id_Ubicacion`) REFERENCES `Ubicaciones` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1884 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Dumping data for table `Elementos`
 --
@@ -35,6 +75,20 @@ INSERT INTO `Elementos` VALUES (1414,589,140,'',1,'2004-12-07 00:00:00'),(1415,5
 /*!40000 ALTER TABLE `Elementos` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `Ubicaciones`
+--
+
+DROP TABLE IF EXISTS `Ubicaciones`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `Ubicaciones` (
+  `id` smallint(5) unsigned NOT NULL auto_increment,
+  `Descripcion` varchar(50) NOT NULL COMMENT 'ordenable,link/Ubicacion',
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Dumping data for table `Ubicaciones`
 --
@@ -45,6 +99,30 @@ INSERT INTO `Ubicaciones` VALUES (140,'Secretario'),(141,'Aula Althia'),(142,'Al
 /*!40000 ALTER TABLE `Ubicaciones` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `Usuarios`
+--
+
+DROP TABLE IF EXISTS `Usuarios`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `Usuarios` (
+  `id` int(10) unsigned NOT NULL auto_increment,
+  `nombre` varchar(16) NOT NULL default '',
+  `clave` varchar(32) NOT NULL default '',
+  `idSesion` varchar(20) NOT NULL default '',
+  `alta` tinyint(1) NOT NULL default '0',
+  `modificacion` tinyint(1) NOT NULL default '0',
+  `borrado` tinyint(1) NOT NULL default '0',
+  `consulta` tinyint(1) NOT NULL default '1',
+  `informe` tinyint(1) NOT NULL default '1',
+  `usuarios` tinyint(1) NOT NULL default '0',
+  `config` tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `nombre` (`nombre`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
 --
 -- Dumping data for table `Usuarios`
 --
@@ -55,7 +133,28 @@ INSERT INTO `Usuarios` VALUES (2,'admin','galeote','s3LUSqxg{s',1,1,1,1,1,1,1),(
 /*!40000 ALTER TABLE `Usuarios` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `test`
+--
 
+DROP TABLE IF EXISTS `test`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `test` (
+  `id` smallint(6) NOT NULL auto_increment,
+  `Descripcion` varchar(30) NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `test`
+--
+
+LOCK TABLES `test` WRITE;
+/*!40000 ALTER TABLE `test` DISABLE KEYS */;
+/*!40000 ALTER TABLE `test` ENABLE KEYS */;
+UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

sql/setup.sql

@@ -22,12 +22,11 @@ DROP TABLE IF EXISTS `Articulos`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `Articulos` (
-  `id` smallint(6) NOT NULL auto_increment COMMENT 'ordenable,link/Articulo',
+  `id` smallint(6) NOT NULL auto_increment,
-  `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,ajax/text',
+  `descripcion` varchar(60) NOT NULL COMMENT 'ordenable,link/Articulo',
-  `marca` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
+  `marca` varchar(20) default NULL COMMENT 'ordenable',
-  `modelo` varchar(20) default NULL COMMENT 'ordenable,ajax/text',
+  `modelo` varchar(20) default NULL COMMENT 'ordenable',
-  `cantidad` int(11) default NULL COMMENT 'ordenable,ajax/number',
+  `cantidad` int(11) default NULL COMMENT 'ordenable',
-  `imagen` varchar(45) default NULL COMMENT 'imagen',
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=785 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
@@ -41,13 +40,12 @@ DROP TABLE IF EXISTS `Elementos`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `Elementos` (
-  `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
+  `id` int(10) unsigned NOT NULL auto_increment,
   `id_Articulo` smallint(6) NOT NULL COMMENT 'foreign(Articulos;id),ordenable',
   `id_Ubicacion` smallint(5) unsigned NOT NULL COMMENT 'foreign(Ubicaciones;id),ordenable',
-  `numserie` varchar(30) default NULL COMMENT 'ordenable,ajax/text',
+  `numserie` varchar(30) default NULL COMMENT 'ordenable',
-  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable,ajax/number',
+  `cantidad` int(10) unsigned default NULL COMMENT 'ordenable',
-  `fechaCompra` date NOT NULL COMMENT 'ordenable,ajax/combodate',
+  `fechaCompra` date NOT NULL COMMENT 'ordenable',
-  `imagen` varchar(45) default NULL COMMENT 'imagen',
   PRIMARY KEY  (`id`),
   KEY `id` (`id`),
   KEY `id_Articulo` (`id_Articulo`),
@@ -66,9 +64,8 @@ DROP TABLE IF EXISTS `Ubicaciones`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `Ubicaciones` (
-  `id` smallint(5) unsigned NOT NULL auto_increment COMMENT 'ordenable,link/Ubicacion',
+  `id` smallint(5) unsigned NOT NULL auto_increment,
-  `Descripcion` varchar(50) NOT NULL COMMENT 'ordenable,ajax/text',
+  `Descripcion` varchar(50) NOT NULL COMMENT 'ordenable,link/Ubicacion',
-  `imagen` varchar(45) DEFAULT NULL COMMENT 'imagen',
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=184 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
@@ -82,10 +79,10 @@ DROP TABLE IF EXISTS `Usuarios`;
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
 CREATE TABLE `Usuarios` (
-  `id` int(10) unsigned NOT NULL auto_increment COMMENT 'ordenable',
+  `id` int(10) unsigned NOT NULL auto_increment,
-  `nombre` varchar(16) NOT NULL default '' COMMENT 'ajax/text',
+  `nombre` varchar(16) NOT NULL default '',
-  `clave` varchar(32) NOT NULL default '' COMMENT 'ajax/text',
+  `clave` varchar(32) NOT NULL default '',
-  `idSesion` varchar(20) NOT NULL default '' COMMENT 'ajax/text',
+  `idSesion` varchar(20) NOT NULL default '',
   `alta` tinyint(1) NOT NULL default '0',
   `modificacion` tinyint(1) NOT NULL default '0',
   `borrado` tinyint(1) NOT NULL default '0',
@@ -98,7 +95,15 @@ CREATE TABLE `Usuarios` (
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 
+--
+-- Usuarios iniciales
+--
 
+LOCK TABLES `Usuarios` WRITE;
+/*!40000 ALTER TABLE `Usuarios` DISABLE KEYS */;
+INSERT INTO `Usuarios` VALUES (1,'admin','pruebas','s3LUSqxg{s',1,1,1,1,1,1,1),(2,'demo','pruebas','NogP_U0Byi',0,0,0,1,1,0,0);
+/*!40000 ALTER TABLE `Usuarios` ENABLE KEYS */;
+UNLOCK TABLES;
 
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 

sql/upgrade.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Migra los datos de la versión anterior de Inventario a la actual.
- *
+ * @package Inventario
  * @copyright Copyright (c) 2008, Ricardo Montañana Gómez
  * @license http://www.gnu.org/licenses/gpl-3.0.txt
  * This file is part of Inventario.
@@ -17,76 +17,73 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with Inventario.  If not, see <http://www.gnu.org/licenses/>.
+ *  
  */
-$host = 'localhost';
+$host="localhost";
-$baseAnt = 'Inventario';
+$baseAnt="Inventario";
-$baseNueva = 'Inventario2';
+$baseNueva="Inventario2";
-$usuario = 'test';
+$usuario="root";
-$claveUsuario = 'tset';
+$claveUsuario="galeote";
-$probar = false;
+$probar=false;
+
 
 // No se debería modificar nada después de este comentario
-function creaUbicacion($bd1, $bd2, $clave)
+function creaUbicacion($bd1,$bd2,$clave)
 {
     global $probar;
-    $comando = 'select nombre from Ubicaciones where codigo='.$clave.';';
+    $comando="select nombre from Ubicaciones where codigo=".$clave.";";
-    $resultado = $bd1->query($comando);
+    $resultado=$bd1->query($comando);
-    if ($bd1->affected_rows == 0) {
+    if ($bd1->affected_rows==0) {
         echo $comando;
-        die('No encontró la ubicación '.$clave);
+        die("No encontró la ubicación ".$clave);
     }
-    $dato = $resultado->fetch_assoc();
+    $dato=$resultado->fetch_assoc();
-    $valor = $dato['nombre'];
+    $valor=$dato['nombre'];
-    $comando = "insert into Ubicaciones values (NULL,'".$valor."');";
+    $comando="insert into Ubicaciones values (NULL,'".$valor."');";
     if ($probar) {
         echo $comando;
-
         return 1;
     } else {
-        $test = $bd2->query($comando);
+        $test=$bd2->query($comando);
         if (!$test) {
-            die('**No pudo insertar ubicacion.'.$comando);
+            die("**No pudo insertar ubicacion.".$comando);
         }
-
         return $bd2->insert_id;
     } 
 }
-function creaArticulo($bd1, $bd2, $clave)
+function creaArticulo($bd1,$bd2,$clave)
 {
     global $probar;
-    $comando = "select * from Articulos where codigo='".$clave."';";
+    $comando="select * from Articulos where codigo='".$clave."';";
-    $resultado = $bd1->query($comando);
+    $resultado=$bd1->query($comando);
-    if ($bd1->affected_rows == 0) {
+    if ($bd1->affected_rows==0) {
         echo $comando;
-        die('No encontró el artículo '.$clave);
+        die("No encontró el artículo ".$clave);
     }
-    $dato = $resultado->fetch_assoc();
+    $dato=$resultado->fetch_assoc();
-    $valor1 = $dato['descripcion'];
+    $valor1=$dato['descripcion'];
-    $valor2 = $dato['marca'];
+    $valor2=$dato['marca'];
-    $valor3 = $dato['modelo'];
+    $valor3=$dato['modelo'];
-    $valor4 = $dato['cantidad'];
+    $valor4=$dato['cantidad'];
-    $comando = "insert into Articulos values (NULL,'".$valor1."','".$valor2."','".$valor3."',".$valor4.');';
+    $comando="insert into Articulos values (NULL,'".$valor1."','".$valor2."','".$valor3."',".$valor4.");";
     if ($probar) {
         echo $comando;
-
         return 1;
     } else {
-        $test = $bd2->query($comando);
+        $test=$bd2->query($comando);
         if (!$test) {
-            die('**No pudo insertar artículo.'.$comando);
+            die("**No pudo insertar artículo.".$comando);
         }
-
         return $bd2->insert_id;
     }
 }
 function generaSesion()
 {
-    $long = 10;
+    $long=10;
-    $cadena = '';
+    $cadena="";
-    for ($i = 0; $i < $long; $i++) {
+    for ($i=0;$i<$long;$i++) {
-        $cadena .= chr(rand(40, 126));
+        $cadena.=chr(rand(40,126));
     }
-
     return $cadena;
 }
 /*
@@ -94,64 +91,64 @@ function generaSesion()
  * Comienzo del programa principal.
  *
  */
-$bd1 = new mysqli($host, $usuario, $claveUsuario, $baseAnt);
+$bd1=new mysqli($host,$usuario,$claveUsuario,$baseAnt);
-if (mysqli_connect_errno()) {
+if(mysqli_connect_errno()) {
-    die('**Error conectando a la base de datos antigua.'.$bd1->error);
+  die("**Error conectando a la base de datos antigua.".$bd1->error);
 }
-$bd2 = new mysqli($host, $usuario, $claveUsuario, $baseNueva);
+$bd2=new mysqli($host,$usuario,$claveUsuario,$baseNueva);
-if (mysqli_connect_errno()) {
+if(mysqli_connect_errno()) {
-    die('**Error conectando a la base de datos nueva.'.$bd2->error);
+  die("**Error conectando a la base de datos nueva.".$bd2->error);
 }
 $bd2->autocommit(false);
-$datos = $bd1->query('select * from Elementos;');
+$datos=$bd1->query("select * from Elementos;");
 if (!$datos) {
-    die('**No encontró datos en la tabla de elementos.');
+    die("**No encontró datos en la tabla de elementos.");
 }
-$numRegistros = $bd1->affected_rows;
+$numRegistros=$bd1->affected_rows;
-$contador = 0;
+$contador=0;
-$ubicaciones = [];
+$ubicaciones=array();
-$articulos = [];
+$articulos=array();
-echo '++Comenzando proceso de actualización de Elementos con '.$numRegistros." registros por procesar.<br>\n";
+echo "++Comenzando proceso de actualización de Elementos con ".$numRegistros." registros por procesar.<br>\n";
-while ($fila = $datos->fetch_assoc()) {
+while($fila=$datos->fetch_assoc()) {
     $contador++;
-    echo 'Procesando registro '.$contador.' de '.$numRegistros."<br>\n";
+    echo "Procesando registro ".$contador." de ".$numRegistros."<br>\n";
     if (!isset($ubicaciones[$fila['codUbicacion']])) {        
-        $ubicaciones[$fila['codUbicacion']] = creaUbicacion($bd1, $bd2, $fila['codUbicacion']);
+        $ubicaciones[$fila['codUbicacion']]=creaUbicacion($bd1,$bd2,$fila['codUbicacion']);
     }
     if (!isset($articulos[$fila['codArticulo']])) {
-        $articulos[$fila['codArticulo']] = creaArticulo($bd1, $bd2, $fila['codArticulo']);
+        $articulos[$fila['codArticulo']]=creaArticulo($bd1,$bd2,$fila['codArticulo']);
     }
-    $comando = 'insert into Elementos values (NULL,'.$articulos[$fila['codArticulo']].','.$ubicaciones[$fila['codUbicacion']];
+    $comando="insert into Elementos values (NULL,".$articulos[$fila['codArticulo']].",".$ubicaciones[$fila['codUbicacion']];
-    $comando .= ",'".$fila['numserie']."',".$fila['cantidad'].",'".$fila['fechaCompra']."');";
+    $comando.=",'".$fila['numserie']."',".$fila['cantidad'].",'".$fila['fechaCompra']."');";
     if ($probar) {
-        echo $comando.'<br>';
+        echo $comando."<br>";
     } else {
-        $res = $bd2->query($comando);
+        $res=$bd2->query($comando);
         if (!$res) {
-            die('**Error ejecutando el comando de actualización. '.$comando.' '.$bd2->error);
+            die("**Error ejecutando el comando de actualización. ".$comando." ".$bd2->error);
         }
     }
 }
 //Traspasa los usuarios
-$datos = $bd1->query('select * from Usuarios;');
+$datos=$bd1->query("select * from Usuarios;");
 if (!$datos) {
-    die('**No encontró datos en la tabla de Usuarios.');
+    die("**No encontró datos en la tabla de Usuarios.");
 }
-$numRegistros = $bd1->affected_rows;
+$numRegistros=$bd1->affected_rows;
-$contador = 0;
+$contador=0;
-while ($fila = $datos->fetch_assoc()) {
+while ($fila=$datos->fetch_assoc()) {
     $contador++;
-    echo 'Procesando registro '.$contador.' de '.$numRegistros."<br>\n";
+    echo "Procesando registro ".$contador." de ".$numRegistros."<br>\n";
-    $sesion = generaSesion();
+    $sesion=generaSesion();
-    $comando = "insert into Usuarios values (NULL,'".$fila['usuario']."','".$fila['usuario']."','".$sesion;
+    $comando="insert into Usuarios values (NULL,'".$fila['usuario']."','".$fila['usuario']."','".$sesion;
-    $comando .= "',".$fila['altas'].','.$fila['modificaciones'].','.$fila['bajas'].','.$fila['consultas'].',';
+    $comando.="',".$fila['altas'].",".$fila['modificaciones'].",".$fila['bajas'].",".$fila['consultas'].",";
-    $comando .= $fila['informes'].','.$fila['usuarios'].',1);';
+    $comando.=$fila['informes'].",".$fila['usuarios'].",1);";
     if ($probar) {
-        echo $comando.'<br>';
+        echo $comando."<br>";
     } else {
-        $res = $bd2->query($comando);
+        $res=$bd2->query($comando);
         if (!$res) {
-            die('**Error ejecutando el comando de actualización. '.$comando.' '.$bd2->error);
+            die("**Error ejecutando el comando de actualización. ".$comando." ".$bd2->error);
         }
     }
 }
@@ -159,3 +156,4 @@ echo "++Fin del proceso.<br>\n";
 $bd2->commit();
 $bd1->close();
 $bd2->close();
+?>