Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2024-06-22 16:17:10 +02:00
commit b89940de75
61 changed files with 8265 additions and 4202 deletions

View file

@ -113,24 +113,9 @@ PHP TCPDF:
to
* @public
* Replace in tcpdf.php:
if (isset($this->imagekeys)) {
foreach($this->imagekeys as $file) {
unlink($file);
}
}
with
if (isset($this->imagekeys)) {
foreach($this->imagekeys as $file) {
// DOL CHANGE If we keep this, source image files are physically destroyed
// unlink($file);
}
}
* Replace in tcpdf.php:
$preserve = array(
'file_id',
'internal_encoding',
'state',
'bufferlen',
'buffer',
@ -138,7 +123,6 @@ with
with
$preserve = array(
'file_id',
'internal_encoding',
'state',
'bufferlen',
'buffer',
@ -147,16 +131,16 @@ with
'imagekeys',
* Replace in tcpdf.php:
if (!@TCPDF_STATIC::file_exists($file)) {
if (!@this->fileExists($file)) {
return false;
}
with
if (!@TCPDF_STATIC::file_exists($file)) {
if (!@this->fileExists($file)) {
// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
//var_dump($file.' '.(!@this->fileExists($file)));
//return false;
$tfile = str_replace(' ', '%20', $file);
if (@TCPDF_STATIC::file_exists($tfile)) {
if (@this->fileExists($tfile)) {
$file = $tfile;
}
}
@ -191,7 +175,7 @@ with
}
elseif (strpos($filename, '://') === false)
* To avoid to have QRcode changed because generated with a random mask, replace:
* In tecnickcom/tcpdf/include/barcodes/qrcode.php To avoid to have QRcode changed because generated with a random mask, replace:
define('QR_FIND_FROM_RANDOM', 2);
with
define('QR_FIND_FROM_RANDOM', false);
@ -215,19 +199,6 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
- protected $default_monospaced_font = 'courier';
+ protected $default_monospaced_font = 'freemono';
* In tecnickcom/tcpdf/include/tcpdf_static, in function intToRoman, right at the beginning
of the function, replace:
$roman = '';
with:
$roman = '';
if ($number >= 4000) {
// do not represent numbers above 4000 in Roman numerals
return strval($number);
}
* Add this at begin of tcpdf_autoconfig.php
// @CHANGE LDR DOCUMENT_ROOT fix for IIS Webserver

View file

@ -1203,7 +1203,7 @@ return [
'htdocs/projet/card.php' => ['PhanEmptyFQSENInClasslike', 'PhanPossiblyUndeclaredGlobalVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeObjectUnsetDeclaredProperty', 'PhanUndeclaredGlobalVariable'],
'htdocs/projet/class/api_projects.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanTypeMismatchArgumentProbablyReal'],
'htdocs/projet/class/api_tasks.class.php' => ['PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType'],
'htdocs/projet/class/project.class.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginEmptyStatementIf', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownArrayPropertyType', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypePossiblyInvalidDimOffset'],
'htdocs/projet/class/project.class.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanPluginEmptyStatementIf', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownArrayPropertyType', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypePossiblyInvalidDimOffset', 'PhanPluginSuspiciousParamPosition'],
'htdocs/projet/class/projectstats.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownPropertyType', 'PhanPossiblyUndeclaredVariable'],
'htdocs/projet/class/task.class.php' => ['PhanPluginEmptyStatementIf', 'PhanPluginUnknownArrayMethodParamType', 'PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownArrayPropertyType', 'PhanPluginUnknownPropertyType', 'PhanTypeMismatchArgumentProbablyReal'],
'htdocs/projet/class/taskstats.class.php' => ['PhanPluginUnknownArrayMethodReturnType', 'PhanPluginUnknownPropertyType'],

View file

@ -4330,7 +4330,7 @@ class PropaleLigne extends CommonObjectLine
$sql .= " '".$this->db->escape($this->localtax1_type)."',";
$sql .= " '".$this->db->escape($this->localtax2_type)."',";
$sql .= " ".(price2num($this->subprice) !== '' ? price2num($this->subprice, 'MU') : "null").",";
$sql .= " ".price2num($this->remise_percent, 3).",";
$sql .= " ".price2num($this->remise_percent).",";
$sql .= " ".(isset($this->info_bits) ? ((int) $this->info_bits) : "null").",";
$sql .= " ".price2num($this->total_ht, 'MT').",";
$sql .= " ".price2num($this->total_tva, 'MT').",";

View file

@ -1041,7 +1041,7 @@ if (empty($reshook)) {
$db->begin();
$error = 0;
$originentity = GETPOST('originentity');
$originentity = GETPOSTINT('originentity');
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) {
@ -1965,7 +1965,7 @@ if (empty($reshook)) {
if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
$retained_warranty = GETPOSTINT('retained_warranty');
if (price2num($retained_warranty) > 0) {
$object->retained_warranty = price2num($retained_warranty);
$object->retained_warranty = (float) price2num($retained_warranty);
}
if (GETPOSTINT('retained_warranty_fk_cond_reglement') > 0) {
@ -3367,7 +3367,7 @@ if ($action == 'create') {
print '<input name="force_fk_account" type="hidden" value="0">';
print '<input type="hidden" name="origin" value="'.$origin.'">';
print '<input type="hidden" name="originid" value="'.$originid.'">';
print '<input type="hidden" name="originentity" value="'.GETPOST('originentity').'">';
print '<input type="hidden" name="originentity" value="'.GETPOSTINT('originentity').'">';
if (!empty($currency_tx)) {
print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
}

View file

@ -1,6 +1,4 @@
<?php
use RectorPrefix202310\Nette\Utils\Image;
/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2007 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>

View file

@ -2,6 +2,7 @@
/* Copyright (C) 2022 Jeritiana Ravelojaona <jeritiana.rav@smartone.ai>
* Copyright (C) 2023-2024 Solution Libre SAS <contact@solution-libre.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Maximilien Rozniecki <mrozniecki@easya.solutions>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -19,7 +20,7 @@
/**
* \file htdocs/core/login/functions_openid_connect.php
* \ingroup core
* \ingroup openid_connect
* \brief OpenID Connect: Authorization Code flow authentication
*
* See https://github.com/Dolibarr/dolibarr/issues/22740 for more information about setup openid_connect
@ -38,7 +39,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
*/
function check_user_password_openid_connect($usertotest, $passwordtotest, $entitytotest)
{
global $db, $conf, $langs;
global $db;
// Force master entity in transversal mode
$entity = $entitytotest;
@ -46,8 +47,6 @@ function check_user_password_openid_connect($usertotest, $passwordtotest, $entit
$entity = 1;
}
$login = '';
dol_syslog("functions_openid_connect::check_user_password_openid_connect usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
// Step 1 is done by user: request an authorization code
@ -55,93 +54,123 @@ function check_user_password_openid_connect($usertotest, $passwordtotest, $entit
if (GETPOSTISSET('username')) {
// OIDC does not require credentials here: pass on to next auth handler
$_SESSION["dol_loginmesg"] = "Not an OpenID Connect flow";
dol_syslog("functions_openid_connect::check_user_password_openid_connect not an OIDC flow");
dol_syslog("functions_openid_connect::check_user_password_openid_connect::not an OIDC flow");
return false;
} elseif (!GETPOSTISSET('state')) {
// No state received
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (no state received)";
} elseif (GETPOSTISSET('code')) {
$auth_code = GETPOST('code', 'aZ09');
$state = GETPOST('state', 'aZ09');
dol_syslog('functions_openid_connect::check_user_password_openid_connect code='.$auth_code.' state='.$state);
if ($state === hash('sha256', session_id())) {
// Step 2: turn the authorization code into an access token, using client_secret
$auth_param = [
'grant_type' => 'authorization_code',
'client_id' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_ID'),
'client_secret' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET'),
'code' => $auth_code,
'redirect_uri' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_REDIRECT_URL')
];
$token_response = getURLContent($conf->global->MAIN_AUTHENTICATION_OIDC_TOKEN_URL, 'POST', http_build_query($auth_param));
$token_content = json_decode($token_response['content']);
dol_syslog("functions_openid_connect::check_user_password_openid_connect /token=".print_r($token_response, true), LOG_DEBUG);
if (property_exists($token_content, 'access_token')) {
// Step 3: retrieve user info using token
$userinfo_headers = array('Authorization: Bearer '.$token_content->access_token);
$userinfo_response = getURLContent($conf->global->MAIN_AUTHENTICATION_OIDC_USERINFO_URL, 'GET', '', 1, $userinfo_headers);
$userinfo_content = json_decode($userinfo_response['content']);
dol_syslog("functions_openid_connect::check_user_password_openid_connect /userinfo=".print_r($userinfo_response, true), LOG_DEBUG);
// Get the user attribute (claim) matching the Dolibarr login
$login_claim = 'email'; // default
if (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM')) {
$login_claim = getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM');
}
if (property_exists($userinfo_content, $login_claim)) {
// Success: retrieve claim to return to Dolibarr as login
$sql = 'SELECT login, entity, datestartvalidity, dateendvalidity';
$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
$sql .= " WHERE login = '".$db->escape($userinfo_content->$login_claim)."'";
$sql .= ' AND entity IN (0,'.(array_key_exists('dol_entity', $_SESSION) ? ((int) $_SESSION["dol_entity"]) : 1).')';
dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
$resql = $db->query($sql);
if ($resql) {
$obj = $db->fetch_object($resql);
if ($obj) {
// Note: Test on date validity is done later natively with isNotIntoValidityDateRange() by core after calling checkLoginPassEntity() that call this method
$login = $obj->login;
}
}
} elseif ($userinfo_content->error) {
// Got user info response but content is an error
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (".$userinfo_content->error_description.")";
} elseif ($userinfo_response['http_code'] == 200) {
// Claim does not exist
$_SESSION["dol_loginmesg"] = "OpenID Connect claim not found: ".$login_claim;
} elseif ($userinfo_response['curl_error_no']) {
// User info request error
$_SESSION["dol_loginmesg"] = "Network error: ".$userinfo_response['curl_error_msg']." (".$userinfo_response['curl_error_no'].")";
} else {
// Other user info request error
$_SESSION["dol_loginmesg"] = "Userinfo request error (".$userinfo_response['http_code'].")";
}
} elseif ($token_content->error) {
// Got token response but content is an error
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (".$token_content->error_description.")";
} elseif ($token_response['curl_error_no']) {
// Token request error
$_SESSION["dol_loginmesg"] = "Network error: ".$token_response['curl_error_msg']." (".$token_response['curl_error_no'].")";
} else {
// Other token request error
$_SESSION["dol_loginmesg"] = "Token request error (".$token_response['http_code'].")";
}
} else {
// No code received
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (state does not match)";
}
} else {
dol_syslog("functions_openid_connect::check_user_password_openid_connect::no state received", LOG_ERR);
return false;
} elseif (!GETPOSTISSET('code')) {
// No code received
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (no code received)";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::no code received", LOG_ERR);
return false;
}
dol_syslog("functions_openid_connect::check_user_password_openid_connect END");
$auth_code = GETPOST('code', 'aZ09');
$state = GETPOST('state', 'aZ09');
dol_syslog('functions_openid_connect::check_user_password_openid_connect code='.$auth_code.' state='.$state);
return !empty($login) ? $login : false;
if ($state !== hash('sha256', session_id())) {
// State does not match
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (state does not match)";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::state does not match", LOG_ERR);
return false;
}
// Step 2: turn the authorization code into an access token, using client_secret
$auth_param = [
'grant_type' => 'authorization_code',
'client_id' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_ID'),
'client_secret' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET'),
'code' => $auth_code,
'redirect_uri' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_REDIRECT_URL')
];
$token_response = getURLContent(getDolGlobalString('MAIN_AUTHENTICATION_OIDC_TOKEN_URL'), 'POST', http_build_query($auth_param), 1, array(), array('https'), 2);
$token_content = json_decode($token_response['content']);
dol_syslog("functions_openid_connect::check_user_password_openid_connect /token=".print_r($token_response, true), LOG_DEBUG);
if ($token_response['curl_error_no']) {
// Token request error
$_SESSION["dol_loginmesg"] = "Network error: ".$token_response['curl_error_msg']." (".$token_response['curl_error_no'].")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$_SESSION["dol_loginmesg"], LOG_ERR);
return false;
} elseif ($token_response['http_code'] >= 400 && $token_response['http_code'] < 500) {
// HTTP Error
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (".$token_response['content'].")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$token_response['content'], LOG_ERR);
return false;
} elseif ($token_content->error) {
// Got token response but content is an error
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (".$token_content->error_description.")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$token_content->error_description, LOG_ERR);
return false;
} elseif (!property_exists($token_content, 'access_token')) {
// Other token request error
$_SESSION["dol_loginmesg"] = "Token request error (".$token_response['http_code'].")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$_SESSION["dol_loginmesg"], LOG_ERR);
return false;
}
// Step 3: retrieve user info using token
$userinfo_headers = array('Authorization: Bearer '.$token_content->access_token);
$userinfo_response = getURLContent(getDolGlobalString('MAIN_AUTHENTICATION_OIDC_USERINFO_URL'), 'GET', '', 1, $userinfo_headers, array('https'), 2);
$userinfo_content = json_decode($userinfo_response['content']);
dol_syslog("functions_openid_connect::check_user_password_openid_connect /userinfo=".print_r($userinfo_response, true), LOG_DEBUG);
// Get the user attribute (claim) matching the Dolibarr login
$login_claim = 'email'; // default
if (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM')) {
$login_claim = getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM');
}
if ($userinfo_response['curl_error_no']) {
// User info request error
$_SESSION["dol_loginmesg"] = "Network error: ".$userinfo_response['curl_error_msg']." (".$userinfo_response['curl_error_no'].")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$_SESSION["dol_loginmesg"], LOG_ERR);
return false;
} elseif ($userinfo_response['http_code'] >= 400 && $userinfo_response['http_code'] < 500) {
// HTTP Error
$_SESSION["dol_loginmesg"] = "OpenID Connect user info error: " . $userinfo_response['content'];
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$userinfo_response['content'], LOG_ERR);
return false;
} elseif ($userinfo_content->error) {
// Got user info response but content is an error
$_SESSION["dol_loginmesg"] = "Error in OAuth 2.0 flow (".$userinfo_content->error_description.")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$userinfo_content->error_description, LOG_ERR);
return false;
} elseif (!property_exists($userinfo_content, $login_claim)) {
// Other user info request error
$_SESSION["dol_loginmesg"] = "Userinfo request error (".$userinfo_response['http_code'].")";
dol_syslog("functions_openid_connect::check_user_password_openid_connect::".$_SESSION["dol_loginmesg"], LOG_ERR);
return false;
}
// Success: retrieve claim to return to Dolibarr as login
$sql = 'SELECT login, entity, datestartvalidity, dateendvalidity';
$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
$sql .= " WHERE login = '".$db->escape($userinfo_content->$login_claim)."'";
$sql .= ' AND entity IN (0,'.(array_key_exists('dol_entity', $_SESSION) ? ((int) $_SESSION["dol_entity"]) : 1).')';
dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
$resql = $db->query($sql);
if (!$resql) {
dol_syslog("functions_openid_connect::check_user_password_openid_connect::Error with sql query (".$db->error().")");
return false;
}
$obj = $db->fetch_object($resql);
if (!$obj) {
dol_syslog("functions_openid_connect::check_user_password_openid_connect::Error no result from the query");
return false;
}
$_SESSION['OPENID_CONNECT'] = true;
// Note: Test on date validity is done later natively with isNotIntoValidityDateRange() by core after calling checkLoginPassEntity() that call this method
dol_syslog("functions_openid_connect::check_user_password_openid_connect END");
return $obj->login;
}

View file

@ -943,7 +943,7 @@ class pdf_espadon extends ModelePdfExpedition
if (empty($hidetop)) {
if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
}
}

View file

@ -252,7 +252,7 @@ class pdf_standard extends ModelePDFEvaluation
$tab_top = 65;
$pdf->SetFont('', 'B', $default_font_size);
$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, '', 12, $tab_top);
$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, 0, 12, $tab_top);
$tab_top += 4;
$pdf->SetFont('', '', $default_font_size - 1);
$pdf->writeHTMLCell(190, 3, $this->posxnotes + 1, $tab_top + 1, dol_htmlentitiesbr($object->note_public), 0, 1);

View file

@ -813,7 +813,7 @@ class pdf_standard extends ModelePDFMovement
//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
}
}

View file

@ -635,7 +635,7 @@ class pdf_standard extends ModelePDFProduct
//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
}
}

View file

@ -610,7 +610,7 @@ class pdf_standard extends ModelePDFStock
//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
if (getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')) {
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', array(), explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
}
}

View file

@ -517,8 +517,8 @@ if (empty($reshook)) {
if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode(strval($limit));
}
if ($sall) {
$param .= "&sall=".urlencode($sall);
if ($search_all) {
$param .= "&search_all=".urlencode($search_all);
}
if ($search_ref_exp) {
$param .= "&search_ref_exp=".urlencode($search_ref_exp);
@ -642,7 +642,6 @@ $formcompany = new FormCompany($db);
$shipment = new Expedition($db);
$helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Expediciones';
llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
$sql = 'SELECT';
if ($search_all || $search_user > 0) {
@ -887,6 +886,16 @@ $num = $db->num_rows($resql);
$arrayofselected = is_array($toselect) ? $toselect : array();
// Redirect to expedition card if there is only one result for global search
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
header("Location: ".DOL_URL_ROOT.'/expedition/card.php?id='.$id);
exit;
}
llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
$expedition = new Expedition($db);
if ($socid > 0) {

View file

@ -1,16 +1,189 @@
6.2.25
6.7.5 (2024-04-20)
- Update GitHub actions
- fix: CSV-2024-22640 (#712)
6.7.4 (2024-03-24)
- Upgrade tcpdf tag encryption algorithm.
- Fix regression issue #699.
- Fix security issue.
- [BREAKING CHANGE] The tcpdf HTML tag syntax has changed, see example_049.php.
- New K_ALLOWED_TCPDF_TAGS configuration constant to set the allowed methods for the tcdpf HTML tag.
- Raised minimum PHP version to PHP 5.5.0.
6.6.5 (2023-09-02)
- Fix corrupted file.
- Fix GitHub automation tests.
- Fix SPDX license ID (#591)
- Fix warning "array offset on value of type null" (#620)
- Improve the README about the status of this library (#589)
- Fix deprecation warning with PHP 8.1 (#614)
- Fixes for PHP 8.2 in tcpdf_fonts.php (#632)
- Fix some php 8+ edge cases (#630)
- Fix composite glyph output (#581)
- Fix "access array offset on value of type bool" with PDF/A (#583)
- Fix non-numeric value warning (#627)
- Fix issues with S25 barcode (#611)
- Fix return type annotations (#613)
- Fix some inconsistencies in type hints (#598)
6.6.2 (2022-12-17)
- Ensure pregSplit return type is always array.
- Add ability to run tests on various operating systems (#566)
- Avoid a deprecated error from PHP8.1 (#573)
6.6.1 (2022-12-12)
- Add PHPStan and fix level 1 errors (#307)
6.6.0 (2022-12-06)
- Multi-byte character support for filename during output (#561). (#562)
- Fix garbage collection (#509)
- FIX: PDF417 corrupt output problem, solution set bcmath scale parameter to zero (#534)
- Fix TypeError: count() in PHP8 (#556)
- Fix-getHTMLFontUnits (#547)
- Improved embedded image in HTML allowing src="data:..." format (#552)
- Fix image abscissa when in RTL (#510)
- fix: php 8.1 notices (#548)
- Optimize PNG files (#563)
- Update documentation for a known issue. (#569)
- Fix for PHP 8.1 (#571)
6.5.0 (2022-08-12)
- encodeUrlQuery takes into account the port (#493)
- Fixing undefined offset error in writeHTML() when last DOM element ha…
- correct some type hints (#495)
- fix: php 8.1 notices (#481)
- Fixed: null check for PHP 8.1 (#476)
- Fix Infinite Loop in Multicell with Auto Page Breaks Off (#473)
- GetCssBorderStyle Has Problem When !important Is Specified (#467)
- Support Apache 2.4 directives in htaccess file (#530)
- Remove examples from dist package (#542)
6.4.4 (2021-12-31)
- PHP 8.1 fixes
6.4.3 (2021-12-28)
- Fix MultiCell PHPDoc typehint (#407)
- Fix type hint for \TCPDF_STATIC::_freadint (#414)
- Footer and Header font phpdoc fixes + constructor $pdfa phpdoc fix + setHeaderData lw param fix (#402)
- Fix text-annotation state options (#412)
- Fix - Named links have been broken. This fixes. (#415)
- Fixed type in comment for $lw header image logo width in mm
- Change Set to set. Fixes #419 (#421)
- Fix failing tests and failing tests not marking exit code as 1 (#426)
- Fix phpdoc and prefer null as default value (#444)
- Run on PHP 8.1 normally and add nightly PHP as allowed to fail (#452)
- Fix AES128 encryption if the OpenSSL extension is installed (#453)
- Explicitly cast values to int for imagesetpixel (#460)
- Fix cell_height_ratio type (#405)
- Leave &NBSP; lowercase when using text-transform (#403)
6.4.2 (2021-07-20)
- Fix PHP 8.1 type error with TCPDF_STATIC::pregSplit on preg_split
- Fix a PHP array offset error
- Fixed phpdoc blocks
- Drop a PHP 4 polyfill and add a .gitattributes file
- Added a test-suite
- Removed pointless assignments
- Fix docblock spelling error
- Update version info
- Fix color being filled to type 0 with PHP 8
- Fix warnings for undefined tags for $lineStyle
- Normalized composer.json
- Allowed transparency in PDF/A-2 and PDF/A-3
- Add a TCPDF composer example
- Fixed implicit conversion from float to int for PHP 8.1
- Removed status.txt from font directories, because of filesize
- Fixed type hints
- Removed "U" modifier from regexes
6.4.1 (2021-03-27)
- Update tcpdf version (no code changes)
6.4.0 (2021-03-27)
- allow styles on <HR> tags
- check if file exists before calling unlink
- Fix image file type for urls with query params
- Fix SVGPath should accept 1.19.30 (equiv 1.19,.30) compacted values list
- Fix Second parameter of TCPDF::cell() must be a number
- PHP 8.0 function signature fixes
- Fix vulnerability to roman numeral bombs
- Optimized a regular expression
- Cache file get contents calls
- Remove mb_internal encoding handling
6.3.5 (2020-02-14)
- Fixed curly braces in pdf417
- Fixed a syntax error issue when accessing an index of a casted variable
6.3.4 (2020-02-12)
- Check if imagekeys exist
- Unlink only images in cache
6.3.3 (2020-02-12)
- Fixed PHP 7.4 - cannot use array offset on integers
- Fixed PDF/A-3B validation issue caused by missing pdfaSchema:property.
- Removed backup changelog files from repo
- Prevents the deletion of non-existent files in /tmp
- Prevent crash in case of no list access in cache path
- Check existence of file before delete it
- Fixed erase users pictures
- Fixed problem with $imagekeys undefined or unlinked
- Fix SVGPath elliptical arc with rx/ry=0 + z should return to initial point
- Fixed PHP 7.4 errors
- handle integers for pages
- Fixed background image doesn't work in RTL
- Fixed PDF/A validity
- Fixed datamatrix.php for PHP 7.4
- Fixed deprecated PHP features
6.3.2 (2019-09-20)
- Update ICC profile
6.3.1 (2019-09-20)
- Fix reported version
- Fix Undefined property: GLPIPDF::$imagekeys
6.3.0 (2019-09-19)
- fix SpotColor handling in HTML
- Add an additional empty test to prevent error in PHP 7.2
- Fix the documentation how to calculate the cell height
- Drop duplicated array indices
- Fix TCPDF_STATIC::fileGetContents()
- Introduce other version of pdfA (2 and 3)
- Add UF and AFRelationship missing
- Fix performance issue of cloned instances
- Change glob to readdir which performs better
- URI in PDF can result in E_NOTICE
- Fix a warning for PHP 7.4
- Fixed gradient offsets for percentage-based stops.
- Fixed file_get_contents return value should also be checked for a non-empty string
- Fix Array and string offset access syntax with curly braces is deprecated
- Fix PHP Warning: chr() expects parameter 1 to be int
- Add a VERSION file
6.2.26 (2018-10-16)
- Update sRGB.icc with the one from the Debian package icc-profiles-free
- Fix unsupported operand types error when codepoints arrays are merged
6.2.25 (2018-09-23)
- Fix support for image URLs.
6.2.24
- Support remote urls when checking if file exists.
6.2.23
6.2.23 (2018-09-22)
- Simplify file_exists function.
6.2.22
6.2.22 (2018-09-14)
- Fixes on `include/tcpdf_images.php`, `include/tcpdf_static.php` and `tcpdf.php` about file handling
6.2.21 (2018-09-14)
- _no code changes_
6.2.20 (2018-09-14)
- Fix for security vulnerability: Using the phar:// wrapper it was possible to trigger the unserialization of user provided data.
6.2.19
6.2.19 (2018-09-14)
- Merge various fixes for PHP 7.3 compatibility and security.
6.2.13 (2016-06-10)

View file

@ -7,7 +7,7 @@
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
2002-2019 Nicola Asuni - Tecnick.com LTD
2002-2024 Nicola Asuni - Tecnick.com LTD
**********************************************************************
**********************************************************************

View file

@ -6,15 +6,14 @@
* **category** Library
* **author** Nicola Asuni <info@tecnick.com>
* **copyright** 2002-2019 Nicola Asuni - Tecnick.com LTD
* **copyright** 2002-2024 Nicola Asuni - Tecnick.com LTD
* **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
* **link** http://www.tcpdf.org
* **source** https://github.com/tecnickcom/TCPDF
## IMPORTANT
A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this version will not receive any additional development or support.
This version should be considered obsolete, new projects should use the new version as soon it will become stable.
## NOTE
A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this library is in support only mode.

View file

@ -1 +1 @@
6.3.2
6.7.5

View file

@ -1,47 +1,52 @@
{
"name": "tecnickcom/tcpdf",
"version": "6.3.2",
"homepage": "http://www.tcpdf.org/",
"type": "library",
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
"keywords": [
"PDF",
"tcpdf",
"PDFD32000-2008",
"qrcode",
"datamatrix",
"pdf417",
"barcodes"
],
"license": "LGPL-3.0",
"authors": [
{
"name": "Nicola Asuni",
"email": "info@tecnick.com",
"role": "lead"
"name": "tecnickcom/tcpdf",
"type": "library",
"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
"keywords": [
"PDF",
"tcpdf",
"PDFD32000-2008",
"qrcode",
"datamatrix",
"pdf417",
"barcodes"
],
"homepage": "http://www.tcpdf.org/",
"version": "6.7.5",
"license": "LGPL-3.0-or-later",
"authors": [
{
"name": "Nicola Asuni",
"email": "info@tecnick.com",
"role": "lead"
}
],
"require": {
"php": ">=5.5.0"
},
"autoload": {
"classmap": [
"config",
"include",
"tcpdf.php",
"tcpdf_parser.php",
"tcpdf_import.php",
"tcpdf_barcodes_1d.php",
"tcpdf_barcodes_2d.php",
"include/tcpdf_colors.php",
"include/tcpdf_filters.php",
"include/tcpdf_font_data.php",
"include/tcpdf_fonts.php",
"include/tcpdf_images.php",
"include/tcpdf_static.php",
"include/barcodes/datamatrix.php",
"include/barcodes/pdf417.php",
"include/barcodes/qrcode.php"
]
},
"archive": {
"exclude": [
"/examples"
]
}
],
"require": {
"php": ">=5.3.0"
},
"autoload": {
"classmap": [
"config",
"include",
"tcpdf.php",
"tcpdf_parser.php",
"tcpdf_import.php",
"tcpdf_barcodes_1d.php",
"tcpdf_barcodes_2d.php",
"include/tcpdf_colors.php",
"include/tcpdf_filters.php",
"include/tcpdf_font_data.php",
"include/tcpdf_fonts.php",
"include/tcpdf_images.php",
"include/tcpdf_static.php",
"include/barcodes/datamatrix.php",
"include/barcodes/pdf417.php",
"include/barcodes/qrcode.php"
]
}
}

View file

@ -212,6 +212,14 @@ define('K_THAI_TOPCHARS', true);
*/
define('K_TCPDF_CALLS_IN_HTML', false);
/**
* List of TCPDF methods that are allowed to be called using HTML syntax.
* Note: each method name must end with surrounded with | (pipe) character.
* The constant K_TCPDF_CALLS_IN_HTML must be set to true.
* IMPORTANT: For security reason, disable this feature if you are allowing user HTML content.
*/
define('K_ALLOWED_TCPDF_TAGS', '');
/**
* If true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
*/

View file

@ -0,0 +1,53 @@
abysta at yandex.ru
Adrian Schroeter
Aleksey Chalabyan
Andrey Valentinovich Panov
Ben Laenen
Besarion Gugushvili
Bhikkhu Pesala
Clayborne Arevalo
Dafydd Harries
Danilo Segan
Davide Viti
David Jez
David Lawrence Ramsey
Denis Jacquerye
Dwayne Bailey
Eugeniy Meshcheryakov
Gee Fung Sit
Heikki Lindroos
James Cloos
James Crippen
John Karp
Keenan Pepper
Lars Naesbye Christensen
Lior Halphon
MaEr
Mashrab Kuvatov
Max Berger
Mederic Boquien
Michael Everson
MihailJP
Misu Moldovan
Nguyen Thai Ngoc Duy
Nicolas Mailhot
Norayr Chilingarian
Ognyan Kulev
Ondrej Koala Vacha
Peter Cernak
Remy Oudompheng
Roozbeh Pournader
Rouben Hakobian
Sahak Petrosyan
Sander Vesik
Stepan Roh
Stephen Hartke
Steve Tinney
Tavmjong Bah
Thomas Henlich
Tim May
Valentin Stoykov
Vasek Stodulka
Wesley Transue
$Id: AUTHORS 2461 2011-02-18 16:38:20Z ben_laenen $

View file

@ -0,0 +1,3 @@
See http://dejavu.sourceforge.net/wiki/index.php/Bugs
$Id: BUGS 80 2004-11-13 13:12:02Z src $

View file

@ -0,0 +1,99 @@
Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
Bitstream Vera Fonts Copyright
------------------------------
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of the fonts accompanying this license ("Fonts") and associated
documentation files (the "Font Software"), to reproduce and distribute the
Font Software, including without limitation the rights to use, copy, merge,
publish, distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to the
following conditions:
The above copyright and trademark notices and this permission notice shall
be included in all copies of one or more of the Font Software typefaces.
The Font Software may be modified, altered, or added to, and in particular
the designs of glyphs or characters in the Fonts may be modified and
additional glyphs or characters may be added to the Fonts, only if the fonts
are renamed to names not containing either the words "Bitstream" or the word
"Vera".
This License becomes null and void to the extent applicable to Fonts or Font
Software that has been modified and is distributed under the "Bitstream
Vera" names.
The Font Software may be sold as part of a larger software package but no
copy of one or more of the Font Software typefaces may be sold by itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
FONT SOFTWARE.
Except as contained in this notice, the names of Gnome, the Gnome
Foundation, and Bitstream Inc., shall not be used in advertising or
otherwise to promote the sale, use or other dealings in this Font Software
without prior written authorization from the Gnome Foundation or Bitstream
Inc., respectively. For further information, contact: fonts at gnome dot
org.
Arev Fonts Copyright
------------------------------
Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of the fonts accompanying this license ("Fonts") and
associated documentation files (the "Font Software"), to reproduce
and distribute the modifications to the Bitstream Vera Font Software,
including without limitation the rights to use, copy, merge, publish,
distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to
the following conditions:
The above copyright and trademark notices and this permission notice
shall be included in all copies of one or more of the Font Software
typefaces.
The Font Software may be modified, altered, or added to, and in
particular the designs of glyphs or characters in the Fonts may be
modified and additional glyphs or characters may be added to the
Fonts, only if the fonts are renamed to names not containing either
the words "Tavmjong Bah" or the word "Arev".
This License becomes null and void to the extent applicable to Fonts
or Font Software that has been modified and is distributed under the
"Tavmjong Bah Arev" names.
The Font Software may be sold as part of a larger software package but
no copy of one or more of the Font Software typefaces may be sold by
itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Except as contained in this notice, the name of Tavmjong Bah shall not
be used in advertising or otherwise to promote the sale, use or other
dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,59 @@
DejaVu fonts 2.33 (c)2004-2011 DejaVu fonts team
------------------------------------------------
The DejaVu fonts are a font family based on the Bitstream Vera Fonts
(http://gnome.org/fonts/). Its purpose is to provide a wider range of
characters (see status.txt for more information) while maintaining the
original look and feel.
DejaVu fonts are based on Bitstream Vera fonts version 1.10.
Available fonts (Sans = sans serif, Mono = monospaced):
DejaVu Sans Mono
DejaVu Sans Mono Bold
DejaVu Sans Mono Bold Oblique
DejaVu Sans Mono Oblique
DejaVu Sans
DejaVu Sans Bold
DejaVu Sans Bold Oblique
DejaVu Sans Oblique
DejaVu Sans ExtraLight (experimental)
DejaVu Serif
DejaVu Serif Bold
DejaVu Serif Bold Italic (experimental)
DejaVu Serif Italic (experimental)
DejaVu Sans Condensed (experimental)
DejaVu Sans Condensed Bold (experimental)
DejaVu Sans Condensed Bold Oblique (experimental)
DejaVu Sans Condensed Oblique (experimental)
DejaVu Serif Condensed (experimental)
DejaVu Serif Condensed Bold (experimental)
DejaVu Serif Condensed Bold Italic (experimental)
DejaVu Serif Condensed Italic (experimental)
All fonts are also available as derivative called DejaVu LGC with support
only for Latin, Greek and Cyrillic scripts.
For license information see LICENSE. What's new is described in NEWS. Known
bugs are in BUGS. All authors are mentioned in AUTHORS.
Fonts are published in source form as SFD files (Spline Font Database from
FontForge - http://fontforge.sf.net/) and in compiled form as TTF files
(TrueType fonts).
For more information go to http://dejavu.sourceforge.net/.
Characters from Arev fonts, Copyright (c) 2006 by Tavmjong Bah:
---------------------------
U+01BA, U+01BF, U+01F7, U+021C-U+021D, U+0220, U+0222-U+0223,
U+02B9, U+02BA, U+02BD, U+02C2-U+02C5, U+02d4-U+02D5,
U+02D7, U+02EC-U+02EE, U+0346-U+034E, U+0360, U+0362,
U+03E2-03EF, U+0460-0463, U+0466-U+0486, U+0488-U+0489, U+04A8-U+04A9,
U+0500-U+050F, U+2055-205E, U+20B0, U+20B2-U+20B3, U+2102, U+210D, U+210F,
U+2111, U+2113, U+2115, U+2118-U+211A, U+211C-U+211D, U+2124, U+2135,
U+213C-U+2140, U+2295-U+2298, U+2308-U+230B, U+26A2-U+26B1, U+2701-U+2704,
U+2706-U+2709, U+270C-U+274B, U+2758-U+275A, U+2761-U+2775, U+2780-U+2794,
U+2798-U+27AF, U+27B1-U+27BE, U+FB05-U+FB06
$Id: README 2471 2011-02-27 14:25:15Z ben_laenen $

View file

@ -0,0 +1,242 @@
This is the language coverage file for DejaVu fonts
($Id$)
Sans Serif Sans Mono
aa Afar 100% (62/62) 100% (62/62) 100% (62/62)
ab Abkhazia 100% (90/90) 93% (84/90) 84% (76/90)
af Afrikaans 100% (69/69) 100% (69/69) 100% (69/69)
ak Akan 100% (73/73) 100% (73/73) 100% (73/73)
am Amharic (0/264) (0/264) (0/264)
an Aragonese 100% (66/66) 100% (66/66) 100% (66/66)
ar Arabic 100% (125/125) (0/125) 100% (125/125)
as Assamese (0/64) (0/64) (0/64)
ast Asturian/Bable/Leonese/Asturleonese 100% (66/66) 100% (66/66) 100% (66/66)
av Avaric 100% (67/67) 100% (67/67) 100% (67/67)
ay Aymara 100% (60/60) 100% (60/60) 100% (60/60)
az-az Azerbaijani in Azerbaijan 100% (66/66) 100% (66/66) 100% (66/66)
az-ir Azerbaijani in Iran 100% (130/130) (0/130) 100% (130/130)
ba Bashkir 100% (82/82) 100% (82/82) 97% (80/82)
be Byelorussian 100% (68/68) 100% (68/68) 100% (68/68)
ber-dz Berber in Algeria 100% (70/70) 100% (70/70) 100% (70/70)
ber-ma Berber in Morocco 100% (32/32) (0/32) (0/32)
bg Bulgarian 100% (60/60) 100% (60/60) 100% (60/60)
bh Bihari (Devanagari script) (0/68) (0/68) (0/68)
bho Bhojpuri (Devanagari script) (0/68) (0/68) (0/68)
bi Bislama 100% (58/58) 100% (58/58) 100% (58/58)
bin Edo or Bini 100% (78/78) 100% (78/78) 100% (78/78)
bm Bambara 100% (60/60) 100% (60/60) 100% (60/60)
bn Bengali (0/63) (0/63) (0/63)
bo Tibetan (0/95) (0/95) (0/95)
br Breton 100% (64/64) 100% (64/64) 100% (64/64)
bs Bosnian 100% (62/62) 100% (62/62) 100% (62/62)
bua Buriat (Buryat) 100% (70/70) 100% (70/70) 100% (70/70)
byn Blin/Bilin (0/255) (0/255) (0/255)
ca Catalan 100% (74/74) 100% (74/74) 100% (74/74)
ce Chechen 100% (67/67) 100% (67/67) 100% (67/67)
ch Chamorro 100% (58/58) 100% (58/58) 100% (58/58)
chm Mari (Lower Cheremis / Upper Cheremis) 100% (76/76) 100% (76/76) 100% (76/76)
chr Cherokee (0/85) (0/85) (0/85)
co Corsican 100% (84/84) 100% (84/84) 100% (84/84)
crh Crimean Tatar/Crimean Turkish 100% (68/68) 100% (68/68) 100% (68/68)
cs Czech 100% (82/82) 100% (82/82) 100% (82/82)
csb Kashubian 100% (74/74) 100% (74/74) 100% (74/74)
cu Old Church Slavonic 100% (103/103) 86% (89/103) 78% (81/103)
cv Chuvash 100% (74/74) 100% (74/74) 100% (74/74)
cy Welsh 100% (78/78) 100% (78/78) 100% (78/78)
da Danish 100% (70/70) 100% (70/70) 100% (70/70)
de German 100% (59/59) 100% (59/59) 100% (59/59)
dv Divehi/Dhivehi/Maldivian (0/49) (0/49) (0/49)
dz Dzongkha (0/95) (0/95) (0/95)
ee Ewe 100% (99/99) 100% (99/99) 100% (99/99)
el Greek 100% (69/69) 100% (69/69) 100% (69/69)
en English 100% (72/72) 100% (72/72) 100% (72/72)
eo Esperanto 100% (64/64) 100% (64/64) 100% (64/64)
es Spanish 100% (66/66) 100% (66/66) 100% (66/66)
et Estonian 100% (64/64) 100% (64/64) 100% (64/64)
eu Basque 100% (56/56) 100% (56/56) 100% (56/56)
fa Persian 100% (129/129) (0/129) 100% (129/129)
fat Fanti 100% (73/73) 100% (73/73) 100% (73/73)
ff Fulah (Fula) 100% (62/62) 100% (62/62) 100% (62/62)
fi Finnish 100% (62/62) 100% (62/62) 100% (62/62)
fil Filipino 100% (84/84) 100% (84/84) 100% (84/84)
fj Fijian 100% (52/52) 100% (52/52) 100% (52/52)
fo Faroese 100% (68/68) 100% (68/68) 100% (68/68)
fr French 100% (84/84) 100% (84/84) 100% (84/84)
fur Friulian 100% (66/66) 100% (66/66) 100% (66/66)
fy Frisian 100% (75/75) 100% (75/75) 100% (75/75)
ga Irish 100% (80/80) 100% (80/80) 100% (80/80)
gd Scots Gaelic 100% (70/70) 100% (70/70) 100% (70/70)
gez Ethiopic (Geez) (0/218) (0/218) (0/218)
gl Galician 100% (66/66) 100% (66/66) 100% (66/66)
gn Guarani 100% (70/70) 100% (70/70) 100% (70/70)
gu Gujarati (0/68) (0/68) (0/68)
gv Manx Gaelic 100% (54/54) 100% (54/54) 100% (54/54)
ha Hausa 100% (60/60) 100% (60/60) 100% (60/60)
haw Hawaiian 100% (63/63) 100% (63/63) 100% (63/63)
he Hebrew 100% (27/27) (0/27) (0/27)
hi Hindi (Devanagari script) (0/68) (0/68) (0/68)
hne Chhattisgarhi (0/68) (0/68) (0/68)
ho Hiri Motu 100% (52/52) 100% (52/52) 100% (52/52)
hr Croatian 100% (62/62) 100% (62/62) 100% (62/62)
hsb Upper Sorbian 100% (72/72) 100% (72/72) 100% (72/72)
ht Haitian/Haitian Creole 100% (56/56) 100% (56/56) 100% (56/56)
hu Hungarian 100% (70/70) 100% (70/70) 100% (70/70)
hy Armenian 100% (77/77) 100% (77/77) 100% (77/77)
hz Herero 100% (57/57) 100% (57/57) 100% (57/57)
ia Interlingua 100% (52/52) 100% (52/52) 100% (52/52)
id Indonesian 100% (54/54) 100% (54/54) 100% (54/54)
ie Interlingue 100% (52/52) 100% (52/52) 100% (52/52)
ig Igbo 100% (58/58) 100% (58/58) 100% (58/58)
ii Sichuan Yi/Nuosu (0/1165) (0/1165) (0/1165)
ik Inupiaq (Inupiak, Eskimo) 100% (68/68) 100% (68/68) 100% (68/68)
io Ido 100% (52/52) 100% (52/52) 100% (52/52)
is Icelandic 100% (70/70) 100% (70/70) 100% (70/70)
it Italian 100% (72/72) 100% (72/72) 100% (72/72)
iu Inuktitut 100% (161/161) (0/161) (0/161)
ja Japanese (0/6537) (0/6537) (0/6537)
jv Javanese 100% (56/56) 100% (56/56) 100% (56/56)
ka Georgian 100% (33/33) 100% (33/33) 100% (33/33)
kaa Kara-Kalpak (Karakalpak) 100% (78/78) 100% (78/78) 100% (78/78)
kab Kabyle 100% (70/70) 100% (70/70) 100% (70/70)
ki Kikuyu 100% (56/56) 100% (56/56) 100% (56/56)
kj Kuanyama/Kwanyama 100% (52/52) 100% (52/52) 100% (52/52)
kk Kazakh 100% (77/77) 100% (77/77) 100% (77/77)
kl Greenlandic 100% (81/81) 100% (81/81) 100% (81/81)
km Central Khmer (0/63) (0/63) (0/63)
kn Kannada (0/70) (0/70) (0/70)
ko Korean (0/2443) (0/2443) (0/2443)
kok Kokani (Devanagari script) (0/68) (0/68) (0/68)
kr Kanuri 100% (56/56) 100% (56/56) 100% (56/56)
ks Kashmiri 98% (143/145) (0/145) 97% (141/145)
ku-am Kurdish in Armenia 100% (64/64) 100% (64/64) 100% (64/64)
ku-iq Kurdish in Iraq 100% (32/32) (0/32) 87% (28/32)
ku-ir Kurdish in Iran 100% (32/32) (0/32) 87% (28/32)
ku-tr Kurdish in Turkey 100% (62/62) 100% (62/62) 100% (62/62)
kum Kumyk 100% (66/66) 100% (66/66) 100% (66/66)
kv Komi (Komi-Permyak/Komi-Siryan) 100% (70/70) 100% (70/70) 100% (70/70)
kw Cornish 100% (64/64) 100% (64/64) 100% (64/64)
kwm Kwambi 100% (52/52) 100% (52/52) 100% (52/52)
ky Kirgiz 100% (70/70) 100% (70/70) 100% (70/70)
la Latin 100% (68/68) 100% (68/68) 100% (68/68)
lah Lahnda 98% (143/145) (0/145) 97% (141/145)
lb Luxembourgish (Letzeburgesch) 100% (75/75) 100% (75/75) 100% (75/75)
lez Lezghian (Lezgian) 100% (67/67) 100% (67/67) 100% (67/67)
lg Ganda 100% (54/54) 100% (54/54) 100% (54/54)
li Limburgan/Limburger/Limburgish 100% (62/62) 100% (62/62) 100% (62/62)
ln Lingala 100% (81/81) 100% (81/81) 100% (81/81)
lo Lao 100% (55/55) (0/55) 83% (46/55)
lt Lithuanian 100% (70/70) 100% (70/70) 100% (70/70)
lv Latvian 100% (78/78) 100% (78/78) 100% (78/78)
mai Maithili (Devanagari script) (0/68) (0/68) (0/68)
mg Malagasy 100% (56/56) 100% (56/56) 100% (56/56)
mh Marshallese 100% (62/62) 100% (62/62) 100% (62/62)
mi Maori 100% (64/64) 100% (64/64) 100% (64/64)
mk Macedonian 100% (42/42) 100% (42/42) 100% (42/42)
ml Malayalam (0/68) (0/68) (0/68)
mn-cn Mongolian in China (0/130) (0/130) (0/130)
mn-mn Mongolian in Mongolia 100% (70/70) 100% (70/70) 100% (70/70)
mo Moldavian 100% (128/128) 100% (128/128) 100% (128/128)
mr Marathi (Devanagari script) (0/68) (0/68) (0/68)
ms Malay 100% (52/52) 100% (52/52) 100% (52/52)
mt Maltese 100% (72/72) 100% (72/72) 100% (72/72)
my Burmese (Myanmar) (0/48) (0/48) (0/48)
na Nauru 100% (60/60) 100% (60/60) 100% (60/60)
nb Norwegian Bokmal 100% (70/70) 100% (70/70) 100% (70/70)
nds Low Saxon 100% (59/59) 100% (59/59) 100% (59/59)
ne Nepali (Devanagari script) (0/68) (0/68) (0/68)
ng Ndonga 100% (52/52) 100% (52/52) 100% (52/52)
nl Dutch 100% (82/82) 100% (82/82) 100% (82/82)
nn Norwegian Nynorsk 100% (76/76) 100% (76/76) 100% (76/76)
no Norwegian (Bokmal) 100% (70/70) 100% (70/70) 100% (70/70)
nr Ndebele, South 100% (52/52) 100% (52/52) 100% (52/52)
nso Northern Sotho 100% (58/58) 100% (58/58) 100% (58/58)
nv Navajo/Navaho 100% (72/72) 100% (72/72) 100% (72/72)
ny Chichewa 100% (54/54) 100% (54/54) 100% (54/54)
oc Occitan 100% (70/70) 100% (70/70) 100% (70/70)
om Oromo or Galla 100% (52/52) 100% (52/52) 100% (52/52)
or Oriya (0/68) (0/68) (0/68)
os Ossetic 100% (66/66) 100% (66/66) 100% (66/66)
ota Ottoman Turkish 100% (37/37) (0/37) 97% (36/37)
pa Panjabi/Punjabi (0/63) (0/63) (0/63)
pa-pk Panjabi/Punjabi in Pakistan 98% (143/145) (0/145) 97% (141/145)
pap-an Papiamento in Netherlands Antilles 100% (72/72) 100% (72/72) 100% (72/72)
pap-aw Papiamento in Aruba 100% (54/54) 100% (54/54) 100% (54/54)
pl Polish 100% (70/70) 100% (70/70) 100% (70/70)
ps-af Pashto in Afghanistan 95% (47/49) (0/49) 77% (38/49)
ps-pk Pashto in Pakistan 93% (46/49) (0/49) 75% (37/49)
pt Portuguese 100% (82/82) 100% (82/82) 100% (82/82)
qu Quechua 100% (55/55) 100% (55/55) 100% (55/55)
rm Rhaeto-Romance (Romansch) 100% (66/66) 100% (66/66) 100% (66/66)
rn Rundi 100% (52/52) 100% (52/52) 100% (52/52)
ro Romanian 100% (62/62) 100% (62/62) 100% (62/62)
ru Russian 100% (66/66) 100% (66/66) 100% (66/66)
rw Kinyarwanda 100% (52/52) 100% (52/52) 100% (52/52)
sa Sanskrit (Devanagari script) (0/68) (0/68) (0/68)
sah Yakut 100% (76/76) 100% (76/76) 100% (76/76)
sc Sardinian 100% (62/62) 100% (62/62) 100% (62/62)
sco Scots 100% (56/56) 100% (56/56) 100% (56/56)
sd Sindhi 100% (54/54) (0/54) 79% (43/54)
se North Sami 100% (66/66) 100% (66/66) 100% (66/66)
sel Selkup (Ostyak-Samoyed) 100% (66/66) 100% (66/66) 100% (66/66)
sg Sango 100% (72/72) 100% (72/72) 100% (72/72)
sh Serbo-Croatian 100% (156/156) 100% (156/156) 98% (154/156)
shs Secwepemctsin 100% (48/48) 100% (48/48) 100% (48/48)
si Sinhala/Sinhalese (0/73) (0/73) (0/73)
sid Sidamo (0/281) (0/281) (0/281)
sk Slovak 100% (86/86) 100% (86/86) 100% (86/86)
sl Slovenian 100% (62/62) 100% (62/62) 100% (62/62)
sm Samoan 100% (53/53) 100% (53/53) 100% (53/53)
sma South Sami 100% (60/60) 100% (60/60) 100% (60/60)
smj Lule Sami 100% (60/60) 100% (60/60) 100% (60/60)
smn Inari Sami 100% (68/68) 100% (68/68) 100% (68/68)
sms Skolt Sami 100% (80/80) 100% (80/80) 97% (78/80)
sn Shona 100% (52/52) 100% (52/52) 100% (52/52)
so Somali 100% (52/52) 100% (52/52) 100% (52/52)
sq Albanian 100% (56/56) 100% (56/56) 100% (56/56)
sr Serbian 100% (60/60) 100% (60/60) 100% (60/60)
ss Swati 100% (52/52) 100% (52/52) 100% (52/52)
st Sotho, Southern 100% (52/52) 100% (52/52) 100% (52/52)
su Sundanese 100% (54/54) 100% (54/54) 100% (54/54)
sv Swedish 100% (68/68) 100% (68/68) 100% (68/68)
sw Swahili 100% (52/52) 100% (52/52) 100% (52/52)
syr Syriac (0/45) (0/45) (0/45)
ta Tamil (0/48) (0/48) (0/48)
te Telugu (0/70) (0/70) (0/70)
tg Tajik 100% (78/78) 100% (78/78) 97% (76/78)
th Thai 1% (1/74) (0/74) (0/74)
ti-er Eritrean Tigrinya (0/255) (0/255) (0/255)
ti-et Ethiopian Tigrinya (0/281) (0/281) (0/281)
tig Tigre (0/221) (0/221) (0/221)
tk Turkmen 100% (68/68) 100% (68/68) 100% (68/68)
tl Tagalog 100% (84/84) 100% (84/84) 100% (84/84)
tn Tswana 100% (58/58) 100% (58/58) 100% (58/58)
to Tonga 100% (53/53) 100% (53/53) 100% (53/53)
tr Turkish 100% (70/70) 100% (70/70) 100% (70/70)
ts Tsonga 100% (52/52) 100% (52/52) 100% (52/52)
tt Tatar 100% (76/76) 100% (76/76) 100% (76/76)
tw Twi 100% (73/73) 100% (73/73) 100% (73/73)
ty Tahitian 100% (65/65) 100% (65/65) 100% (65/65)
tyv Tuvinian 100% (70/70) 100% (70/70) 100% (70/70)
ug Uighur 100% (125/125) (0/125) 100% (125/125)
uk Ukrainian 100% (72/72) 100% (72/72) 100% (72/72)
ur Urdu 98% (143/145) (0/145) 97% (141/145)
uz Uzbek 100% (52/52) 100% (52/52) 100% (52/52)
ve Venda 100% (62/62) 100% (62/62) 100% (62/62)
vi Vietnamese 100% (194/194) 100% (194/194) 76% (148/194)
vo Volapuk 100% (54/54) 100% (54/54) 100% (54/54)
vot Votic 100% (62/62) 100% (62/62) 100% (62/62)
wa Walloon 100% (70/70) 100% (70/70) 100% (70/70)
wal Wolaitta/Wolaytta (0/281) (0/281) (0/281)
wen Sorbian languages (lower and upper) 100% (76/76) 100% (76/76) 100% (76/76)
wo Wolof 100% (66/66) 100% (66/66) 100% (66/66)
xh Xhosa 100% (52/52) 100% (52/52) 100% (52/52)
yap Yapese 100% (58/58) 100% (58/58) 100% (58/58)
yi Yiddish 100% (27/27) (0/27) (0/27)
yo Yoruba 100% (119/119) 100% (119/119) 100% (119/119)
za Zhuang/Chuang 100% (52/52) 100% (52/52) 100% (52/52)
zh-cn Chinese (simplified) 0% (2/6765) 0% (2/6765) 0% (2/6765)
zh-hk Chinese Hong Kong Supplementary Character Set (0/2213) (0/2213) (0/2213)
zh-mo Chinese in Macau (0/2213) (0/2213) (0/2213)
zh-sg Chinese in Singapore 0% (2/6765) 0% (2/6765) 0% (2/6765)
zh-tw Chinese (traditional) (0/13063) (0/13063) (0/13063)
zu Zulu 100% (52/52) 100% (52/52) 100% (52/52)

View file

@ -0,0 +1,215 @@
This is the Unicode coverage file for DejaVu fonts
($Id$)
Control and similar characters are discounted from totals.
Sans Serif Sans Mono
U+0000 Basic Latin 100% (95/95) 100% (95/95) 100% (95/95)
U+0080 Latin-1 Supplement 100% (96/96) 100% (96/96) 100% (96/96)
U+0100 Latin Extended-A 100% (128/128) 100% (128/128) 100% (128/128)
U+0180 Latin Extended-B 100% (208/208) 100% (208/208) 86% (180/208)
U+0250 IPA Extensions 100% (96/96) 100% (96/96) 100% (96/96)
U+02b0 Spacing Modifier Letters 78% (63/80) 57% (46/80) 60% (48/80)
U+0300 Combining Diacritical Marks 83% (93/112) 60% (68/112) 59% (67/112)
U+0370 Greek and Coptic 100% (134/134) 89% (120/134) 82% (110/134)
U+0400 Cyrillic 100% (256/256) 78% (200/256) 70% (180/256)
U+0500 Cyrillic Supplement 95% (38/40) 25% (10/40) 15% (6/40)
U+0530 Armenian 100% (86/86) 100% (86/86) 100% (86/86)
U+0590 Hebrew 62% (54/87) (0/87) (0/87)
U+0600 Arabic 63% (161/252) (0/252) 39% (99/252)
U+0700 Syriac (0/77) (0/77) (0/77)
U+0750 Arabic Supplement (0/48) (0/48) (0/48)
U+0780 Thaana (0/50) (0/50) (0/50)
U+07c0 NKo 91% (54/59) (0/59) (0/59)
U+0800 Samaritan (0/61) (0/61) (0/61)
U+0840 Mandaic (0/29) (0/29) (0/29)
U+0900 Devanagari (0/127) (0/127) (0/127)
U+0980 Bengali (0/92) (0/92) (0/92)
U+0a00 Gurmukhi (0/79) (0/79) (0/79)
U+0a80 Gujarati (0/83) (0/83) (0/83)
U+0b00 Oriya (0/90) (0/90) (0/90)
U+0b80 Tamil (0/72) (0/72) (0/72)
U+0c00 Telugu (0/93) (0/93) (0/93)
U+0c80 Kannada (0/86) (0/86) (0/86)
U+0d00 Malayalam (0/98) (0/98) (0/98)
U+0d80 Sinhala (0/80) (0/80) (0/80)
U+0e00 Thai 1% (1/87) (0/87) (0/87)
U+0e80 Lao 100% (65/65) (0/65) 70% (46/65)
U+0f00 Tibetan (0/211) (0/211) (0/211)
U+1000 Myanmar (0/160) (0/160) (0/160)
U+10a0 Georgian 100% (83/83) 100% (83/83) 54% (45/83)
U+1100 Hangul Jamo (0/256) (0/256) (0/256)
U+1200 Ethiopic (0/358) (0/358) (0/358)
U+1380 Ethiopic Supplement (0/26) (0/26) (0/26)
U+13a0 Cherokee (0/85) (0/85) (0/85)
U+1400 Unified Canadian Aboriginal Syllabics 63% (404/640) (0/640) (0/640)
U+1680 Ogham 100% (29/29) (0/29) (0/29)
U+16a0 Runic (0/81) (0/81) (0/81)
U+1700 Tagalog (0/20) (0/20) (0/20)
U+1720 Hanunoo (0/23) (0/23) (0/23)
U+1740 Buhid (0/20) (0/20) (0/20)
U+1760 Tagbanwa (0/18) (0/18) (0/18)
U+1780 Khmer (0/114) (0/114) (0/114)
U+1800 Mongolian (0/156) (0/156) (0/156)
U+18b0 Unified Canadian Aboriginal Syllabics Extended (0/70) (0/70) (0/70)
U+1900 Limbu (0/66) (0/66) (0/66)
U+1950 Tai Le (0/35) (0/35) (0/35)
U+1980 New Tai Lue (0/83) (0/83) (0/83)
U+19e0 Khmer Symbols (0/32) (0/32) (0/32)
U+1a00 Buginese (0/30) (0/30) (0/30)
U+1a20 Tai Tham (0/127) (0/127) (0/127)
U+1b00 Balinese (0/121) (0/121) (0/121)
U+1b80 Sundanese (0/55) (0/55) (0/55)
U+1bc0 Batak (0/56) (0/56) (0/56)
U+1c00 Lepcha (0/74) (0/74) (0/74)
U+1c50 Ol Chiki (0/48) (0/48) (0/48)
U+1cd0 Vedic Extensions (0/35) (0/35) (0/35)
U+1d00 Phonetic Extensions 82% (106/128) 86% (111/128) 48% (62/128)
U+1d80 Phonetic Extensions Supplement 59% (38/64) 59% (38/64) 57% (37/64)
U+1dc0 Combining Diacritical Marks Supplement 13% (6/43) 13% (6/43) (0/43)
U+1e00 Latin Extended Additional 98% (252/256) 98% (252/256) 71% (182/256)
U+1f00 Greek Extended 100% (233/233) 100% (233/233) 100% (233/233)
U+2000 General Punctuation 100% (107/107) 81% (87/107) 48% (52/107)
U+2070 Superscripts and Subscripts 100% (42/42) 100% (42/42) 100% (42/42)
U+20a0 Currency Symbols 92% (24/26) 26% (7/26) 92% (24/26)
U+20d0 Combining Diacritical Marks for Symbols 21% (7/33) (0/33) (0/33)
U+2100 Letterlike Symbols 93% (75/80) 40% (32/80) 21% (17/80)
U+2150 Number Forms 94% (55/58) 94% (55/58) 22% (13/58)
U+2190 Arrows 100% (112/112) 100% (112/112) 100% (112/112)
U+2200 Mathematical Operators 100% (256/256) 39% (100/256) 62% (159/256)
U+2300 Miscellaneous Technical 26% (65/244) 14% (35/244) 47% (117/244)
U+2400 Control Pictures 5% (2/39) 2% (1/39) 2% (1/39)
U+2440 Optical Character Recognition (0/11) (0/11) (0/11)
U+2460 Enclosed Alphanumerics 6% (10/160) (0/160) (0/160)
U+2500 Box Drawing 100% (128/128) 100% (128/128) 100% (128/128)
U+2580 Block Elements 100% (32/32) 100% (32/32) 100% (32/32)
U+25a0 Geometric Shapes 100% (96/96) 100% (96/96) 100% (96/96)
U+2600 Miscellaneous Symbols 73% (187/256) 11% (30/256) 58% (149/256)
U+2700 Dingbats 91% (174/191) 0% (1/191) 75% (144/191)
U+27c0 Miscellaneous Mathematical Symbols-A 19% (9/46) 10% (5/46) 10% (5/46)
U+27f0 Supplemental Arrows-A 100% (16/16) 100% (16/16) (0/16)
U+2800 Braille Patterns 100% (256/256) 100% (256/256) (0/256)
U+2900 Supplemental Arrows-B 4% (6/128) 100% (128/128) (0/128)
U+2980 Miscellaneous Mathematical Symbols-B 10% (13/128) 0% (1/128) 2% (3/128)
U+2a00 Supplemental Mathematical Operators 28% (72/256) 1% (4/256) 0% (1/256)
U+2b00 Miscellaneous Symbols and Arrows 40% (35/87) 31% (27/87) 10% (9/87)
U+2c00 Glagolitic (0/94) (0/94) (0/94)
U+2c60 Latin Extended-C 96% (31/32) 81% (26/32) 43% (14/32)
U+2c80 Coptic (0/121) (0/121) (0/121)
U+2d00 Georgian Supplement (0/38) 100% (38/38) (0/38)
U+2d30 Tifinagh 96% (55/57) (0/57) (0/57)
U+2d80 Ethiopic Extended (0/79) (0/79) (0/79)
U+2de0 Cyrillic Extended-A (0/32) (0/32) (0/32)
U+2e00 Supplemental Punctuation 12% (6/50) 12% (6/50) 12% (6/50)
U+2e80 CJK Radicals Supplement (0/115) (0/115) (0/115)
U+2f00 Kangxi Radicals (0/214) (0/214) (0/214)
U+2ff0 Ideographic Description Characters (0/12) (0/12) (0/12)
U+3000 CJK Symbols and Punctuation (0/64) (0/64) (0/64)
U+3040 Hiragana (0/93) (0/93) (0/93)
U+30a0 Katakana (0/96) (0/96) (0/96)
U+3100 Bopomofo (0/41) (0/41) (0/41)
U+3130 Hangul Compatibility Jamo (0/94) (0/94) (0/94)
U+3190 Kanbun (0/16) (0/16) (0/16)
U+31a0 Bopomofo Extended (0/27) (0/27) (0/27)
U+31c0 CJK Strokes (0/36) (0/36) (0/36)
U+31f0 Katakana Phonetic Extensions (0/16) (0/16) (0/16)
U+3200 Enclosed CJK Letters and Months (0/254) (0/254) (0/254)
U+3300 CJK Compatibility (0/256) (0/256) (0/256)
U+3400 CJK Unified Ideographs Extension A (0/0) (0/0) (0/0)
U+4dc0 Yijing Hexagram Symbols 100% (64/64) (0/64) (0/64)
U+4e00 CJK Unified Ideographs (0/0) (0/0) (0/0)
U+a000 Yi Syllables (0/1165) (0/1165) (0/1165)
U+a490 Yi Radicals (0/55) (0/55) (0/55)
U+a4d0 Lisu (0/48) (0/48) (0/48)
U+a500 Vai (0/300) (0/300) (0/300)
U+a640 Cyrillic Extended-B 38% (31/80) 12% (10/80) (0/80)
U+a6a0 Bamum (0/88) (0/88) (0/88)
U+a700 Modifier Tone Letters 62% (20/32) 62% (20/32) 62% (20/32)
U+a720 Latin Extended-D 48% (62/129) 42% (55/129) 10% (14/129)
U+a800 Syloti Nagri (0/44) (0/44) (0/44)
U+a830 Common Indic Number Forms (0/10) (0/10) (0/10)
U+a840 Phags-pa (0/56) (0/56) (0/56)
U+a880 Saurashtra (0/81) (0/81) (0/81)
U+a8e0 Devanagari Extended (0/28) (0/28) (0/28)
U+a900 Kayah Li (0/48) (0/48) (0/48)
U+a930 Rejang (0/37) (0/37) (0/37)
U+a960 Hangul Jamo Extended-A (0/29) (0/29) (0/29)
U+a980 Javanese (0/91) (0/91) (0/91)
U+aa00 Cham (0/83) (0/83) (0/83)
U+aa60 Myanmar Extended-A (0/28) (0/28) (0/28)
U+aa80 Tai Viet (0/72) (0/72) (0/72)
U+ab00 Ethiopic Extended-A (0/33) (0/33) (0/33)
U+abc0 Meetei Mayek (0/56) (0/56) (0/56)
U+ac00 Hangul Syllables (0/0) (0/0) (0/0)
U+d7b0 Hangul Jamo Extended-B (0/72) (0/72) (0/72)
U+d800 High Surrogates (0/0) (0/0) (0/0)
U+db80 High Private Use Surrogates (0/0) (0/0) (0/0)
U+dc00 Low Surrogates (0/0) (0/0) (0/0)
U+e000 Private Use Area (0/0) (0/0) (0/0)
U+f900 CJK Compatibility Ideographs (0/470) (0/470) (0/470)
U+fb00 Alphabetic Presentation Forms 100% (58/58) 12% (7/58) 3% (2/58)
U+fb50 Arabic Presentation Forms-A 16% (98/611) (0/611) 11% (72/611)
U+fe00 Variation Selectors 100% (16/16) 100% (16/16) (0/16)
U+fe10 Vertical Forms (0/10) (0/10) (0/10)
U+fe20 Combining Half Marks 57% (4/7) (0/7) (0/7)
U+fe30 CJK Compatibility Forms (0/32) (0/32) (0/32)
U+fe50 Small Form Variants (0/26) (0/26) (0/26)
U+fe70 Arabic Presentation Forms-B 100% (141/141) (0/141) 100% (141/141)
U+ff00 Halfwidth and Fullwidth Forms (0/225) (0/225) (0/225)
U+fff0 Specials 100% (5/5) 100% (5/5) 100% (5/5)
U+10000 Linear B Syllabary (0/88) (0/88) (0/88)
U+10080 Linear B Ideograms (0/123) (0/123) (0/123)
U+10100 Aegean Numbers (0/57) (0/57) (0/57)
U+10140 Ancient Greek Numbers (0/75) (0/75) (0/75)
U+10190 Ancient Symbols (0/12) (0/12) (0/12)
U+101d0 Phaistos Disc (0/46) (0/46) (0/46)
U+10280 Lycian (0/29) (0/29) (0/29)
U+102a0 Carian (0/49) (0/49) (0/49)
U+10300 Old Italic 100% (35/35) (0/35) (0/35)
U+10330 Gothic (0/27) (0/27) (0/27)
U+10380 Ugaritic (0/31) (0/31) (0/31)
U+103a0 Old Persian (0/50) (0/50) (0/50)
U+10400 Deseret (0/80) (0/80) (0/80)
U+10450 Shavian (0/48) (0/48) (0/48)
U+10480 Osmanya (0/40) (0/40) (0/40)
U+10800 Cypriot Syllabary (0/55) (0/55) (0/55)
U+10840 Imperial Aramaic (0/31) (0/31) (0/31)
U+10900 Phoenician (0/29) (0/29) (0/29)
U+10920 Lydian (0/27) (0/27) (0/27)
U+10a00 Kharoshthi (0/65) (0/65) (0/65)
U+10a60 Old South Arabian (0/32) (0/32) (0/32)
U+10b00 Avestan (0/61) (0/61) (0/61)
U+10b40 Inscriptional Parthian (0/30) (0/30) (0/30)
U+10b60 Inscriptional Pahlavi (0/27) (0/27) (0/27)
U+10c00 Old Turkic (0/73) (0/73) (0/73)
U+10e60 Rumi Numeral Symbols (0/31) (0/31) (0/31)
U+11000 Brahmi (0/108) (0/108) (0/108)
U+11080 Kaithi (0/66) (0/66) (0/66)
U+12000 Cuneiform (0/879) (0/879) (0/879)
U+12400 Cuneiform Numbers and Punctuation (0/103) (0/103) (0/103)
U+13000 Egyptian Hieroglyphs (0/1071) (0/1071) (0/1071)
U+16800 Bamum Supplement (0/569) (0/569) (0/569)
U+1b000 Kana Supplement (0/2) (0/2) (0/2)
U+1d000 Byzantine Musical Symbols (0/246) (0/246) (0/246)
U+1d100 Musical Symbols (0/220) (0/220) (0/220)
U+1d200 Ancient Greek Musical Notation (0/70) (0/70) (0/70)
U+1d300 Tai Xuan Jing Symbols 100% (87/87) (0/87) (0/87)
U+1d360 Counting Rod Numerals (0/18) (0/18) (0/18)
U+1d400 Mathematical Alphanumeric Symbols 11% (117/996) 5% (55/996) 6% (62/996)
U+1f000 Mahjong Tiles (0/44) (0/44) (0/44)
U+1f030 Domino Tiles 100% (100/100) (0/100) (0/100)
U+1f0a0 Playing Cards 100% (59/59) (0/59) (0/59)
U+1f100 Enclosed Alphanumeric Supplement (0/169) (0/169) (0/169)
U+1f200 Enclosed Ideographic Supplement (0/57) (0/57) (0/57)
U+1f300 Miscellaneous Symbols And Pictographs 0% (4/529) (0/529) (0/529)
U+1f600 Emoticons 80% (51/63) (0/63) (0/63)
U+1f680 Transport And Map Symbols (0/70) (0/70) (0/70)
U+1f700 Alchemical Symbols (0/116) (0/116) (0/116)
U+20000 CJK Unified Ideographs Extension B (0/0) (0/0) (0/0)
U+2a700 CJK Unified Ideographs Extension C (0/0) (0/0) (0/0)
U+2b740 CJK Unified Ideographs Extension D (0/0) (0/0) (0/0)
U+2f800 CJK Compatibility Ideographs Supplement (0/542) (0/542) (0/542)
U+e0000 Tags (0/98) (0/98) (0/98)
U+e0100 Variation Selectors Supplement (0/240) (0/240) (0/240)
U+f0000 Supplementary Private Use Area-A (0/0) (0/0) (0/0)
U+100000 Supplementary Private Use Area-B (0/0) (0/0) (0/0)

View file

@ -0,0 +1,54 @@
abysta at yandex.ru
Adrian Schroeter
Aleksey Chalabyan
Andrey Valentinovich Panov
Ben Laenen
Besarion Gugushvili
Bhikkhu Pesala
Clayborne Arevalo
Dafydd Harries
Danilo Segan
Davide Viti
David Jez
David Lawrence Ramsey
Denis Jacquerye
Dwayne Bailey
Eugeniy Meshcheryakov
Gee Fung Sit
Heikki Lindroos
James Cloos
James Crippen
John Karp
Keenan Pepper
Lars Naesbye Christensen
Lior Halphon
MaEr
Mashrab Kuvatov
Max Berger
Mederic Boquien
Michael Everson
MihailJP
Misu Moldovan
Nguyen Thai Ngoc Duy
Nicolas Mailhot
Norayr Chilingarian
Ognyan Kulev
Ondrej Koala Vacha
Peter Cernak
Remy Oudompheng
Roozbeh Pournader
Rouben Hakobian
Sahak Petrosyan
Sander Vesik
Stepan Roh
Stephen Hartke
Steve Tinney
Tavmjong Bah
Thomas Henlich
Tim May
Valentin Stoykov
Vasek Stodulka
Wesley Transue
Yoshiki Ohshima
$Id: AUTHORS 2495 2011-11-14 22:56:26Z noct_dreamer $

View file

@ -0,0 +1,3 @@
See http://dejavu.sourceforge.net/wiki/index.php/Bugs
$Id: BUGS 80 2004-11-13 13:12:02Z src $

View file

@ -0,0 +1,99 @@
Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
Bitstream Vera Fonts Copyright
------------------------------
Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
a trademark of Bitstream, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of the fonts accompanying this license ("Fonts") and associated
documentation files (the "Font Software"), to reproduce and distribute the
Font Software, including without limitation the rights to use, copy, merge,
publish, distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to the
following conditions:
The above copyright and trademark notices and this permission notice shall
be included in all copies of one or more of the Font Software typefaces.
The Font Software may be modified, altered, or added to, and in particular
the designs of glyphs or characters in the Fonts may be modified and
additional glyphs or characters may be added to the Fonts, only if the fonts
are renamed to names not containing either the words "Bitstream" or the word
"Vera".
This License becomes null and void to the extent applicable to Fonts or Font
Software that has been modified and is distributed under the "Bitstream
Vera" names.
The Font Software may be sold as part of a larger software package but no
copy of one or more of the Font Software typefaces may be sold by itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
FONT SOFTWARE.
Except as contained in this notice, the names of Gnome, the Gnome
Foundation, and Bitstream Inc., shall not be used in advertising or
otherwise to promote the sale, use or other dealings in this Font Software
without prior written authorization from the Gnome Foundation or Bitstream
Inc., respectively. For further information, contact: fonts at gnome dot
org.
Arev Fonts Copyright
------------------------------
Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
Permission is hereby granted, free of charge, to any person obtaining
a copy of the fonts accompanying this license ("Fonts") and
associated documentation files (the "Font Software"), to reproduce
and distribute the modifications to the Bitstream Vera Font Software,
including without limitation the rights to use, copy, merge, publish,
distribute, and/or sell copies of the Font Software, and to permit
persons to whom the Font Software is furnished to do so, subject to
the following conditions:
The above copyright and trademark notices and this permission notice
shall be included in all copies of one or more of the Font Software
typefaces.
The Font Software may be modified, altered, or added to, and in
particular the designs of glyphs or characters in the Fonts may be
modified and additional glyphs or characters may be added to the
Fonts, only if the fonts are renamed to names not containing either
the words "Tavmjong Bah" or the word "Arev".
This License becomes null and void to the extent applicable to Fonts
or Font Software that has been modified and is distributed under the
"Tavmjong Bah Arev" names.
The Font Software may be sold as part of a larger software package but
no copy of one or more of the Font Software typefaces may be sold by
itself.
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Except as contained in this notice, the name of Tavmjong Bah shall not
be used in advertising or otherwise to promote the sale, use or other
dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,59 @@
DejaVu fonts 2.34 (c)2004-2013 DejaVu fonts team
------------------------------------------------
The DejaVu fonts are a font family based on the Bitstream Vera Fonts
(http://gnome.org/fonts/). Its purpose is to provide a wider range of
characters (see status.txt for more information) while maintaining the
original look and feel.
DejaVu fonts are based on Bitstream Vera fonts version 1.10.
Available fonts (Sans = sans serif, Mono = monospaced):
DejaVu Sans Mono
DejaVu Sans Mono Bold
DejaVu Sans Mono Bold Oblique
DejaVu Sans Mono Oblique
DejaVu Sans
DejaVu Sans Bold
DejaVu Sans Bold Oblique
DejaVu Sans Oblique
DejaVu Sans ExtraLight (experimental)
DejaVu Serif
DejaVu Serif Bold
DejaVu Serif Bold Italic (experimental)
DejaVu Serif Italic (experimental)
DejaVu Sans Condensed (experimental)
DejaVu Sans Condensed Bold (experimental)
DejaVu Sans Condensed Bold Oblique (experimental)
DejaVu Sans Condensed Oblique (experimental)
DejaVu Serif Condensed (experimental)
DejaVu Serif Condensed Bold (experimental)
DejaVu Serif Condensed Bold Italic (experimental)
DejaVu Serif Condensed Italic (experimental)
All fonts are also available as derivative called DejaVu LGC with support
only for Latin, Greek and Cyrillic scripts.
For license information see LICENSE. What's new is described in NEWS. Known
bugs are in BUGS. All authors are mentioned in AUTHORS.
Fonts are published in source form as SFD files (Spline Font Database from
FontForge - http://fontforge.sf.net/) and in compiled form as TTF files
(TrueType fonts).
For more information go to http://dejavu.sourceforge.net/.
Characters from Arev fonts, Copyright (c) 2006 by Tavmjong Bah:
---------------------------
U+01BA, U+01BF, U+01F7, U+021C-U+021D, U+0220, U+0222-U+0223,
U+02B9, U+02BA, U+02BD, U+02C2-U+02C5, U+02d4-U+02D5,
U+02D7, U+02EC-U+02EE, U+0346-U+034E, U+0360, U+0362,
U+03E2-03EF, U+0460-0463, U+0466-U+0486, U+0488-U+0489, U+04A8-U+04A9,
U+0500-U+050F, U+2055-205E, U+20B0, U+20B2-U+20B3, U+2102, U+210D, U+210F,
U+2111, U+2113, U+2115, U+2118-U+211A, U+211C-U+211D, U+2124, U+2135,
U+213C-U+2140, U+2295-U+2298, U+2308-U+230B, U+26A2-U+26B1, U+2701-U+2704,
U+2706-U+2709, U+270C-U+274B, U+2758-U+275A, U+2761-U+2775, U+2780-U+2794,
U+2798-U+27AF, U+27B1-U+27BE, U+FB05-U+FB06
$Id: README 2535 2013-08-25 15:21:17Z moyogo $

View file

@ -0,0 +1,249 @@
This is the language coverage file for DejaVu fonts
($Id: langcover.txt 2538 2013-08-25 16:02:56Z moyogo $)
Sans Serif Sans Mono
aa Afar 100% (62/62) 100% (62/62) 100% (62/62)
ab Abkhazia 100% (90/90) 93% (84/90) 84% (76/90)
af Afrikaans 100% (69/69) 100% (69/69) 100% (69/69)
ak Akan 100% (73/73) 100% (73/73) 100% (73/73)
am Amharic (0/264) (0/264) (0/264)
an Aragonese 100% (66/66) 100% (66/66) 100% (66/66)
ar Arabic 100% (36/36) (0/36) 100% (36/36)
as Assamese (0/64) (0/64) (0/64)
ast Asturian/Bable/Leonese/Asturleonese 100% (70/70) 100% (70/70) 100% (70/70)
av Avaric 100% (67/67) 100% (67/67) 100% (67/67)
ay Aymara 100% (60/60) 100% (60/60) 100% (60/60)
az-az Azerbaijani in Azerbaijan 100% (66/66) 100% (66/66) 100% (66/66)
az-ir Azerbaijani in Iran 100% (40/40) (0/40) 100% (40/40)
ba Bashkir 100% (82/82) 100% (82/82) 97% (80/82)
be Byelorussian 100% (68/68) 100% (68/68) 100% (68/68)
ber-dz Berber in Algeria 100% (70/70) 100% (70/70) 100% (70/70)
ber-ma Berber in Morocco 100% (32/32) (0/32) (0/32)
bg Bulgarian 100% (60/60) 100% (60/60) 100% (60/60)
bh Bihari (Devanagari script) (0/68) (0/68) (0/68)
bho Bhojpuri (Devanagari script) (0/68) (0/68) (0/68)
bi Bislama 100% (58/58) 100% (58/58) 100% (58/58)
bin Edo or Bini 100% (78/78) 100% (78/78) 100% (78/78)
bm Bambara 100% (60/60) 100% (60/60) 100% (60/60)
bn Bengali (0/63) (0/63) (0/63)
bo Tibetan (0/95) (0/95) (0/95)
br Breton 100% (64/64) 100% (64/64) 100% (64/64)
brx Bodo (Devanagari script) (0/82) (0/82) (0/82)
bs Bosnian 100% (62/62) 100% (62/62) 100% (62/62)
bua Buriat (Buryat) 100% (70/70) 100% (70/70) 100% (70/70)
byn Blin/Bilin (0/255) (0/255) (0/255)
ca Catalan 100% (74/74) 100% (74/74) 100% (74/74)
ce Chechen 100% (67/67) 100% (67/67) 100% (67/67)
ch Chamorro 100% (58/58) 100% (58/58) 100% (58/58)
chm Mari (Lower Cheremis / Upper Cheremis) 100% (76/76) 100% (76/76) 100% (76/76)
chr Cherokee (0/85) (0/85) (0/85)
co Corsican 100% (84/84) 100% (84/84) 100% (84/84)
crh Crimean Tatar/Crimean Turkish 100% (68/68) 100% (68/68) 100% (68/68)
cs Czech 100% (82/82) 100% (82/82) 100% (82/82)
csb Kashubian 100% (74/74) 100% (74/74) 100% (74/74)
cu Old Church Slavonic 100% (103/103) 90% (93/103) 78% (81/103)
cv Chuvash 100% (74/74) 100% (74/74) 100% (74/74)
cy Welsh 100% (78/78) 100% (78/78) 100% (78/78)
da Danish 100% (70/70) 100% (70/70) 100% (70/70)
de German 100% (59/59) 100% (59/59) 100% (59/59)
doi Dogri (0/85) (0/85) (0/85)
dv Divehi/Dhivehi/Maldivian (0/49) (0/49) (0/49)
dz Dzongkha (0/95) (0/95) (0/95)
ee Ewe 100% (99/99) 100% (99/99) 100% (99/99)
el Greek 100% (69/69) 100% (69/69) 100% (69/69)
en English 100% (72/72) 100% (72/72) 100% (72/72)
eo Esperanto 100% (64/64) 100% (64/64) 100% (64/64)
es Spanish 100% (66/66) 100% (66/66) 100% (66/66)
et Estonian 100% (64/64) 100% (64/64) 100% (64/64)
eu Basque 100% (56/56) 100% (56/56) 100% (56/56)
fa Persian 100% (40/40) (0/40) 100% (40/40)
fat Fanti 100% (73/73) 100% (73/73) 100% (73/73)
ff Fulah (Fula) 100% (62/62) 100% (62/62) 100% (62/62)
fi Finnish 100% (62/62) 100% (62/62) 100% (62/62)
fil Filipino 100% (84/84) 100% (84/84) 100% (84/84)
fj Fijian 100% (52/52) 100% (52/52) 100% (52/52)
fo Faroese 100% (68/68) 100% (68/68) 100% (68/68)
fr French 100% (84/84) 100% (84/84) 100% (84/84)
fur Friulian 100% (66/66) 100% (66/66) 100% (66/66)
fy Frisian 100% (75/75) 100% (75/75) 100% (75/75)
ga Irish 100% (80/80) 100% (80/80) 100% (80/80)
gd Scots Gaelic 100% (70/70) 100% (70/70) 100% (70/70)
gez Ethiopic (Geez) (0/218) (0/218) (0/218)
gl Galician 100% (66/66) 100% (66/66) 100% (66/66)
gn Guarani 100% (70/70) 100% (70/70) 100% (70/70)
gu Gujarati (0/68) (0/68) (0/68)
gv Manx Gaelic 100% (54/54) 100% (54/54) 100% (54/54)
ha Hausa 100% (60/60) 100% (60/60) 100% (60/60)
haw Hawaiian 100% (63/63) 100% (63/63) 100% (63/63)
he Hebrew 100% (27/27) (0/27) (0/27)
hi Hindi (Devanagari script) (0/68) (0/68) (0/68)
hne Chhattisgarhi (0/68) (0/68) (0/68)
ho Hiri Motu 100% (52/52) 100% (52/52) 100% (52/52)
hr Croatian 100% (62/62) 100% (62/62) 100% (62/62)
hsb Upper Sorbian 100% (72/72) 100% (72/72) 100% (72/72)
ht Haitian/Haitian Creole 100% (56/56) 100% (56/56) 100% (56/56)
hu Hungarian 100% (70/70) 100% (70/70) 100% (70/70)
hy Armenian 100% (77/77) 100% (77/77) 100% (77/77)
hz Herero 100% (57/57) 100% (57/57) 100% (57/57)
ia Interlingua 100% (52/52) 100% (52/52) 100% (52/52)
id Indonesian 100% (54/54) 100% (54/54) 100% (54/54)
ie Interlingue 100% (52/52) 100% (52/52) 100% (52/52)
ig Igbo 100% (58/58) 100% (58/58) 100% (58/58)
ii Sichuan Yi/Nuosu (0/1165) (0/1165) (0/1165)
ik Inupiaq (Inupiak, Eskimo) 100% (68/68) 100% (68/68) 100% (68/68)
io Ido 100% (52/52) 100% (52/52) 100% (52/52)
is Icelandic 100% (70/70) 100% (70/70) 100% (70/70)
it Italian 100% (72/72) 100% (72/72) 100% (72/72)
iu Inuktitut 100% (161/161) (0/161) (0/161)
ja Japanese (0/6537) (0/6537) (0/6537)
jv Javanese 100% (56/56) 100% (56/56) 100% (56/56)
ka Georgian 100% (33/33) 100% (33/33) 100% (33/33)
kaa Kara-Kalpak (Karakalpak) 100% (78/78) 100% (78/78) 100% (78/78)
kab Kabyle 100% (70/70) 100% (70/70) 100% (70/70)
ki Kikuyu 100% (56/56) 100% (56/56) 100% (56/56)
kj Kuanyama/Kwanyama 100% (52/52) 100% (52/52) 100% (52/52)
kk Kazakh 100% (77/77) 100% (77/77) 100% (77/77)
kl Greenlandic 100% (81/81) 100% (81/81) 100% (81/81)
km Central Khmer (0/63) (0/63) (0/63)
kn Kannada (0/70) (0/70) (0/70)
ko Korean (0/2443) (0/2443) (0/2443)
kok Kokani (Devanagari script) (0/68) (0/68) (0/68)
kr Kanuri 100% (56/56) 100% (56/56) 100% (56/56)
ks Kashmiri 78% (26/33) (0/33) 69% (23/33)
ku-am Kurdish in Armenia 100% (64/64) 100% (64/64) 100% (64/64)
ku-iq Kurdish in Iraq 100% (32/32) (0/32) 87% (28/32)
ku-ir Kurdish in Iran 100% (32/32) (0/32) 87% (28/32)
ku-tr Kurdish in Turkey 100% (62/62) 100% (62/62) 100% (62/62)
kum Kumyk 100% (66/66) 100% (66/66) 100% (66/66)
kv Komi (Komi-Permyak/Komi-Siryan) 100% (70/70) 100% (70/70) 100% (70/70)
kw Cornish 100% (64/64) 100% (64/64) 100% (64/64)
kwm Kwambi 100% (52/52) 100% (52/52) 100% (52/52)
ky Kirgiz 100% (70/70) 100% (70/70) 100% (70/70)
la Latin 100% (68/68) 100% (68/68) 100% (68/68)
lah Lahnda 92% (25/27) (0/27) 85% (23/27)
lb Luxembourgish (Letzeburgesch) 100% (75/75) 100% (75/75) 100% (75/75)
lez Lezghian (Lezgian) 100% (67/67) 100% (67/67) 100% (67/67)
lg Ganda 100% (54/54) 100% (54/54) 100% (54/54)
li Limburgan/Limburger/Limburgish 100% (62/62) 100% (62/62) 100% (62/62)
ln Lingala 100% (81/81) 100% (81/81) 100% (81/81)
lo Lao 100% (55/55) (0/55) 83% (46/55)
lt Lithuanian 100% (70/70) 100% (70/70) 100% (70/70)
lv Latvian 100% (78/78) 100% (78/78) 100% (78/78)
mai Maithili (Devanagari script) (0/68) (0/68) (0/68)
mg Malagasy 100% (56/56) 100% (56/56) 100% (56/56)
mh Marshallese 100% (62/62) 100% (62/62) 100% (62/62)
mi Maori 100% (64/64) 100% (64/64) 100% (64/64)
mk Macedonian 100% (42/42) 100% (42/42) 100% (42/42)
ml Malayalam (0/68) (0/68) (0/68)
mn-cn Mongolian in China (0/130) (0/130) (0/130)
mn-mn Mongolian in Mongolia 100% (70/70) 100% (70/70) 100% (70/70)
mni Maniputi (0/78) (0/78) (0/78)
mo Moldavian 100% (128/128) 100% (128/128) 100% (128/128)
mr Marathi (Devanagari script) (0/68) (0/68) (0/68)
ms Malay 100% (52/52) 100% (52/52) 100% (52/52)
mt Maltese 100% (72/72) 100% (72/72) 100% (72/72)
my Burmese (Myanmar) (0/48) (0/48) (0/48)
na Nauru 100% (60/60) 100% (60/60) 100% (60/60)
nb Norwegian Bokmal 100% (70/70) 100% (70/70) 100% (70/70)
nds Low Saxon 100% (59/59) 100% (59/59) 100% (59/59)
ne Nepali (0/72) (0/72) (0/72)
ng Ndonga 100% (52/52) 100% (52/52) 100% (52/52)
nl Dutch 100% (82/82) 100% (82/82) 100% (82/82)
nn Norwegian Nynorsk 100% (76/76) 100% (76/76) 100% (76/76)
no Norwegian (Bokmal) 100% (70/70) 100% (70/70) 100% (70/70)
nqo N'Ko 91% (54/59) (0/59) (0/59)
nr Ndebele, South 100% (52/52) 100% (52/52) 100% (52/52)
nso Northern Sotho 100% (58/58) 100% (58/58) 100% (58/58)
nv Navajo/Navaho 100% (72/72) 100% (72/72) 100% (72/72)
ny Chichewa 100% (54/54) 100% (54/54) 100% (54/54)
oc Occitan 100% (70/70) 100% (70/70) 100% (70/70)
om Oromo or Galla 100% (52/52) 100% (52/52) 100% (52/52)
or Oriya (0/68) (0/68) (0/68)
os Ossetic 100% (66/66) 100% (66/66) 100% (66/66)
ota Ottoman Turkish 100% (37/37) (0/37) 97% (36/37)
pa Panjabi/Punjabi (0/63) (0/63) (0/63)
pa-pk Panjabi/Punjabi in Pakistan 92% (25/27) (0/27) 85% (23/27)
pap-an Papiamento in Netherlands Antilles 100% (72/72) 100% (72/72) 100% (72/72)
pap-aw Papiamento in Aruba 100% (54/54) 100% (54/54) 100% (54/54)
pes Western Farsi 100% (40/40) (0/40) 100% (40/40)
pl Polish 100% (70/70) 100% (70/70) 100% (70/70)
prs Dari/Eastern Farsi 100% (40/40) (0/40) 100% (40/40)
ps-af Pashto in Afghanistan 95% (47/49) (0/49) 77% (38/49)
ps-pk Pashto in Pakistan 93% (46/49) (0/49) 75% (37/49)
pt Portuguese 100% (82/82) 100% (82/82) 100% (82/82)
qu Quechua 100% (55/55) 100% (55/55) 100% (55/55)
rm Rhaeto-Romance (Romansch) 100% (66/66) 100% (66/66) 100% (66/66)
rn Rundi 100% (52/52) 100% (52/52) 100% (52/52)
ro Romanian 100% (62/62) 100% (62/62) 100% (62/62)
ru Russian 100% (66/66) 100% (66/66) 100% (66/66)
rw Kinyarwanda 100% (52/52) 100% (52/52) 100% (52/52)
sa Sanskrit (Devanagari script) (0/68) (0/68) (0/68)
sah Yakut 100% (76/76) 100% (76/76) 100% (76/76)
sat Santali (Devanagari script) (0/70) (0/70) (0/70)
sc Sardinian 100% (62/62) 100% (62/62) 100% (62/62)
sco Scots 100% (56/56) 100% (56/56) 100% (56/56)
sd Sindhi 100% (54/54) (0/54) 79% (43/54)
se North Sami 100% (66/66) 100% (66/66) 100% (66/66)
sel Selkup (Ostyak-Samoyed) 100% (66/66) 100% (66/66) 100% (66/66)
sg Sango 100% (72/72) 100% (72/72) 100% (72/72)
sh Serbo-Croatian 100% (156/156) 100% (156/156) 98% (154/156)
shs Secwepemctsin 100% (48/48) 100% (48/48) 100% (48/48)
si Sinhala/Sinhalese (0/73) (0/73) (0/73)
sid Sidamo (0/281) (0/281) (0/281)
sk Slovak 100% (86/86) 100% (86/86) 100% (86/86)
sl Slovenian 100% (62/62) 100% (62/62) 100% (62/62)
sm Samoan 100% (53/53) 100% (53/53) 100% (53/53)
sma South Sami 100% (60/60) 100% (60/60) 100% (60/60)
smj Lule Sami 100% (60/60) 100% (60/60) 100% (60/60)
smn Inari Sami 100% (68/68) 100% (68/68) 100% (68/68)
sms Skolt Sami 100% (80/80) 100% (80/80) 97% (78/80)
sn Shona 100% (52/52) 100% (52/52) 100% (52/52)
so Somali 100% (52/52) 100% (52/52) 100% (52/52)
sq Albanian 100% (56/56) 100% (56/56) 100% (56/56)
sr Serbian 100% (60/60) 100% (60/60) 100% (60/60)
ss Swati 100% (52/52) 100% (52/52) 100% (52/52)
st Sotho, Southern 100% (52/52) 100% (52/52) 100% (52/52)
su Sundanese 100% (54/54) 100% (54/54) 100% (54/54)
sv Swedish 100% (68/68) 100% (68/68) 100% (68/68)
sw Swahili 100% (52/52) 100% (52/52) 100% (52/52)
syr Syriac (0/45) (0/45) (0/45)
ta Tamil (0/48) (0/48) (0/48)
te Telugu (0/70) (0/70) (0/70)
tg Tajik 100% (78/78) 100% (78/78) 97% (76/78)
th Thai 1% (1/74) (0/74) (0/74)
ti-er Eritrean Tigrinya (0/255) (0/255) (0/255)
ti-et Ethiopian Tigrinya (0/281) (0/281) (0/281)
tig Tigre (0/221) (0/221) (0/221)
tk Turkmen 100% (68/68) 100% (68/68) 100% (68/68)
tl Tagalog 100% (84/84) 100% (84/84) 100% (84/84)
tn Tswana 100% (58/58) 100% (58/58) 100% (58/58)
to Tonga 100% (53/53) 100% (53/53) 100% (53/53)
tr Turkish 100% (70/70) 100% (70/70) 100% (70/70)
ts Tsonga 100% (52/52) 100% (52/52) 100% (52/52)
tt Tatar 100% (76/76) 100% (76/76) 100% (76/76)
tw Twi 100% (73/73) 100% (73/73) 100% (73/73)
ty Tahitian 100% (65/65) 100% (65/65) 100% (65/65)
tyv Tuvinian 100% (70/70) 100% (70/70) 100% (70/70)
ug Uyghur 87% (29/33) (0/33) 78% (26/33)
uk Ukrainian 100% (72/72) 100% (72/72) 100% (72/72)
ur Urdu 92% (25/27) (0/27) 85% (23/27)
uz Uzbek 100% (52/52) 100% (52/52) 100% (52/52)
ve Venda 100% (62/62) 100% (62/62) 100% (62/62)
vi Vietnamese 100% (194/194) 100% (194/194) 76% (148/194)
vo Volapuk 100% (54/54) 100% (54/54) 100% (54/54)
vot Votic 100% (62/62) 100% (62/62) 100% (62/62)
wa Walloon 100% (70/70) 100% (70/70) 100% (70/70)
wal Wolaitta/Wolaytta (0/281) (0/281) (0/281)
wen Sorbian languages (lower and upper) 100% (76/76) 100% (76/76) 100% (76/76)
wo Wolof 100% (66/66) 100% (66/66) 100% (66/66)
xh Xhosa 100% (52/52) 100% (52/52) 100% (52/52)
yap Yapese 100% (58/58) 100% (58/58) 100% (58/58)
yi Yiddish 100% (27/27) (0/27) (0/27)
yo Yoruba 100% (119/119) 100% (119/119) 100% (119/119)
za Zhuang/Chuang 100% (52/52) 100% (52/52) 100% (52/52)
zh-cn Chinese (simplified) 0% (2/6765) 0% (2/6765) 0% (2/6765)
zh-hk Chinese Hong Kong Supplementary Character Set (0/2213) (0/2213) (0/2213)
zh-mo Chinese in Macau (0/2213) (0/2213) (0/2213)
zh-sg Chinese in Singapore 0% (2/6765) 0% (2/6765) 0% (2/6765)
zh-tw Chinese (traditional) (0/13063) (0/13063) (0/13063)
zu Zulu 100% (52/52) 100% (52/52) 100% (52/52)

View file

@ -0,0 +1,226 @@
This is the Unicode coverage file for DejaVu fonts
($Id: unicover.txt 2538 2013-08-25 16:02:56Z moyogo $)
Control and similar characters are discounted from totals.
Sans Serif Sans Mono
U+0000 Basic Latin 100% (95/95) 100% (95/95) 100% (95/95)
U+0080 Latin-1 Supplement 100% (96/96) 100% (96/96) 100% (96/96)
U+0100 Latin Extended-A 100% (128/128) 100% (128/128) 100% (128/128)
U+0180 Latin Extended-B 100% (208/208) 100% (208/208) 86% (180/208)
U+0250 IPA Extensions 100% (96/96) 100% (96/96) 100% (96/96)
U+02b0 Spacing Modifier Letters 78% (63/80) 73% (59/80) 62% (50/80)
U+0300 Combining Diacritical Marks 83% (93/112) 61% (69/112) 59% (67/112)
U+0370 Greek and Coptic 100% (134/134) 89% (120/134) 82% (110/134)
U+0400 Cyrillic 100% (256/256) 79% (204/256) 70% (180/256)
U+0500 Cyrillic Supplement 95% (38/40) 25% (10/40) 15% (6/40)
U+0530 Armenian 98% (86/87) 98% (86/87) 98% (86/87)
U+0590 Hebrew 62% (54/87) (0/87) (0/87)
U+0600 Arabic 63% (161/253) (0/253) 39% (99/253)
U+0700 Syriac (0/77) (0/77) (0/77)
U+0750 Arabic Supplement (0/48) (0/48) (0/48)
U+0780 Thaana (0/50) (0/50) (0/50)
U+07c0 NKo 91% (54/59) (0/59) (0/59)
U+0800 Samaritan (0/61) (0/61) (0/61)
U+0840 Mandaic (0/29) (0/29) (0/29)
U+08a0 Arabic Extended-A (0/39) (0/39) (0/39)
U+0900 Devanagari (0/127) (0/127) (0/127)
U+0980 Bengali (0/92) (0/92) (0/92)
U+0a00 Gurmukhi (0/79) (0/79) (0/79)
U+0a80 Gujarati (0/84) (0/84) (0/84)
U+0b00 Oriya (0/90) (0/90) (0/90)
U+0b80 Tamil (0/72) (0/72) (0/72)
U+0c00 Telugu (0/93) (0/93) (0/93)
U+0c80 Kannada (0/86) (0/86) (0/86)
U+0d00 Malayalam (0/98) (0/98) (0/98)
U+0d80 Sinhala (0/80) (0/80) (0/80)
U+0e00 Thai 1% (1/87) (0/87) (0/87)
U+0e80 Lao 97% (65/67) (0/67) 68% (46/67)
U+0f00 Tibetan (0/211) (0/211) (0/211)
U+1000 Myanmar (0/160) (0/160) (0/160)
U+10a0 Georgian 94% (83/88) 94% (83/88) 51% (45/88)
U+1100 Hangul Jamo (0/256) (0/256) (0/256)
U+1200 Ethiopic (0/358) (0/358) (0/358)
U+1380 Ethiopic Supplement (0/26) (0/26) (0/26)
U+13a0 Cherokee (0/85) (0/85) (0/85)
U+1400 Unified Canadian Aboriginal Syllabics 63% (404/640) (0/640) (0/640)
U+1680 Ogham 100% (29/29) (0/29) (0/29)
U+16a0 Runic (0/81) (0/81) (0/81)
U+1700 Tagalog (0/20) (0/20) (0/20)
U+1720 Hanunoo (0/23) (0/23) (0/23)
U+1740 Buhid (0/20) (0/20) (0/20)
U+1760 Tagbanwa (0/18) (0/18) (0/18)
U+1780 Khmer (0/114) (0/114) (0/114)
U+1800 Mongolian (0/156) (0/156) (0/156)
U+18b0 Unified Canadian Aboriginal Syllabics Extended (0/70) (0/70) (0/70)
U+1900 Limbu (0/66) (0/66) (0/66)
U+1950 Tai Le (0/35) (0/35) (0/35)
U+1980 New Tai Lue (0/83) (0/83) (0/83)
U+19e0 Khmer Symbols (0/32) (0/32) (0/32)
U+1a00 Buginese (0/30) (0/30) (0/30)
U+1a20 Tai Tham (0/127) (0/127) (0/127)
U+1b00 Balinese (0/121) (0/121) (0/121)
U+1b80 Sundanese (0/64) (0/64) (0/64)
U+1bc0 Batak (0/56) (0/56) (0/56)
U+1c00 Lepcha (0/74) (0/74) (0/74)
U+1c50 Ol Chiki (0/48) (0/48) (0/48)
U+1cc0 Sundanese Supplement (0/8) (0/8) (0/8)
U+1cd0 Vedic Extensions (0/39) (0/39) (0/39)
U+1d00 Phonetic Extensions 82% (106/128) 89% (115/128) 48% (62/128)
U+1d80 Phonetic Extensions Supplement 59% (38/64) 59% (38/64) 57% (37/64)
U+1dc0 Combining Diacritical Marks Supplement 13% (6/43) 13% (6/43) (0/43)
U+1e00 Latin Extended Additional 98% (252/256) 98% (252/256) 71% (182/256)
U+1f00 Greek Extended 100% (233/233) 100% (233/233) 100% (233/233)
U+2000 General Punctuation 100% (107/107) 81% (87/107) 49% (53/107)
U+2070 Superscripts and Subscripts 100% (42/42) 100% (42/42) 100% (42/42)
U+20a0 Currency Symbols 92% (25/27) 29% (8/27) 88% (24/27)
U+20d0 Combining Diacritical Marks for Symbols 21% (7/33) (0/33) (0/33)
U+2100 Letterlike Symbols 93% (75/80) 42% (34/80) 22% (18/80)
U+2150 Number Forms 94% (55/58) 94% (55/58) 22% (13/58)
U+2190 Arrows 100% (112/112) 100% (112/112) 100% (112/112)
U+2200 Mathematical Operators 100% (256/256) 39% (100/256) 62% (159/256)
U+2300 Miscellaneous Technical 26% (65/244) 14% (35/244) 47% (117/244)
U+2400 Control Pictures 5% (2/39) 2% (1/39) 2% (1/39)
U+2440 Optical Character Recognition (0/11) (0/11) (0/11)
U+2460 Enclosed Alphanumerics 6% (10/160) (0/160) (0/160)
U+2500 Box Drawing 100% (128/128) 100% (128/128) 100% (128/128)
U+2580 Block Elements 100% (32/32) 100% (32/32) 100% (32/32)
U+25a0 Geometric Shapes 100% (96/96) 100% (96/96) 100% (96/96)
U+2600 Miscellaneous Symbols 73% (187/256) 11% (30/256) 58% (149/256)
U+2700 Dingbats 91% (174/191) 0% (1/191) 75% (144/191)
U+27c0 Miscellaneous Mathematical Symbols-A 18% (9/48) 10% (5/48) 16% (8/48)
U+27f0 Supplemental Arrows-A 100% (16/16) 100% (16/16) (0/16)
U+2800 Braille Patterns 100% (256/256) 100% (256/256) (0/256)
U+2900 Supplemental Arrows-B 4% (6/128) 100% (128/128) (0/128)
U+2980 Miscellaneous Mathematical Symbols-B 10% (13/128) 0% (1/128) 2% (3/128)
U+2a00 Supplemental Mathematical Operators 28% (74/256) 2% (6/256) 1% (3/256)
U+2b00 Miscellaneous Symbols and Arrows 40% (35/87) 31% (27/87) 20% (18/87)
U+2c00 Glagolitic (0/94) (0/94) (0/94)
U+2c60 Latin Extended-C 96% (31/32) 84% (27/32) 43% (14/32)
U+2c80 Coptic (0/123) (0/123) (0/123)
U+2d00 Georgian Supplement 95% (38/40) 95% (38/40) (0/40)
U+2d30 Tifinagh 93% (55/59) (0/59) (0/59)
U+2d80 Ethiopic Extended (0/79) (0/79) (0/79)
U+2de0 Cyrillic Extended-A (0/32) (0/32) (0/32)
U+2e00 Supplemental Punctuation 11% (7/60) 11% (7/60) 11% (7/60)
U+2e80 CJK Radicals Supplement (0/115) (0/115) (0/115)
U+2f00 Kangxi Radicals (0/214) (0/214) (0/214)
U+2ff0 Ideographic Description Characters (0/12) (0/12) (0/12)
U+3000 CJK Symbols and Punctuation (0/64) (0/64) (0/64)
U+3040 Hiragana (0/93) (0/93) (0/93)
U+30a0 Katakana (0/96) (0/96) (0/96)
U+3100 Bopomofo (0/41) (0/41) (0/41)
U+3130 Hangul Compatibility Jamo (0/94) (0/94) (0/94)
U+3190 Kanbun (0/16) (0/16) (0/16)
U+31a0 Bopomofo Extended (0/27) (0/27) (0/27)
U+31c0 CJK Strokes (0/36) (0/36) (0/36)
U+31f0 Katakana Phonetic Extensions (0/16) (0/16) (0/16)
U+3200 Enclosed CJK Letters and Months (0/254) (0/254) (0/254)
U+3300 CJK Compatibility (0/256) (0/256) (0/256)
U+3400 CJK Unified Ideographs Extension A (0/0) (0/0) (0/0)
U+4dc0 Yijing Hexagram Symbols 100% (64/64) (0/64) (0/64)
U+4e00 CJK Unified Ideographs (0/0) (0/0) (0/0)
U+a000 Yi Syllables (0/1165) (0/1165) (0/1165)
U+a490 Yi Radicals (0/55) (0/55) (0/55)
U+a4d0 Lisu 100% (48/48) (0/48) (0/48)
U+a500 Vai (0/300) (0/300) (0/300)
U+a640 Cyrillic Extended-B 34% (31/89) 11% (10/89) (0/89)
U+a6a0 Bamum (0/88) (0/88) (0/88)
U+a700 Modifier Tone Letters 62% (20/32) 62% (20/32) 62% (20/32)
U+a720 Latin Extended-D 55% (75/134) 43% (58/134) 11% (15/134)
U+a800 Syloti Nagri (0/44) (0/44) (0/44)
U+a830 Common Indic Number Forms (0/10) (0/10) (0/10)
U+a840 Phags-pa (0/56) (0/56) (0/56)
U+a880 Saurashtra (0/81) (0/81) (0/81)
U+a8e0 Devanagari Extended (0/28) (0/28) (0/28)
U+a900 Kayah Li (0/48) (0/48) (0/48)
U+a930 Rejang (0/37) (0/37) (0/37)
U+a960 Hangul Jamo Extended-A (0/29) (0/29) (0/29)
U+a980 Javanese (0/91) (0/91) (0/91)
U+aa00 Cham (0/83) (0/83) (0/83)
U+aa60 Myanmar Extended-A (0/28) (0/28) (0/28)
U+aa80 Tai Viet (0/72) (0/72) (0/72)
U+aae0 Meetei Mayek Extensions (0/23) (0/23) (0/23)
U+ab00 Ethiopic Extended-A (0/32) (0/32) (0/32)
U+abc0 Meetei Mayek (0/56) (0/56) (0/56)
U+ac00 Hangul Syllables (0/0) (0/0) (0/0)
U+d7b0 Hangul Jamo Extended-B (0/72) (0/72) (0/72)
U+d800 High Surrogates (0/0) (0/0) (0/0)
U+db80 High Private Use Surrogates (0/0) (0/0) (0/0)
U+dc00 Low Surrogates (0/0) (0/0) (0/0)
U+e000 Private Use Area (0/0) (0/0) (0/0)
U+f900 CJK Compatibility Ideographs (0/472) (0/472) (0/472)
U+fb00 Alphabetic Presentation Forms 100% (58/58) 12% (7/58) 3% (2/58)
U+fb50 Arabic Presentation Forms-A 16% (98/611) (0/611) 11% (72/611)
U+fe00 Variation Selectors 100% (16/16) 100% (16/16) (0/16)
U+fe10 Vertical Forms (0/10) (0/10) (0/10)
U+fe20 Combining Half Marks 57% (4/7) (0/7) (0/7)
U+fe30 CJK Compatibility Forms (0/32) (0/32) (0/32)
U+fe50 Small Form Variants (0/26) (0/26) (0/26)
U+fe70 Arabic Presentation Forms-B 100% (141/141) (0/141) 100% (141/141)
U+ff00 Halfwidth and Fullwidth Forms (0/225) (0/225) (0/225)
U+fff0 Specials 100% (5/5) 100% (5/5) 100% (5/5)
U+10000 Linear B Syllabary (0/88) (0/88) (0/88)
U+10080 Linear B Ideograms (0/123) (0/123) (0/123)
U+10100 Aegean Numbers (0/57) (0/57) (0/57)
U+10140 Ancient Greek Numbers (0/75) (0/75) (0/75)
U+10190 Ancient Symbols (0/12) (0/12) (0/12)
U+101d0 Phaistos Disc (0/46) (0/46) (0/46)
U+10280 Lycian (0/29) (0/29) (0/29)
U+102a0 Carian (0/49) (0/49) (0/49)
U+10300 Old Italic 100% (35/35) (0/35) (0/35)
U+10330 Gothic (0/27) (0/27) (0/27)
U+10380 Ugaritic (0/31) (0/31) (0/31)
U+103a0 Old Persian (0/50) (0/50) (0/50)
U+10400 Deseret (0/80) (0/80) (0/80)
U+10450 Shavian (0/48) (0/48) (0/48)
U+10480 Osmanya (0/40) (0/40) (0/40)
U+10800 Cypriot Syllabary (0/55) (0/55) (0/55)
U+10840 Imperial Aramaic (0/31) (0/31) (0/31)
U+10900 Phoenician (0/29) (0/29) (0/29)
U+10920 Lydian (0/27) (0/27) (0/27)
U+10980 Meroitic Hieroglyphs (0/32) (0/32) (0/32)
U+109a0 Meroitic Cursive (0/26) (0/26) (0/26)
U+10a00 Kharoshthi (0/65) (0/65) (0/65)
U+10a60 Old South Arabian (0/32) (0/32) (0/32)
U+10b00 Avestan (0/61) (0/61) (0/61)
U+10b40 Inscriptional Parthian (0/30) (0/30) (0/30)
U+10b60 Inscriptional Pahlavi (0/27) (0/27) (0/27)
U+10c00 Old Turkic (0/73) (0/73) (0/73)
U+10e60 Rumi Numeral Symbols (0/31) (0/31) (0/31)
U+11000 Brahmi (0/108) (0/108) (0/108)
U+11080 Kaithi (0/66) (0/66) (0/66)
U+110d0 Sora Sompeng (0/35) (0/35) (0/35)
U+11100 Chakma (0/67) (0/67) (0/67)
U+11180 Sharada (0/83) (0/83) (0/83)
U+11680 Takri (0/66) (0/66) (0/66)
U+12000 Cuneiform (0/879) (0/879) (0/879)
U+12400 Cuneiform Numbers and Punctuation (0/103) (0/103) (0/103)
U+13000 Egyptian Hieroglyphs (0/1071) (0/1071) (0/1071)
U+16800 Bamum Supplement (0/569) (0/569) (0/569)
U+16f00 Miao (0/133) (0/133) (0/133)
U+1b000 Kana Supplement (0/2) (0/2) (0/2)
U+1d000 Byzantine Musical Symbols (0/246) (0/246) (0/246)
U+1d100 Musical Symbols (0/220) (0/220) (0/220)
U+1d200 Ancient Greek Musical Notation (0/70) (0/70) (0/70)
U+1d300 Tai Xuan Jing Symbols 100% (87/87) (0/87) (0/87)
U+1d360 Counting Rod Numerals (0/18) (0/18) (0/18)
U+1d400 Mathematical Alphanumeric Symbols 11% (117/996) 5% (55/996) 6% (63/996)
U+1ee00 Arabic Mathematical Alphabetic Symbols (0/143) (0/143) (0/143)
U+1f000 Mahjong Tiles (0/44) (0/44) (0/44)
U+1f030 Domino Tiles 100% (100/100) (0/100) (0/100)
U+1f0a0 Playing Cards 100% (59/59) (0/59) (0/59)
U+1f100 Enclosed Alphanumeric Supplement (0/171) (0/171) (0/171)
U+1f200 Enclosed Ideographic Supplement (0/57) (0/57) (0/57)
U+1f300 Miscellaneous Symbols And Pictographs 0% (4/533) (0/533) (0/533)
U+1f600 Emoticons 82% (63/76) (0/76) (0/76)
U+1f680 Transport And Map Symbols (0/70) (0/70) (0/70)
U+1f700 Alchemical Symbols (0/116) (0/116) (0/116)
U+20000 CJK Unified Ideographs Extension B (0/0) (0/0) (0/0)
U+2a700 CJK Unified Ideographs Extension C (0/0) (0/0) (0/0)
U+2b740 CJK Unified Ideographs Extension D (0/0) (0/0) (0/0)
U+2f800 CJK Compatibility Ideographs Supplement (0/542) (0/542) (0/542)
U+e0000 Tags (0/98) (0/98) (0/98)
U+e0100 Variation Selectors Supplement (0/240) (0/240) (0/240)
U+f0000 Supplementary Private Use Area-A (0/0) (0/0) (0/0)
U+100000 Supplementary Private Use Area-B (0/0) (0/0) (0/0)

View file

@ -352,7 +352,7 @@ please contact mssridhar AT vsnl.com.
Noah Levitt found out that the Sinhalese fonts available on the site
<http://www.metta.lk/fonts/> are released under GNU GPL, or,
precisely, "Public Domain under GNU Licence Produced by DMS
precisely, "Public Domain under GNU Licence Produced by DMS
Electronics for The Sri Lanka Tipitaka Project" (taken from the font
comment), and took the effort of recoding the font to Unicode.

View file

@ -357,7 +357,7 @@ please contact mssridhar AT vsnl.com.
Noah Levitt found out that the Sinhalese fonts available on the site
<http://www.metta.lk/fonts/> are released under GNU GPL, or,
precisely, "Public Domain under GNU Licence Produced by DMS
precisely, "Public Domain under GNU Licence Produced by DMS
Electronics for The Sri Lanka Tipitaka Project" (taken from the font
comment), and took the effort of recoding the font to Unicode.

View file

@ -229,7 +229,7 @@ class Datamatrix {
/**
* This is the class constructor.
* Creates a datamatrix object
* @param $code (string) Code to represent using Datamatrix.
* @param string $code Code to represent using Datamatrix.
* @public
*/
public function __construct($code) {
@ -355,11 +355,11 @@ class Datamatrix {
/**
* Product of two numbers in a Power-of-Two Galois Field
* @param $a (int) first number to multiply.
* @param $b (int) second number to multiply.
* @param $log (array) Log table.
* @param $alog (array) Anti-Log table.
* @param $gf (array) Number of Factors of the Reed-Solomon polynomial.
* @param int $a first number to multiply.
* @param int $b second number to multiply.
* @param array $log Log table.
* @param array $alog Anti-Log table.
* @param int $gf Number of Factors of the Reed-Solomon polynomial.
* @return int product
* @protected
*/
@ -372,12 +372,12 @@ class Datamatrix {
/**
* Add error correction codewords to data codewords array (ANNEX E).
* @param $wd (array) Array of datacodewords.
* @param $nb (int) Number of blocks.
* @param $nd (int) Number of data codewords per block.
* @param $nc (int) Number of correction codewords per block.
* @param $gf (int) numner of fields on log/antilog table (power of 2).
* @param $pp (int) The value of its prime modulus polynomial (301 for ECC200).
* @param array $wd Array of datacodewords.
* @param int $nb Number of blocks.
* @param int $nd Number of data codewords per block.
* @param int $nc Number of correction codewords per block.
* @param int $gf numner of fields on log/antilog table (power of 2).
* @param int $pp The value of its prime modulus polynomial (301 for ECC200).
* @return array data codewords + error codewords
* @protected
*/
@ -438,9 +438,9 @@ class Datamatrix {
/**
* Return the 253-state codeword
* @param $cwpad (int) Pad codeword.
* @param $cwpos (int) Number of data codewords from the beginning of encoded data.
* @return pad codeword
* @param int $cwpad Pad codeword.
* @param int $cwpos Number of data codewords from the beginning of encoded data.
* @return int pad codeword
* @protected
*/
protected function get253StateCodeword($cwpad, $cwpos) {
@ -453,9 +453,9 @@ class Datamatrix {
/**
* Return the 255-state codeword
* @param $cwpad (int) Pad codeword.
* @param $cwpos (int) Number of data codewords from the beginning of encoded data.
* @return pad codeword
* @param int $cwpad Pad codeword.
* @param int $cwpos Number of data codewords from the beginning of encoded data.
* @return int pad codeword
* @protected
*/
protected function get255StateCodeword($cwpad, $cwpos) {
@ -468,8 +468,8 @@ class Datamatrix {
/**
* Returns true if the char belongs to the selected mode
* @param $chr (int) Character (byte) to check.
* @param $mode (int) Current encoding mode.
* @param int $chr Character (byte) to check.
* @param int $mode Current encoding mode.
* @return boolean true if the char is of the selected mode.
* @protected
*/
@ -514,9 +514,9 @@ class Datamatrix {
/**
* The look-ahead test scans the data to be encoded to find the best mode (Annex P - steps from J to S).
* @param $data (string) data to encode
* @param $pos (int) current position
* @param $mode (int) current encoding mode
* @param string $data data to encode
* @param int $pos current position
* @param int $mode current encoding mode
* @return int encoding mode
* @protected
*/
@ -646,8 +646,8 @@ class Datamatrix {
/**
* Get the switching codeword to a new encoding mode (latch codeword)
* @param $mode (int) New encoding mode.
* @return (int) Switch codeword.
* @param int $mode New encoding mode.
* @return int Switch codeword.
* @protected
*/
protected function getSwitchEncodingCodeword($mode) {
@ -685,8 +685,8 @@ class Datamatrix {
/**
* Choose the minimum matrix size and return the max number of data codewords.
* @param $numcw (int) Number of current codewords.
* @return number of data codewords in matrix
* @param int $numcw Number of current codewords.
* @return int number of data codewords in matrix
* @protected
*/
protected function getMaxDataCodewords($numcw) {
@ -700,7 +700,7 @@ class Datamatrix {
/**
* Get high level encoding using the minimum symbol data characters for ECC 200
* @param $data (string) data to encode
* @param string $data data to encode
* @return array of codewords
* @protected
*/
@ -778,7 +778,7 @@ class Datamatrix {
if (isset($this->chset['SH1'][$chr])) {
$temp_cw[] = 0; // shift 1
$shiftset = $this->chset['SH1'];
} elseif (isset($chr, $this->chset['SH2'][$chr])) {
} elseif (isset($this->chset['SH2'][$chr])) {
$temp_cw[] = 1; // shift 2
$shiftset = $this->chset['SH2'];
} elseif (($enc == ENC_C40) AND isset($this->chset['S3C'][$chr])) {
@ -970,13 +970,13 @@ class Datamatrix {
/**
* Places "chr+bit" with appropriate wrapping within array[].
* (Annex F - ECC 200 symbol character placement)
* @param $marr (array) Array of symbols.
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param $row (int) Row number.
* @param $col (int) Column number.
* @param $chr (int) Char byte.
* @param $bit (int) Bit.
* @param array $marr Array of symbols.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @param int $row Row number.
* @param int $col Column number.
* @param int $chr Char byte.
* @param int $bit Bit.
* @return array
* @protected
*/
@ -996,12 +996,12 @@ class Datamatrix {
/**
* Places the 8 bits of a utah-shaped symbol character.
* (Annex F - ECC 200 symbol character placement)
* @param $marr (array) Array of symbols.
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param $row (int) Row number.
* @param $col (int) Column number.
* @param $chr (int) Char byte.
* @param array $marr Array of symbols.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @param int $row Row number.
* @param int $col Column number.
* @param int $chr Char byte.
* @return array
* @protected
*/
@ -1020,10 +1020,10 @@ class Datamatrix {
/**
* Places the 8 bits of the first special corner case.
* (Annex F - ECC 200 symbol character placement)
* @param $marr (array) Array of symbols.
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param $chr (int) Char byte.
* @param array $marr Array of symbols.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @param int $chr Char byte.
* @return array
* @protected
*/
@ -1042,10 +1042,10 @@ class Datamatrix {
/**
* Places the 8 bits of the second special corner case.
* (Annex F - ECC 200 symbol character placement)
* @param $marr (array) Array of symbols.
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param $chr (int) Char byte.
* @param array $marr Array of symbols.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @param int $chr Char byte.
* @return array
* @protected
*/
@ -1064,10 +1064,10 @@ class Datamatrix {
/**
* Places the 8 bits of the third special corner case.
* (Annex F - ECC 200 symbol character placement)
* @param $marr (array) Array of symbols.
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param $chr (int) Char byte.
* @param array $marr Array of symbols.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @param int $chr Char byte.
* @return array
* @protected
*/
@ -1086,10 +1086,10 @@ class Datamatrix {
/**
* Places the 8 bits of the fourth special corner case.
* (Annex F - ECC 200 symbol character placement)
* @param $marr (array) Array of symbols.
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param $chr (int) Char byte.
* @param array $marr Array of symbols.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @param int $chr Char byte.
* @return array
* @protected
*/
@ -1108,8 +1108,8 @@ class Datamatrix {
/**
* Build a placement map.
* (Annex F - ECC 200 symbol character placement)
* @param $nrow (int) Number of rows.
* @param $ncol (int) Number of columns.
* @param int $nrow Number of rows.
* @param int $ncol Number of columns.
* @return array
* @protected
*/

View file

@ -523,10 +523,10 @@ class PDF417 {
/**
* This is the class constructor.
* Creates a PDF417 object
* @param $code (string) code to represent using PDF417
* @param $ecl (int) error correction level (0-8); default -1 = automatic correction level
* @param $aspectratio (float) the width to height of the symbol (excluding quiet zones)
* @param $macro (array) information for macro block
* @param string $code code to represent using PDF417
* @param int $ecl error correction level (0-8); default -1 = automatic correction level
* @param float $aspectratio the width to height of the symbol (excluding quiet zones)
* @param array $macro information for macro block
* @public
*/
public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
@ -734,12 +734,13 @@ class PDF417 {
/**
* Returns the error correction level (0-8) to be used
* @param $ecl (int) error correction level
* @param $numcw (int) number of data codewords
* @param int $ecl error correction level
* @param int $numcw number of data codewords
* @return int error correction level
* @protected
*/
protected function getErrorCorrectionLevel($ecl, $numcw) {
$maxecl = 8; // starting error level
// check for automatic levels
if (($ecl < 0) OR ($ecl > 8)) {
if ($numcw < 41) {
@ -755,7 +756,6 @@ class PDF417 {
}
}
// get maximum correction level
$maxecl = 8; // starting error level
$maxerrsize = (928 - $numcw); // available codewords for error
while ($maxecl > 0) {
$errsize = (2 << $ecl);
@ -772,8 +772,8 @@ class PDF417 {
/**
* Returns the error correction codewords
* @param $cw (array) array of codewords including Symbol Length Descriptor and pad
* @param $ecl (int) error correction level 0-8
* @param array $cw array of codewords including Symbol Length Descriptor and pad
* @param int $ecl error correction level 0-8
* @return array of error correction codewords
* @protected
*/
@ -809,8 +809,8 @@ class PDF417 {
/**
* Create array of sequences from input
* @param $code (string) code
* @return bidimensional array containing characters and classification
* @param string $code code
* @return array bi-dimensional array containing characters and classification
* @protected
*/
protected function getInputSequences($code) {
@ -864,9 +864,9 @@ class PDF417 {
/**
* Compact data by mode.
* @param $mode (int) compaction mode number
* @param $code (string) data to compact
* @param $addmode (boolean) if true add the mode codeword at first position
* @param int $mode compaction mode number
* @param string $code data to compact
* @param boolean $addmode if true add the mode codeword at first position
* @return array of codewords
* @protected
*/
@ -878,7 +878,7 @@ class PDF417 {
$txtarr = array(); // array of characters and sub-mode switching characters
$codelen = strlen($code);
for ($i = 0; $i < $codelen; ++$i) {
$chval = ord($code{$i});
$chval = ord($code[$i]);
if (($k = array_search($chval, $this->textsubmodes[$submode])) !== false) {
// we are on the same sub-mode
$txtarr[] = $k;
@ -888,7 +888,7 @@ class PDF417 {
// search new sub-mode
if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) {
// $s is the new submode
if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code{($i + 1)}), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) {
if (((($i + 1) == $codelen) OR ((($i + 1) < $codelen) AND (array_search(ord($code[($i + 1)]), $this->textsubmodes[$submode]) !== false))) AND (($s == 3) OR (($s == 0) AND ($submode == 1)))) {
// shift (temporary change only for this char)
if ($s == 3) {
// shift to puntuaction
@ -943,8 +943,8 @@ class PDF417 {
// tmp array for the 6 bytes block
$cw6 = array();
do {
$d = bcmod($t, '900');
$t = bcdiv($t, '900');
$d = bcmod($t, '900', 0);
$t = bcdiv($t, '900', 0);
// prepend the value to the beginning of the array
array_unshift($cw6, $d);
} while ($t != '0');
@ -952,7 +952,7 @@ class PDF417 {
$cw = array_merge($cw, $cw6);
} else {
for ($i = 0; $i < $sublen; ++$i) {
$cw[] = ord($code{$i});
$cw[] = ord($code[$i]);
}
}
$code = $rest;
@ -969,8 +969,8 @@ class PDF417 {
}
$t = '1'.$code;
do {
$d = bcmod($t, '900');
$t = bcdiv($t, '900');
$d = bcmod($t, '900', 0);
$t = bcdiv($t, '900', 0);
array_unshift($cw, $d);
} while ($t != '0');
$code = $rest;

View file

@ -248,32 +248,6 @@ if (!defined('QRCODEDEFS')) {
} // end of definitions
// #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
// for compatibility with PHP4
if (!function_exists('str_split')) {
/**
* Convert a string to an array (needed for PHP4 compatibility)
* @param $string (string) The input string.
* @param $split_length (int) Maximum length of the chunk.
* @return If the optional split_length parameter is specified, the returned array will be broken down into chunks with each being split_length in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
*/
function str_split($string, $split_length=1) {
if ((strlen($string) > $split_length) OR (!$split_length)) {
do {
$c = strlen($string);
$parts[] = substr($string, 0, $split_length);
$string = substr($string, $split_length);
} while ($string !== false);
} else {
$parts = array($string);
}
return $parts;
}
}
// #####################################################
/**
* @class QRcode
* Class to create QR-code arrays for TCPDF class.
@ -632,8 +606,8 @@ class QRcode {
/**
* This is the class constructor.
* Creates a QRcode object
* @param $code (string) code to represent using QRcode
* @param $eclevel (string) error level: <ul><li>L : About 7% or less errors can be corrected.</li><li>M : About 15% or less errors can be corrected.</li><li>Q : About 25% or less errors can be corrected.</li><li>H : About 30% or less errors can be corrected.</li></ul>
* @param string $code code to represent using QRcode
* @param string $eclevel error level: <ul><li>L : About 7% or less errors can be corrected.</li><li>M : About 15% or less errors can be corrected.</li><li>Q : About 25% or less errors can be corrected.</li><li>H : About 30% or less errors can be corrected.</li></ul>
* @public
* @since 1.0.000
*/
@ -684,7 +658,7 @@ class QRcode {
/**
* Convert the frame in binary form
* @param $frame (array) array to binarize
* @param array $frame array to binarize
* @return array frame in binary form
*/
protected function binarize($frame) {
@ -700,7 +674,7 @@ class QRcode {
/**
* Encode the input string to QR code
* @param $string (string) input string to encode
* @param string $string input string to encode
*/
protected function encodeString($string) {
$this->dataStr = $string;
@ -716,7 +690,7 @@ class QRcode {
/**
* Encode mask
* @param $mask (int) masking mode
* @param int $mask masking mode
*/
protected function encodeMask($mask) {
$spec = array(0, 0, 0, 0, 0);
@ -781,8 +755,8 @@ class QRcode {
/**
* Set frame value at specified position
* @param $at (array) x,y position
* @param $val (int) value of the character to set
* @param array $at x,y position
* @param int $val value of the character to set
*/
protected function setFrameAt($at, $val) {
$this->frame[$at['y']][$at['x']] = chr($val);
@ -790,7 +764,7 @@ class QRcode {
/**
* Get frame value at specified position
* @param $at (array) x,y position
* @param array $at x,y position
* @return value at specified position
*/
protected function getFrameAt($at) {
@ -854,8 +828,8 @@ class QRcode {
/**
* Initialize code.
* @param $spec (array) array of ECC specification
* @return 0 in case of success, -1 in case of error
* @param array $spec array of ECC specification
* @return int 0 in case of success, -1 in case of error
*/
protected function init($spec) {
$dl = $this->rsDataCodes1($spec);
@ -911,14 +885,15 @@ class QRcode {
protected function getCode() {
if ($this->count < $this->dataLength) {
$row = $this->count % $this->blocks;
$col = $this->count / $this->blocks;
$col = (int)($this->count / $this->blocks);
if ($col >= $this->rsblocks[0]['dataLength']) {
$row += $this->b1;
}
$row = (int) $row;
$ret = $this->rsblocks[$row]['data'][$col];
} elseif ($this->count < $this->dataLength + $this->eccLength) {
$row = ($this->count - $this->dataLength) % $this->blocks;
$col = ($this->count - $this->dataLength) / $this->blocks;
$col = (int)(($this->count - $this->dataLength) / $this->blocks);
$ret = $this->rsblocks[$row]['ecc'][$col];
} else {
return 0;
@ -933,10 +908,10 @@ class QRcode {
/**
* Write Format Information on frame and returns the number of black bits
* @param $width (int) frame width
* @param $frame (array) frame
* @param $mask (array) masking mode
* @param $level (int) error correction level
* @param int $width frame width
* @param array $frame frame
* @param array $mask masking mode
* @param int $level error correction level
* @return int blacks
*/
protected function writeFormatInformation($width, &$frame, $mask, $level) {
@ -977,8 +952,8 @@ class QRcode {
/**
* mask0
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask0($x, $y) {
@ -987,8 +962,8 @@ class QRcode {
/**
* mask1
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask1($x, $y) {
@ -997,8 +972,8 @@ class QRcode {
/**
* mask2
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask2($x, $y) {
@ -1007,8 +982,8 @@ class QRcode {
/**
* mask3
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask3($x, $y) {
@ -1017,8 +992,8 @@ class QRcode {
/**
* mask4
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask4($x, $y) {
@ -1027,8 +1002,8 @@ class QRcode {
/**
* mask5
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask5($x, $y) {
@ -1037,8 +1012,8 @@ class QRcode {
/**
* mask6
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask6($x, $y) {
@ -1047,8 +1022,8 @@ class QRcode {
/**
* mask7
* @param $x (int) X position
* @param $y (int) Y position
* @param int $x X position
* @param int $y Y position
* @return int mask
*/
protected function mask7($x, $y) {
@ -1057,9 +1032,9 @@ class QRcode {
/**
* Return bitmask
* @param $maskNo (int) mask number
* @param $width (int) width
* @param $frame (array) frame
* @param int $maskNo mask number
* @param int $width width
* @param array $frame frame
* @return array bitmask
*/
protected function generateMaskNo($maskNo, $width, $frame) {
@ -1079,17 +1054,17 @@ class QRcode {
/**
* makeMaskNo
* @param $maskNo (int)
* @param $width (int)
* @param $s (int)
* @param $d (int)
* @param $maskGenOnly (boolean)
* @param int $maskNo
* @param int $width
* @param int $s
* @param int $d
* @param boolean $maskGenOnly
* @return int b
*/
protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
$b = 0;
$bitMask = array();
$bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
$bitMask = $this->generateMaskNo($maskNo, $width, $s);
if ($maskGenOnly) {
return;
}
@ -1107,10 +1082,10 @@ class QRcode {
/**
* makeMask
* @param $width (int)
* @param $frame (array)
* @param $maskNo (int)
* @param $level (int)
* @param int $width
* @param array $frame
* @param int $maskNo
* @param int $level
* @return array mask
*/
protected function makeMask($width, $frame, $maskNo, $level) {
@ -1122,7 +1097,7 @@ class QRcode {
/**
* calcN1N3
* @param $length (int)
* @param int $length
* @return int demerit
*/
protected function calcN1N3($length) {
@ -1152,8 +1127,8 @@ class QRcode {
/**
* evaluateSymbol
* @param $width (int)
* @param $frame (array)
* @param int $width
* @param array $frame
* @return int demerit
*/
protected function evaluateSymbol($width, $frame) {
@ -1213,9 +1188,9 @@ class QRcode {
/**
* mask
* @param $width (int)
* @param $frame (array)
* @param $level (int)
* @param int $width
* @param array $frame
* @param int $level
* @return array best mask
*/
protected function mask($width, $frame, $level) {
@ -1256,8 +1231,8 @@ class QRcode {
/**
* Return true if the character at specified position is a number
* @param $str (string) string
* @param $pos (int) characted position
* @param string $str string
* @param int $pos characted position
* @return boolean true of false
*/
protected function isdigitat($str, $pos) {
@ -1269,8 +1244,8 @@ class QRcode {
/**
* Return true if the character at specified position is an alphanumeric character
* @param $str (string) string
* @param $pos (int) characted position
* @param string $str string
* @param int $pos characted position
* @return boolean true of false
*/
protected function isalnumat($str, $pos) {
@ -1282,7 +1257,7 @@ class QRcode {
/**
* identifyMode
* @param $pos (int)
* @param int $pos
* @return int mode
*/
protected function identifyMode($pos) {
@ -1387,6 +1362,7 @@ class QRcode {
$p += 2;
}
$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
$run = $p;
return $run;
}
@ -1441,7 +1417,7 @@ class QRcode {
/**
* splitString
* @return (int)
* @return int
*/
protected function splitString() {
while (strlen($this->dataStr) > 0) {
@ -1456,7 +1432,7 @@ class QRcode {
break;
}
case QR_MODE_KJ: {
if ($hint == QR_MODE_KJ) {
if ($this->hint == QR_MODE_KJ) {
$length = $this->eatKanji();
} else {
$length = $this->eat8();
@ -1486,7 +1462,7 @@ class QRcode {
$stringLen = strlen($this->dataStr);
$p = 0;
while ($p < $stringLen) {
$mode = $this->identifyMode(substr($this->dataStr, $p), $this->hint);
$mode = $this->identifyMode(substr($this->dataStr, $p));
if ($mode == QR_MODE_KJ) {
$p += 2;
} else {
@ -1505,10 +1481,10 @@ class QRcode {
/**
* newInputItem
* @param $mode (int)
* @param $size (int)
* @param $data (array)
* @param $bstream (array)
* @param int $mode
* @param int $size
* @param array $data
* @param array $bstream
* @return array input item
*/
protected function newInputItem($mode, $size, $data, $bstream=null) {
@ -1529,8 +1505,8 @@ class QRcode {
/**
* encodeModeNum
* @param $inputitem (array)
* @param $version (int)
* @param array $inputitem
* @param int $version
* @return array input item
*/
protected function encodeModeNum($inputitem, $version) {
@ -1558,8 +1534,8 @@ class QRcode {
/**
* encodeModeAn
* @param $inputitem (array)
* @param $version (int)
* @param array $inputitem
* @param int $version
* @return array input item
*/
protected function encodeModeAn($inputitem, $version) {
@ -1581,8 +1557,8 @@ class QRcode {
/**
* encodeMode8
* @param $inputitem (array)
* @param $version (int)
* @param array $inputitem
* @param int $version
* @return array input item
*/
protected function encodeMode8($inputitem, $version) {
@ -1597,8 +1573,8 @@ class QRcode {
/**
* encodeModeKanji
* @param $inputitem (array)
* @param $version (int)
* @param array $inputitem
* @param int $version
* @return array input item
*/
protected function encodeModeKanji($inputitem, $version) {
@ -1621,7 +1597,7 @@ class QRcode {
/**
* encodeModeStructure
* @param $inputitem (array)
* @param array $inputitem
* @return array input item
*/
protected function encodeModeStructure($inputitem) {
@ -1635,8 +1611,8 @@ class QRcode {
/**
* encodeBitStream
* @param $inputitem (array)
* @param $version (int)
* @param array $inputitem
* @param int $version
* @return array input item
*/
protected function encodeBitStream($inputitem, $version) {
@ -1687,11 +1663,11 @@ class QRcode {
/**
* Append data to an input object.
* The data is copied and appended to the input object.
* @param $items (arrray) input items
* @param $mode (int) encoding mode.
* @param $size (int) size of data (byte).
* @param $data (array) array of input data.
* @return items
* @param array $items input items
* @param int $mode encoding mode.
* @param int $size size of data (byte).
* @param array $data array of input data.
* @return array items
*
*/
protected function appendNewInputItem($items, $mode, $size, $data) {
@ -1704,10 +1680,10 @@ class QRcode {
/**
* insertStructuredAppendHeader
* @param $items (array)
* @param $size (int)
* @param $index (int)
* @param $parity (int)
* @param array $items
* @param int $size
* @param int $index
* @param int $parity
* @return array items
*/
protected function insertStructuredAppendHeader($items, $size, $index, $parity) {
@ -1718,14 +1694,14 @@ class QRcode {
return -1;
}
$buf = array($size, $index, $parity);
$entry = $this->newInputItem(QR_MODE_ST, 3, buf);
$entry = $this->newInputItem(QR_MODE_ST, 3, $buf);
array_unshift($items, $entry);
return $items;
}
/**
* calcParity
* @param $items (array)
* @param array $items
* @return int parity
*/
protected function calcParity($items) {
@ -1742,8 +1718,8 @@ class QRcode {
/**
* checkModeNum
* @param $size (int)
* @param $data (array)
* @param int $size
* @param array $data
* @return boolean true or false
*/
protected function checkModeNum($size, $data) {
@ -1756,9 +1732,9 @@ class QRcode {
}
/**
* Look up the alphabet-numeric convesion table (see JIS X0510:2004, pp.19).
* @param $c (int) character value
* @return value
* Look up the alphabet-numeric conversion table (see JIS X0510:2004, pp.19).
* @param int $c character value
* @return int value
*/
protected function lookAnTable($c) {
return (($c > 127)?-1:$this->anTable[$c]);
@ -1766,8 +1742,8 @@ class QRcode {
/**
* checkModeAn
* @param $size (int)
* @param $data (array)
* @param int $size
* @param array $data
* @return boolean true or false
*/
protected function checkModeAn($size, $data) {
@ -1781,7 +1757,7 @@ class QRcode {
/**
* estimateBitsModeNum
* @param $size (int)
* @param int $size
* @return int number of bits
*/
protected function estimateBitsModeNum($size) {
@ -1802,7 +1778,7 @@ class QRcode {
/**
* estimateBitsModeAn
* @param $size (int)
* @param int $size
* @return int number of bits
*/
protected function estimateBitsModeAn($size) {
@ -1815,7 +1791,7 @@ class QRcode {
/**
* estimateBitsMode8
* @param $size (int)
* @param int $size
* @return int number of bits
*/
protected function estimateBitsMode8($size) {
@ -1824,7 +1800,7 @@ class QRcode {
/**
* estimateBitsModeKanji
* @param $size (int)
* @param int $size
* @return int number of bits
*/
protected function estimateBitsModeKanji($size) {
@ -1833,8 +1809,8 @@ class QRcode {
/**
* checkModeKanji
* @param $size (int)
* @param $data (array)
* @param int $size
* @param array $data
* @return boolean true or false
*/
protected function checkModeKanji($size, $data) {
@ -1852,9 +1828,9 @@ class QRcode {
/**
* Validate the input data.
* @param $mode (int) encoding mode.
* @param $size (int) size of data (byte).
* @param $data (array) data to validate
* @param int $mode encoding mode.
* @param int $size size of data (byte).
* @param array $data data to validate
* @return boolean true in case of valid data, false otherwise
*/
protected function check($mode, $size, $data) {
@ -1886,8 +1862,8 @@ class QRcode {
/**
* estimateBitStreamSize
* @param $items (array)
* @param $version (int)
* @param array $items
* @param int $version
* @return int bits
*/
protected function estimateBitStreamSize($items, $version) {
@ -1930,7 +1906,7 @@ class QRcode {
/**
* estimateVersion
* @param $items (array)
* @param array $items
* @return int version
*/
protected function estimateVersion($items) {
@ -1949,9 +1925,9 @@ class QRcode {
/**
* lengthOfCode
* @param $mode (int)
* @param $version (int)
* @param $bits (int)
* @param int $mode
* @param int $version
* @param int $bits
* @return int size
*/
protected function lengthOfCode($mode, $version, $bits) {
@ -2006,7 +1982,7 @@ class QRcode {
/**
* createBitStream
* @param $items (array)
* @param array $items
* @return array of items and total bits
*/
protected function createBitStream($items) {
@ -2021,7 +1997,7 @@ class QRcode {
/**
* convertData
* @param $items (array)
* @param array $items
* @return array items
*/
protected function convertData($items) {
@ -2050,7 +2026,7 @@ class QRcode {
/**
* Append Padding Bit to bitstream
* @param $bstream (array)
* @param array $bstream
* @return array bitstream
*/
protected function appendPaddingBit($bstream) {
@ -2083,7 +2059,7 @@ class QRcode {
/**
* mergeBitStream
* @param $items (array) items
* @param array $items items
* @return array bitstream
*/
protected function mergeBitStream($items) {
@ -2100,7 +2076,7 @@ class QRcode {
/**
* Returns a stream of bits.
* @param $items (int)
* @param int $items
* @return array padded merged byte stream
*/
protected function getBitStream($items) {
@ -2110,7 +2086,7 @@ class QRcode {
/**
* Pack all bit streams padding bits into a byte array.
* @param $items (int)
* @param int $items
* @return array padded merged byte stream
*/
protected function getByteStream($items) {
@ -2124,7 +2100,7 @@ class QRcode {
/**
* Return an array with zeros
* @param $setLength (int) array size
* @param int $setLength array size
* @return array
*/
protected function allocate($setLength) {
@ -2133,8 +2109,8 @@ class QRcode {
/**
* Return new bitstream from number
* @param $bits (int) number of bits
* @param $num (int) number
* @param int $bits number of bits
* @param int $num number
* @return array bitstream
*/
protected function newFromNum($bits, $num) {
@ -2153,8 +2129,8 @@ class QRcode {
/**
* Return new bitstream from bytes
* @param $size (int) size
* @param $data (array) bytes
* @param int $size size
* @param array $data bytes
* @return array bitstream
*/
protected function newFromBytes($size, $data) {
@ -2177,8 +2153,8 @@ class QRcode {
/**
* Append one bitstream to another
* @param $bitstream (array) original bitstream
* @param $append (array) bitstream to append
* @param array $bitstream original bitstream
* @param array $append bitstream to append
* @return array bitstream
*/
protected function appendBitstream($bitstream, $append) {
@ -2193,9 +2169,9 @@ class QRcode {
/**
* Append one bitstream created from number to another
* @param $bitstream (array) original bitstream
* @param $bits (int) number of bits
* @param $num (int) number
* @param array $bitstream original bitstream
* @param int $bits number of bits
* @param int $num number
* @return array bitstream
*/
protected function appendNum($bitstream, $bits, $num) {
@ -2208,9 +2184,9 @@ class QRcode {
/**
* Append one bitstream created from bytes to another
* @param $bitstream (array) original bitstream
* @param $size (int) size
* @param $data (array) bytes
* @param array $bitstream original bitstream
* @param int $size size
* @param array $data bytes
* @return array bitstream
*/
protected function appendBytes($bitstream, $size, $data) {
@ -2223,7 +2199,7 @@ class QRcode {
/**
* Convert bitstream to bytes
* @param $bstream (array) original bitstream
* @param array $bstream original bitstream
* @return array of bytes
*/
protected function bitstreamToByte($bstream) {
@ -2264,11 +2240,11 @@ class QRcode {
/**
* Replace a value on the array at the specified position
* @param $srctab (array)
* @param $x (int) X position
* @param $y (int) Y position
* @param $repl (string) value to replace
* @param $replLen (int) length of the repl string
* @param array $srctab
* @param int $x X position
* @param int $y Y position
* @param string $repl value to replace
* @param int $replLen length of the repl string
* @return array srctab
*/
protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
@ -2278,8 +2254,8 @@ class QRcode {
/**
* Return maximum data code length (bytes) for the version.
* @param $version (int) version
* @param $level (int) error correction level
* @param int $version version
* @param int $level error correction level
* @return int maximum size (bytes)
*/
protected function getDataLength($version, $level) {
@ -2288,8 +2264,8 @@ class QRcode {
/**
* Return maximum error correction code length (bytes) for the version.
* @param $version (int) version
* @param $level (int) error correction level
* @param int $version version
* @param int $level error correction level
* @return int ECC size (bytes)
*/
protected function getECCLength($version, $level){
@ -2298,7 +2274,7 @@ class QRcode {
/**
* Return the width of the symbol for the version.
* @param $version (int) version
* @param int $version version
* @return int width
*/
protected function getWidth($version) {
@ -2307,7 +2283,7 @@ class QRcode {
/**
* Return the numer of remainder bits.
* @param $version (int) version
* @param int $version version
* @return int number of remainder bits
*/
protected function getRemainder($version) {
@ -2316,8 +2292,8 @@ class QRcode {
/**
* Return a version number that satisfies the input code length.
* @param $size (int) input code length (bytes)
* @param $level (int) error correction level
* @param int $size input code length (bytes)
* @param int $level error correction level
* @return int version number
*/
protected function getMinimumVersion($size, $level) {
@ -2333,8 +2309,8 @@ class QRcode {
/**
* Return the size of length indicator for the mode and version.
* @param $mode (int) encoding mode
* @param $version (int) version
* @param int $mode encoding mode
* @param int $version version
* @return int the size of the appropriate length indicator (bits).
*/
protected function lengthIndicator($mode, $version) {
@ -2353,8 +2329,8 @@ class QRcode {
/**
* Return the maximum length for the mode and version.
* @param $mode (int) encoding mode
* @param $version (int) version
* @param int $mode encoding mode
* @param int $version version
* @return int the maximum length (bytes)
*/
protected function maximumWords($mode, $version) {
@ -2378,9 +2354,9 @@ class QRcode {
/**
* Return an array of ECC specification.
* @param $version (int) version
* @param $level (int) error correction level
* @param $spec (array) an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
* @param int $version version
* @param int $level error correction level
* @param array $spec an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
* @return array spec
*/
protected function getEccSpec($version, $level, $spec) {
@ -2409,9 +2385,9 @@ class QRcode {
/**
* Put an alignment marker.
* @param $frame (array) frame
* @param $ox (int) X center coordinate of the pattern
* @param $oy (int) Y center coordinate of the pattern
* @param array $frame frame
* @param int $ox X center coordinate of the pattern
* @param int $oy Y center coordinate of the pattern
* @return array frame
*/
protected function putAlignmentMarker($frame, $ox, $oy) {
@ -2432,9 +2408,9 @@ class QRcode {
/**
* Put an alignment pattern.
* @param $version (int) version
* @param $frame (array) frame
* @param $width (int) width
* @param int $version version
* @param array $frame frame
* @param int $width width
* @return array frame
*/
protected function putAlignmentPattern($version, $frame, $width) {
@ -2474,8 +2450,8 @@ class QRcode {
/**
* Return BCH encoded version information pattern that is used for the symbol of version 7 or greater. Use lower 18 bits.
* @param $version (int) version
* @return BCH encoded version information pattern
* @param int $version version
* @return string BCH encoded version information pattern
*/
protected function getVersionPattern($version) {
if (($version < 7) OR ($version > QRSPEC_VERSION_MAX)) {
@ -2486,9 +2462,9 @@ class QRcode {
/**
* Return BCH encoded format information pattern.
* @param $mask (array)
* @param $level (int) error correction level
* @return BCH encoded format information pattern
* @param array $mask
* @param int $level error correction level
* @return string BCH encoded format information pattern
*/
protected function getFormatInfo($mask, $level) {
if (($mask < 0) OR ($mask > 7)) {
@ -2502,9 +2478,9 @@ class QRcode {
/**
* Put a finder pattern.
* @param $frame (array) frame
* @param $ox (int) X center coordinate of the pattern
* @param $oy (int) Y center coordinate of the pattern
* @param array $frame frame
* @param int $ox X center coordinate of the pattern
* @param int $oy Y center coordinate of the pattern
* @return array frame
*/
protected function putFinderPattern($frame, $ox, $oy) {
@ -2525,8 +2501,8 @@ class QRcode {
/**
* Return a copy of initialized frame.
* @param $version (int) version
* @return Array of unsigned char.
* @param int $version version
* @return array array of unsigned char.
*/
protected function createFrame($version) {
$width = $this->capacity[$version][QRCAP_WIDTH];
@ -2590,8 +2566,8 @@ class QRcode {
/**
* Set new frame for the specified version.
* @param $version (int) version
* @return Array of unsigned char.
* @param int $version version
* @return array array of unsigned char.
*/
protected function newFrame($version) {
if (($version < 1) OR ($version > QRSPEC_VERSION_MAX)) {
@ -2608,7 +2584,7 @@ class QRcode {
/**
* Return block number 0
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsBlockNum($spec) {
@ -2617,7 +2593,7 @@ class QRcode {
/**
* Return block number 1
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsBlockNum1($spec) {
@ -2626,7 +2602,7 @@ class QRcode {
/**
* Return data codes 1
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsDataCodes1($spec) {
@ -2635,7 +2611,7 @@ class QRcode {
/**
* Return ecc codes 1
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsEccCodes1($spec) {
@ -2644,7 +2620,7 @@ class QRcode {
/**
* Return block number 2
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsBlockNum2($spec) {
@ -2653,7 +2629,7 @@ class QRcode {
/**
* Return data codes 2
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsDataCodes2($spec) {
@ -2662,7 +2638,7 @@ class QRcode {
/**
* Return ecc codes 2
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsEccCodes2($spec) {
@ -2671,7 +2647,7 @@ class QRcode {
/**
* Return data length
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsDataLength($spec) {
@ -2680,7 +2656,7 @@ class QRcode {
/**
* Return ecc length
* @param $spec (array)
* @param array $spec
* @return int value
*/
protected function rsEccLength($spec) {
@ -2693,12 +2669,12 @@ class QRcode {
/**
* Initialize a Reed-Solomon codec and add it to existing rsitems
* @param $symsize (int) symbol size, bits
* @param $gfpoly (int) Field generator polynomial coefficients
* @param $fcr (int) first root of RS code generator polynomial, index form
* @param $prim (int) primitive element to generate polynomial roots
* @param $nroots (int) RS code generator polynomial degree (number of roots)
* @param $pad (int) padding bytes at front of shortened block
* @param int $symsize symbol size, bits
* @param int $gfpoly Field generator polynomial coefficients
* @param int $fcr first root of RS code generator polynomial, index form
* @param int $prim primitive element to generate polynomial roots
* @param int $nroots RS code generator polynomial degree (number of roots)
* @param int $pad padding bytes at front of shortened block
* @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
*/
protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
@ -2720,8 +2696,8 @@ class QRcode {
/**
* modnn
* @param $rs (array) RS values
* @param $x (int) X position
* @param array $rs RS values
* @param int $x X position
* @return int X osition
*/
protected function modnn($rs, $x) {
@ -2734,12 +2710,12 @@ class QRcode {
/**
* Initialize a Reed-Solomon codec and returns an array of values.
* @param $symsize (int) symbol size, bits
* @param $gfpoly (int) Field generator polynomial coefficients
* @param $fcr (int) first root of RS code generator polynomial, index form
* @param $prim (int) primitive element to generate polynomial roots
* @param $nroots (int) RS code generator polynomial degree (number of roots)
* @param $pad (int) padding bytes at front of shortened block
* @param int $symsize symbol size, bits
* @param int $gfpoly Field generator polynomial coefficients
* @param int $fcr first root of RS code generator polynomial, index form
* @param int $prim primitive element to generate polynomial roots
* @param int $nroots RS code generator polynomial degree (number of roots)
* @param int $pad padding bytes at front of shortened block
* @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
*/
protected function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
@ -2821,9 +2797,9 @@ class QRcode {
/**
* Encode a Reed-Solomon codec and returns the parity array
* @param $rs (array) RS values
* @param $data (array) data
* @param $parity (array) parity
* @param array $rs RS values
* @param array $data data
* @param array $parity parity
* @return parity array
*/
protected function encode_rs_char($rs, $data, $parity) {

View file

@ -240,9 +240,9 @@ class TCPDF_COLORS {
/**
* Return the Spot color array.
* @param $name (string) Name of the spot color.
* @param $spotc (array) Reference to an array of spot colors.
* @return (array) Spot color array or false if not defined.
* @param string $name Name of the spot color.
* @param array $spotc Reference to an array of spot colors.
* @return array|false Spot color array or false if not defined.
* @since 5.9.125 (2011-10-03)
* @public static
*/
@ -264,10 +264,10 @@ class TCPDF_COLORS {
/**
* Returns an array (RGB or CMYK) from an html color name, or a six-digit (i.e. #3FE5AA), or three-digit (i.e. #7FF) hexadecimal color, or a javascript color array, or javascript color name.
* @param $hcolor (string) HTML color.
* @param $spotc (array) Reference to an array of spot colors.
* @param $defcol (array) Color to return in case of error.
* @return array RGB or CMYK color, or false in case of error.
* @param string $hcolor HTML color.
* @param array $spotc Reference to an array of spot colors.
* @param array $defcol Color to return in case of error.
* @return array|false RGB or CMYK color, or false in case of error.
* @public static
*/
public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'=>128,'G'=>128,'B'=>128)) {
@ -275,7 +275,7 @@ class TCPDF_COLORS {
$color = strtolower($color);
// check for javascript color array syntax
if (strpos($color, '[') !== false) {
if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\,]?([0-9\.]*)[\]]/', $color, $m) > 0) {
if (preg_match('/[\[][\"\'](t|g|rgb|cmyk)[\"\'][\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\,]?([0-9\.]*+)[\]]/', $color, $m) > 0) {
$returncolor = array();
switch ($m[1]) {
case 'cmyk': {
@ -407,8 +407,8 @@ class TCPDF_COLORS {
/**
* Convert a color array into a string representation.
* @param $c (array) Array of colors.
* @return (string) The color array representation.
* @param array $c Array of colors.
* @return string The color array representation.
* @since 5.9.137 (2011-12-01)
* @public static
*/
@ -438,7 +438,7 @@ class TCPDF_COLORS {
/**
* Convert color to javascript color.
* @param $color (string) color name or "#RRGGBB"
* @param string $color color name or "#RRGGBB"
* @protected
* @since 2.1.002 (2008-02-12)
* @public static
@ -449,7 +449,7 @@ class TCPDF_COLORS {
}
if (!in_array($color, self::$jscolor)) {
// default transparent color
$color = $jscolor[0];
$color = self::$jscolor[0];
}
return 'color.'.$color;
}

View file

@ -60,7 +60,7 @@ class TCPDF_FILTERS {
/**
* Get a list of available decoding filters.
* @return (array) Array of available filter decoders.
* @return array Array of available filter decoders.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -70,9 +70,9 @@ class TCPDF_FILTERS {
/**
* Decode data using the specified filter type.
* @param $filter (string) Filter name.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $filter Filter name.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -130,8 +130,8 @@ class TCPDF_FILTERS {
/**
* Standard
* Default decoding filter (leaves data unchanged).
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -142,8 +142,8 @@ class TCPDF_FILTERS {
/**
* ASCIIHexDecode
* Decodes data encoded in an ASCII hexadecimal representation, reproducing the original binary data.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -182,8 +182,8 @@ class TCPDF_FILTERS {
/**
* ASCII85Decode
* Decodes data encoded in an ASCII base-85 representation, reproducing the original binary data.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -266,8 +266,8 @@ class TCPDF_FILTERS {
/**
* LZWDecode
* Decompresses data encoded using the LZW (Lempel-Ziv-Welch) adaptive compression method, reproducing the original text or binary data.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -347,8 +347,8 @@ class TCPDF_FILTERS {
/**
* FlateDecode
* Decompresses data encoded using the zlib/deflate compression method, reproducing the original text or binary data.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -364,7 +364,7 @@ class TCPDF_FILTERS {
/**
* RunLengthDecode
* Decompresses data encoded using a byte-oriented run-length encoding algorithm.
* @param $data (string) Data to decode.
* @param string $data Data to decode.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -400,8 +400,8 @@ class TCPDF_FILTERS {
/**
* CCITTFaxDecode (NOT IMPLEMETED - RETURN AN EXCEPTION)
* Decompresses data encoded using the CCITT facsimile standard, reproducing the original data (typically monochrome image data at 1 bit per pixel).
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -413,8 +413,8 @@ class TCPDF_FILTERS {
/**
* JBIG2Decode (NOT IMPLEMETED - RETURN AN EXCEPTION)
* Decompresses data encoded using the JBIG2 standard, reproducing the original monochrome (1 bit per pixel) image data (or an approximation of that data).
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -426,8 +426,8 @@ class TCPDF_FILTERS {
/**
* DCTDecode (NOT IMPLEMETED - RETURN AN EXCEPTION)
* Decompresses data encoded using a DCT (discrete cosine transform) technique based on the JPEG standard, reproducing image sample data that approximates the original data.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -439,8 +439,8 @@ class TCPDF_FILTERS {
/**
* JPXDecode (NOT IMPLEMETED - RETURN AN EXCEPTION)
* Decompresses data encoded using the wavelet-based JPEG2000 standard, reproducing the original image data.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -452,8 +452,8 @@ class TCPDF_FILTERS {
/**
* Crypt (NOT IMPLEMETED - RETURN AN EXCEPTION)
* Decrypts data encrypted by a security handler, reproducing the data as it was before encryption.
* @param $data (string) Data to decode.
* @return Decoded data string.
* @param string $data Data to decode.
* @return string Decoded data string.
* @since 1.0.000 (2011-05-23)
* @public static
*/
@ -466,7 +466,7 @@ class TCPDF_FILTERS {
/**
* Throw an exception.
* @param $msg (string) The error message
* @param string $msg The error message
* @since 1.0.000 (2011-05-23)
* @public static
*/

View file

@ -55,16 +55,16 @@ class TCPDF_FONTS {
/**
* Convert and add the selected TrueType or Type1 font to the fonts folder (that must be writeable).
* @param $fontfile (string) Font file (full path).
* @param $fonttype (string) Font type. Leave empty for autodetect mode. Valid values are: TrueTypeUnicode, TrueType, Type1, CID0JP = CID-0 Japanese, CID0KR = CID-0 Korean, CID0CS = CID-0 Chinese Simplified, CID0CT = CID-0 Chinese Traditional.
* @param $enc (string) Name of the encoding table to use. Leave empty for default mode. Omit this parameter for TrueType Unicode and symbolic fonts like Symbol or ZapfDingBats.
* @param $flags (int) Unsigned 32-bit integer containing flags specifying various characteristics of the font (PDF32000:2008 - 9.8.2 Font Descriptor Flags): +1 for fixed font; +4 for symbol or +32 for non-symbol; +64 for italic. Fixed and Italic mode are generally autodetected so you have to set it to 32 = non-symbolic font (default) or 4 = symbolic font.
* @param $outpath (string) Output path for generated font files (must be writeable by the web server). Leave empty for default font folder.
* @param $platid (int) Platform ID for CMAP table to extract (when building a Unicode font for Windows this value should be 3, for Macintosh should be 1).
* @param $encid (int) Encoding ID for CMAP table to extract (when building a Unicode font for Windows this value should be 1, for Macintosh should be 0). When Platform ID is 3, legal values for Encoding ID are: 0=Symbol, 1=Unicode, 2=ShiftJIS, 3=PRC, 4=Big5, 5=Wansung, 6=Johab, 7=Reserved, 8=Reserved, 9=Reserved, 10=UCS-4.
* @param $addcbbox (boolean) If true includes the character bounding box information on the php font file.
* @param $link (boolean) If true link to system font instead of copying the font data (not transportable) - Note: do not work with Type1 fonts.
* @return (string) TCPDF font name or boolean false in case of error.
* @param string $fontfile Font file (full path).
* @param string $fonttype Font type. Leave empty for autodetect mode. Valid values are: TrueTypeUnicode, TrueType, Type1, CID0JP = CID-0 Japanese, CID0KR = CID-0 Korean, CID0CS = CID-0 Chinese Simplified, CID0CT = CID-0 Chinese Traditional.
* @param string $enc Name of the encoding table to use. Leave empty for default mode. Omit this parameter for TrueType Unicode and symbolic fonts like Symbol or ZapfDingBats.
* @param int $flags Unsigned 32-bit integer containing flags specifying various characteristics of the font (PDF32000:2008 - 9.8.2 Font Descriptor Flags): +1 for fixed font; +4 for symbol or +32 for non-symbol; +64 for italic. Fixed and Italic mode are generally autodetected so you have to set it to 32 = non-symbolic font (default) or 4 = symbolic font.
* @param string $outpath Output path for generated font files (must be writeable by the web server). Leave empty for default font folder.
* @param int $platid Platform ID for CMAP table to extract (when building a Unicode font for Windows this value should be 3, for Macintosh should be 1).
* @param int $encid Encoding ID for CMAP table to extract (when building a Unicode font for Windows this value should be 1, for Macintosh should be 0). When Platform ID is 3, legal values for Encoding ID are: 0=Symbol, 1=Unicode, 2=ShiftJIS, 3=PRC, 4=Big5, 5=Wansung, 6=Johab, 7=Reserved, 8=Reserved, 9=Reserved, 10=UCS-4.
* @param boolean $addcbbox If true includes the character bounding box information on the php font file.
* @param boolean $link If true link to system font instead of copying the font data (not transportable) - Note: do not work with Type1 fonts.
* @return string|false TCPDF font name or boolean false in case of error.
* @author Nicola Asuni
* @since 5.9.123 (2010-09-30)
* @public static
@ -557,6 +557,7 @@ class TCPDF_FONTS {
$numGlyphs = TCPDF_STATIC::_getUSHORT($font, $offset);
// ---------- get CIDToGIDMap ----------
$ctg = array();
$c = 0;
foreach ($encodingTables as $enctable) {
// get only specified Platform ID and Encoding ID
if (($enctable['platformID'] == $platid) AND ($enctable['encodingID'] == $encid)) {
@ -920,8 +921,8 @@ class TCPDF_FONTS {
/**
* Returs the checksum of a TTF table.
* @param $table (string) table to check
* @param $length (int) length of table in bytes
* @param string $table table to check
* @param int $length length of table in bytes
* @return int checksum
* @author Nicola Asuni
* @since 5.2.000 (2010-06-02)
@ -942,9 +943,9 @@ class TCPDF_FONTS {
/**
* Returns a subset of the TrueType font data without the unused glyphs.
* @param $font (string) TrueType font data.
* @param $subsetchars (array) Array of used characters (the glyphs to keep).
* @return (string) A subset of TrueType font data without the unused glyphs.
* @param string $font TrueType font data.
* @param array $subsetchars Array of used characters (the glyphs to keep).
* @return string A subset of TrueType font data without the unused glyphs.
* @author Nicola Asuni
* @since 5.2.000 (2010-06-02)
* @public static
@ -956,6 +957,7 @@ class TCPDF_FONTS {
// sfnt version must be 0x00010000 for TrueType version 1.0.
return $font;
}
$c = 0;
$offset += 4;
// get number of tables
$numTables = TCPDF_STATIC::_getUSHORT($font, $offset);
@ -1321,43 +1323,43 @@ class TCPDF_FONTS {
// set the checkSumAdjustment to 0
$table[$tag]['data'] = substr($table[$tag]['data'], 0, 8)."\x0\x0\x0\x0".substr($table[$tag]['data'], 12);
}
$pad = 4 - ($table[$tag]['length'] % 4);
if ($pad != 4) {
// the length of a table must be a multiple of four bytes
$table[$tag]['length'] += $pad;
$table[$tag]['data'] .= str_repeat("\x0", $pad);
}
$table[$tag]['offset'] = $offset;
$offset += $table[$tag]['length'];
$numPad = ($offset + 3 & ~3) - $offset;
if($numPad > 0) {
$table[$tag]['data'] .= str_repeat("\x0", $numPad);
$offset += $numPad;
}
// check sum is not changed (so keep the following line commented)
//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length']);
//$table[$tag]['checkSum'] = self::_getTTFtableChecksum($table[$tag]['data'], $table[$tag]['length'] + $numPad);
} else {
unset($table[$tag]);
}
}
// add loca
$table['loca'] = array();
$table['loca']['data'] = $loca;
$table['loca']['length'] = strlen($loca);
$pad = 4 - ($table['loca']['length'] % 4);
if ($pad != 4) {
// the length of a table must be a multiple of four bytes
$table['loca']['length'] += $pad;
$table['loca']['data'] .= str_repeat("\x0", $pad);
}
$table['loca']['offset'] = $offset;
$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length']);
$offset += $table['loca']['length'];
$numPad = ($offset + 3 & ~3) - $offset;
if($numPad > 0) {
$table['loca']['data'] .= str_repeat("\x0", $numPad);
$offset += $numPad;
}
$table['loca']['checkSum'] = self::_getTTFtableChecksum($table['loca']['data'], $table['loca']['length'] + $numPad);
// add glyf
$table['glyf'] = array();
$table['glyf']['data'] = $glyf;
$table['glyf']['length'] = strlen($glyf);
$pad = 4 - ($table['glyf']['length'] % 4);
if ($pad != 4) {
// the length of a table must be a multiple of four bytes
$table['glyf']['length'] += $pad;
$table['glyf']['data'] .= str_repeat("\x0", $pad);
}
$table['glyf']['offset'] = $offset;
$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length']);
$offset += $table['glyf']['length'];
$numPad = ($offset + 3 & ~3) - $offset;
if($numPad > 0) {
$table['glyf']['data'] .= str_repeat("\x0", $numPad);
$offset += $numPad;
}
$table['glyf']['checkSum'] = self::_getTTFtableChecksum($table['glyf']['data'], $table['glyf']['length'] + $numPad);
// rebuild font
$font = '';
$font .= pack('N', 0x10000); // sfnt version
@ -1381,15 +1383,15 @@ class TCPDF_FONTS {
}
// set checkSumAdjustment on head table
$checkSumAdjustment = 0xB1B0AFBA - self::_getTTFtableChecksum($font, strlen($font));
$font = substr($font, 0, $table['head']['offset'] + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + 12);
$font = substr($font, 0, $table['head']['offset'] + $offset + 8).pack('N', $checkSumAdjustment).substr($font, $table['head']['offset'] + $offset + 12);
return $font;
}
/**
* Outputs font widths
* @param $font (array) font data
* @param $cidoffset (int) offset for CID values
* @return PDF command string for font widths
* @param array $font font data
* @param int $cidoffset offset for CID values
* @return string PDF command string for font widths
* @author Nicola Asuni
* @since 4.4.000 (2008-12-07)
* @public static
@ -1495,10 +1497,10 @@ class TCPDF_FONTS {
/**
* Update the CIDToGIDMap string with a new value.
* @param $map (string) CIDToGIDMap.
* @param $cid (int) CID value.
* @param $gid (int) GID value.
* @return (string) CIDToGIDMap.
* @param string $map CIDToGIDMap.
* @param int $cid CID value.
* @param int $gid GID value.
* @return string CIDToGIDMap.
* @author Nicola Asuni
* @since 5.9.123 (2011-09-29)
* @public static
@ -1533,8 +1535,8 @@ class TCPDF_FONTS {
/**
* Return font full path
* @param $file (string) Font file name.
* @param $fontdir (string) Font directory (set to false fto search on default directories)
* @param string $file Font file name.
* @param string $fontdir Font directory (set to false fto search on default directories)
* @return string Font full path or empty string
* @author Nicola Asuni
* @since 6.0.025
@ -1558,8 +1560,8 @@ class TCPDF_FONTS {
/**
* Get a reference font size.
* @param $size (string) String containing font size value.
* @param $refsize (float) Reference font size in points.
* @param string $size String containing font size value.
* @param float $refsize Reference font size in points.
* @return float value in points
* @public static
*/
@ -1657,9 +1659,9 @@ class TCPDF_FONTS {
/**
* Returns the unicode caracter specified by the value
* @param $c (int) UTF-8 value
* @param $unicode (boolean) True if we are in unicode mode, false otherwise.
* @return Returns the specified character.
* @param int $c UTF-8 value
* @param boolean $unicode True if we are in unicode mode, false otherwise.
* @return string Returns the specified character.
* @since 2.3.000 (2008-03-05)
* @public static
*/
@ -1686,8 +1688,8 @@ class TCPDF_FONTS {
/**
* Returns the unicode caracter specified by UTF-8 value
* @param $c (int) UTF-8 value
* @return Returns the specified character.
* @param int $c UTF-8 value
* @return string Returns the specified character.
* @public static
*/
public static function unichrUnicode($c) {
@ -1696,8 +1698,8 @@ class TCPDF_FONTS {
/**
* Returns the unicode caracter specified by ASCII value
* @param $c (int) UTF-8 value
* @return Returns the specified character.
* @param int $c UTF-8 value
* @return string Returns the specified character.
* @public static
*/
public static function unichrASCII($c) {
@ -1734,8 +1736,8 @@ class TCPDF_FONTS {
* W1 = 110110yyyyyyyyyy
* W2 = 110111xxxxxxxxxx
* </pre>
* @param $unicode (array) array containing UTF-8 unicode values
* @param $setbom (boolean) if true set the Byte Order Mark (BOM = 0xFEFF)
* @param array $unicode array containing UTF-8 unicode values
* @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @return string
* @protected
* @author Nicola Asuni
@ -1770,26 +1772,26 @@ class TCPDF_FONTS {
/**
* Convert an array of UTF8 values to array of unicode characters
* @param $ta (array) The input array of UTF8 values.
* @param $isunicode (boolean) True for Unicode mode, false otherwise.
* @return Return array of unicode characters
* @param array $ta The input array of UTF8 values.
* @param boolean $isunicode True for Unicode mode, false otherwise.
* @return array Return array of unicode characters
* @since 4.5.037 (2009-04-07)
* @public static
*/
public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
if ($isunicode) {
return array_map(array('TCPDF_FONTS', 'unichrUnicode'), $ta);
return array_map(get_called_class().'::unichrUnicode', $ta);
}
return array_map(array('TCPDF_FONTS', 'unichrASCII'), $ta);
return array_map(get_called_class().'::unichrASCII', $ta);
}
/**
* Extract a slice of the $strarr array and return it as string.
* @param $strarr (string) The input array of characters.
* @param $start (int) the starting element of $strarr.
* @param $end (int) first element that will not be returned.
* @param $unicode (boolean) True if we are in unicode mode, false otherwise.
* @return Return part of a string
* @param string[] $strarr The input array of characters.
* @param int $start the starting element of $strarr.
* @param int $end first element that will not be returned.
* @param boolean $unicode True if we are in unicode mode, false otherwise.
* @return string Return part of a string
* @public static
*/
public static function UTF8ArrSubString($strarr, $start='', $end='', $unicode=true) {
@ -1808,10 +1810,10 @@ class TCPDF_FONTS {
/**
* Extract a slice of the $uniarr array and return it as string.
* @param $uniarr (string) The input array of characters.
* @param $start (int) the starting element of $strarr.
* @param $end (int) first element that will not be returned.
* @return Return part of a string
* @param string[] $uniarr The input array of characters.
* @param int $start the starting element of $strarr.
* @param int $end first element that will not be returned.
* @return string Return part of a string
* @since 4.5.037 (2009-04-07)
* @public static
*/
@ -1831,7 +1833,7 @@ class TCPDF_FONTS {
/**
* Converts UTF-8 characters array to array of Latin1 characters array<br>
* @param $unicode (array) array containing UTF-8 unicode values
* @param array $unicode array containing UTF-8 unicode values
* @return array
* @author Nicola Asuni
* @since 4.8.023 (2010-01-15)
@ -1855,9 +1857,9 @@ class TCPDF_FONTS {
}
/**
* Converts UTF-8 characters array to array of Latin1 string<br>
* @param $unicode (array) array containing UTF-8 unicode values
* @return array
* Converts UTF-8 characters array to Latin1 string<br>
* @param array $unicode array containing UTF-8 unicode values
* @return string
* @author Nicola Asuni
* @since 4.8.023 (2010-01-15)
* @public static
@ -1882,8 +1884,8 @@ class TCPDF_FONTS {
/**
* Converts UTF-8 character to integer value.<br>
* Uses the getUniord() method if the value is not cached.
* @param $uch (string) character string to process.
* @return integer Unicode value
* @param string $uch character string to process.
* @return int Unicode value
* @public static
*/
public static function uniord($uch) {
@ -1921,8 +1923,8 @@ class TCPDF_FONTS {
* UTF8-tail = %x80-BF
* ---------------------------------------------------------------------
* </pre>
* @param $uch (string) character string to process.
* @return integer Unicode value
* @param string $uch character string to process.
* @return int Unicode value
* @author Nicola Asuni
* @public static
*/
@ -1988,18 +1990,19 @@ class TCPDF_FONTS {
/**
* Converts UTF-8 strings to codepoints array.<br>
* Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
* @param $str (string) string to process.
* @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
* @param $currentfont (array) Reference to current font array.
* @param string $str string to process.
* @param boolean $isunicode True when the documetn is in Unicode mode, false otherwise.
* @param array $currentfont Reference to current font array.
* @return array containing codepoints (UTF-8 characters values)
* @author Nicola Asuni
* @public static
*/
public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
public static function UTF8StringToArray($str, $isunicode, &$currentfont) {
$str = is_null($str) ? '' : $str;
if ($isunicode) {
// requires PCRE unicode support turned on
$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
$carr = array_map(array('TCPDF_FONTS', 'uniord'), $chars);
$carr = array_map(get_called_class().'::uniord', $chars);
} else {
$chars = str_split($str);
$carr = array_map('ord', $chars);
@ -2014,30 +2017,30 @@ class TCPDF_FONTS {
/**
* Converts UTF-8 strings to Latin1 when using the standard 14 core fonts.<br>
* @param $str (string) string to process.
* @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
* @param $currentfont (array) Reference to current font array.
* @param string $str string to process.
* @param boolean $isunicode True when the documetn is in Unicode mode, false otherwise.
* @param array $currentfont Reference to current font array.
* @return string
* @since 3.2.000 (2008-06-23)
* @public static
*/
public static function UTF8ToLatin1($str, $isunicode=true, &$currentfont) {
public static function UTF8ToLatin1($str, $isunicode, &$currentfont) {
$unicode = self::UTF8StringToArray($str, $isunicode, $currentfont); // array containing UTF-8 unicode values
return self::UTF8ArrToLatin1($unicode);
}
/**
* Converts UTF-8 strings to UTF16-BE.<br>
* @param $str (string) string to process.
* @param $setbom (boolean) if true set the Byte Order Mark (BOM = 0xFEFF)
* @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
* @param $currentfont (array) Reference to current font array.
* @param string $str string to process.
* @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param boolean $isunicode True when the documetn is in Unicode mode, false otherwise.
* @param array $currentfont Reference to current font array.
* @return string
* @author Nicola Asuni
* @since 1.53.0.TC005 (2005-01-05)
* @public static
*/
public static function UTF8ToUTF16BE($str, $setbom=false, $isunicode=true, &$currentfont) {
public static function UTF8ToUTF16BE($str, $setbom, $isunicode, &$currentfont) {
if (!$isunicode) {
return $str; // string is not in unicode
}
@ -2047,50 +2050,50 @@ class TCPDF_FONTS {
/**
* Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
* @param $str (string) string to manipulate.
* @param $setbom (bool) if true set the Byte Order Mark (BOM = 0xFEFF)
* @param $forcertl (bool) if true forces RTL text direction
* @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
* @param $currentfont (array) Reference to current font array.
* @param string $str string to manipulate.
* @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param bool $forcertl if true forces RTL text direction
* @param boolean $isunicode True if the document is in Unicode mode, false otherwise.
* @param array $currentfont Reference to current font array.
* @return string
* @author Nicola Asuni
* @since 2.1.000 (2008-01-08)
* @public static
*/
public static function utf8StrRev($str, $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
public static function utf8StrRev($str, $setbom, $forcertl, $isunicode, &$currentfont) {
return self::utf8StrArrRev(self::UTF8StringToArray($str, $isunicode, $currentfont), $str, $setbom, $forcertl, $isunicode, $currentfont);
}
/**
* Reverse the RLT substrings array using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
* @param $arr (array) array of unicode values.
* @param $str (string) string to manipulate (or empty value).
* @param $setbom (bool) if true set the Byte Order Mark (BOM = 0xFEFF)
* @param $forcertl (bool) if true forces RTL text direction
* @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
* @param $currentfont (array) Reference to current font array.
* @param array $arr array of unicode values.
* @param string $str string to manipulate (or empty value).
* @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param bool $forcertl if true forces RTL text direction
* @param boolean $isunicode True if the document is in Unicode mode, false otherwise.
* @param array $currentfont Reference to current font array.
* @return string
* @author Nicola Asuni
* @since 4.9.000 (2010-03-27)
* @public static
*/
public static function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
public static function utf8StrArrRev($arr, $str, $setbom, $forcertl, $isunicode, &$currentfont) {
return self::arrUTF8ToUTF16BE(self::utf8Bidi($arr, $str, $forcertl, $isunicode, $currentfont), $setbom);
}
/**
* Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
* @param $ta (array) array of characters composing the string.
* @param $str (string) string to process
* @param $forcertl (bool) if 'R' forces RTL, if 'L' forces LTR
* @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
* @param $currentfont (array) Reference to current font array.
* @param array $ta array of characters composing the string.
* @param string $str string to process
* @param bool $forcertl if 'R' forces RTL, if 'L' forces LTR
* @param boolean $isunicode True if the document is in Unicode mode, false otherwise.
* @param array $currentfont Reference to current font array.
* @return array of unicode chars
* @author Nicola Asuni
* @since 2.4.000 (2008-03-06)
* @public static
*/
public static function utf8Bidi($ta, $str='', $forcertl=false, $isunicode=true, &$currentfont) {
public static function utf8Bidi($ta, $str, $forcertl, $isunicode, &$currentfont) {
// paragraph embedding level
$pel = 0;
// max level

View file

@ -55,6 +55,8 @@ class TCPDF_IMAGES {
* Array of hinheritable SVG properties.
* @since 5.0.000 (2010-05-02)
* @public static
*
* @var string[]
*/
public static $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'display', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode');
@ -62,8 +64,8 @@ class TCPDF_IMAGES {
/**
* Return the image type given the file name or array returned by getimagesize() function.
* @param $imgfile (string) image file name
* @param $iminfo (array) array of image information returned by getimagesize() function.
* @param string $imgfile image file name
* @param array $iminfo array of image information returned by getimagesize() function.
* @return string image type
* @since 4.8.017 (2009-11-27)
* @public static
@ -77,10 +79,7 @@ class TCPDF_IMAGES {
}
}
if (empty($type)) {
$fileinfo = pathinfo($imgfile);
if (isset($fileinfo['extension']) AND (!TCPDF_STATIC::empty_string($fileinfo['extension']))) {
$type = strtolower(trim($fileinfo['extension']));
}
$type = strtolower(trim(pathinfo(parse_url($imgfile, PHP_URL_PATH), PATHINFO_EXTENSION)));
}
if ($type == 'jpg') {
$type = 'jpeg';
@ -90,9 +89,9 @@ class TCPDF_IMAGES {
/**
* Set the transparency for the given GD image.
* @param $new_image (image) GD image object
* @param $image (image) GD image object.
* return GD image object.
* @param resource $new_image GD image object
* @param resource $image GD image object.
* @return resource GD image object $new_image
* @since 4.9.016 (2010-04-20)
* @public static
*/
@ -115,8 +114,8 @@ class TCPDF_IMAGES {
/**
* Convert the loaded image to a PNG and then return a structure for the PDF creator.
* This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
* @param $image (image) Image object.
* @param $tempfile (string) Temporary file name.
* @param resource $image Image object.
* @param string $tempfile Temporary file name.
* return image PNG image object.
* @since 4.9.016 (2010-04-20)
* @public static
@ -138,10 +137,10 @@ class TCPDF_IMAGES {
/**
* Convert the loaded image to a JPEG and then return a structure for the PDF creator.
* This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
* @param $image (image) Image object.
* @param $quality (int) JPEG quality.
* @param $tempfile (string) Temporary file name.
* return image JPEG image object.
* @param resource $image Image object.
* @param int $quality JPEG quality.
* @param string $tempfile Temporary file name.
* return array|false image JPEG image object.
* @public static
*/
public static function _toJPEG($image, $quality, $tempfile) {
@ -155,8 +154,8 @@ class TCPDF_IMAGES {
/**
* Extract info from a JPEG file without using the GD library.
* @param $file (string) image file to parse
* @return array structure containing the image data
* @param string $file image file to parse
* @return array|false structure containing the image data
* @public static
*/
public static function _parsejpeg($file) {
@ -234,8 +233,8 @@ class TCPDF_IMAGES {
/**
* Extract info from a PNG file without using the GD library.
* @param $file (string) image file to parse
* @return array structure containing the image data
* @param string $file image file to parse
* @return array|false structure containing the image data
* @public static
*/
public static function _parsepng($file) {

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,34 @@
<?php
use Doctum\Doctum;
use Doctum\RemoteRepository\GitHubRemoteRepository;
use Symfony\Component\Finder\Finder;
$rootDir = __DIR__ . '/../';
$iterator = Finder::create()
->files()
->name('*.php')
->notPath('cache')
->notPath('build')
->notPath('fonts')
->notPath('vendor')
->notPath('tests')
->notPath('examples')
->in($rootDir);
return new Doctum($iterator, [
'title' => 'TCPDF',
'build_dir' => $rootDir . '/build',
'cache_dir' => $rootDir . '/cache',
'source_dir' => $rootDir,
'remote_repository' => new GitHubRemoteRepository('tecnickcom/TCPDF', $rootDir),
'footer_link' => [
'href' => 'https://github.com/tecnickcom/TCPDF#readme',
'rel' => 'noreferrer noopener',
'target' => '_blank',
'before_text' => 'This documentation is for',
'link_text' => 'TCPDF',
'after_text' => 'the PHP library to build PDFs.',
],
]);

File diff suppressed because one or more lines are too long

View file

@ -228,6 +228,10 @@ if (!defined('K_TCPDF_CALLS_IN_HTML')) {
define('K_TCPDF_CALLS_IN_HTML', false);
}
if (!defined('K_ALLOWED_TCPDF_TAGS')) {
define('K_ALLOWED_TCPDF_TAGS', '');
}
if (!defined('K_TCPDF_THROW_EXCEPTION_ERROR')) {
define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
}

View file

@ -53,7 +53,7 @@ class TCPDFBarcode {
* Array representation of barcode.
* @protected
*/
protected $barcode_array;
protected $barcode_array = array();
/**
* This is the class constructor.
@ -66,8 +66,8 @@ class TCPDFBarcode {
* <li>$arrcode['bcode'][$k]['w'] bar width in units.</li>
* <li>$arrcode['bcode'][$k]['h'] bar height in units.</li>
* <li>$arrcode['bcode'][$k]['p'] bar top position (0 = top, 1 = middle)</li></ul>
* @param $code (string) code to print
* @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
* @param string $code code to print
* @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
* @public
*/
public function __construct($code, $type) {
@ -85,9 +85,9 @@ class TCPDFBarcode {
/**
* Send barcode as SVG image object to the standard output.
* @param $w (int) Minimum width of a single bar in user units.
* @param $h (int) Height of barcode in user units.
* @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
* @param int $w Minimum width of a single bar in user units.
* @param int $h Height of barcode in user units.
* @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
* @public
*/
public function getBarcodeSVG($w=2, $h=30, $color='black') {
@ -105,9 +105,9 @@ class TCPDFBarcode {
/**
* Return a SVG string representation of barcode.
* @param $w (int) Minimum width of a single bar in user units.
* @param $h (int) Height of barcode in user units.
* @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
* @param int $w Minimum width of a single bar in user units.
* @param int $h Height of barcode in user units.
* @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
* @return string SVG code.
* @public
*/
@ -138,9 +138,9 @@ class TCPDFBarcode {
/**
* Return an HTML representation of barcode.
* @param $w (int) Width of a single bar element in pixels.
* @param $h (int) Height of a single bar element in pixels.
* @param $color (string) Foreground color for bar elements (background is transparent).
* @param int $w Width of a single bar element in pixels.
* @param int $h Height of a single bar element in pixels.
* @param string $color Foreground color for bar elements (background is transparent).
* @return string HTML code.
* @public
*/
@ -164,9 +164,9 @@ class TCPDFBarcode {
/**
* Send a PNG image representation of barcode (requires GD or Imagick library).
* @param $w (int) Width of a single bar element in pixels.
* @param $h (int) Height of a single bar element in pixels.
* @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
* @param int $w Width of a single bar element in pixels.
* @param int $h Height of a single bar element in pixels.
* @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
* @public
*/
public function getBarcodePNG($w=2, $h=30, $color=array(0,0,0)) {
@ -183,10 +183,10 @@ class TCPDFBarcode {
/**
* Return a PNG image representation of barcode (requires GD or Imagick library).
* @param $w (int) Width of a single bar element in pixels.
* @param $h (int) Height of a single bar element in pixels.
* @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
* @return image or false in case of error.
* @param int $w Width of a single bar element in pixels.
* @param int $h Height of a single bar element in pixels.
* @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
* @return string|Imagick|false image or false in case of error.
* @public
*/
public function getBarcodePngData($w=2, $h=30, $color=array(0,0,0)) {
@ -241,9 +241,9 @@ class TCPDFBarcode {
/**
* Set the barcode.
* @param $code (string) code to print
* @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>IMBPRE: Pre-processed Intelligent Mail Barcode - Onecode - USPS-B-3200, using only F,A,D,T letters</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
* @return array barcode array
* @param string $code code to print
* @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>IMBPRE: Pre-processed Intelligent Mail Barcode - Onecode - USPS-B-3200, using only F,A,D,T letters</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
* @return void
* @public
*/
public function setBarcode($code, $type) {
@ -373,7 +373,7 @@ class TCPDFBarcode {
break;
}
default: {
$this->barcode_array = false;
$this->barcode_array = array();
$arrcode = false;
break;
}
@ -384,9 +384,9 @@ class TCPDFBarcode {
/**
* CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
* General-purpose code in very wide use world-wide
* @param $code (string) code to represent.
* @param $extended (boolean) if true uses the extended mode.
* @param $checksum (boolean) if true add a checksum to the code.
* @param string $code code to represent.
* @param boolean $extended if true uses the extended mode.
* @param boolean $checksum if true add a checksum to the code.
* @return array barcode representation.
* @protected
*/
@ -479,8 +479,8 @@ class TCPDFBarcode {
/**
* Encode a string to be used for CODE 39 Extended mode.
* @param $code (string) code to represent.
* @return encoded string.
* @param string $code code to represent.
* @return string encoded string.
* @protected
*/
protected function encode_code39_ext($code) {
@ -530,8 +530,8 @@ class TCPDFBarcode {
/**
* Calculate CODE 39 checksum (modulo 43).
* @param $code (string) code to represent.
* @return char checksum.
* @param string $code code to represent.
* @return string char checksum.
* @protected
*/
protected function checksum_code39($code) {
@ -553,7 +553,7 @@ class TCPDFBarcode {
/**
* CODE 93 - USS-93
* Compact code similar to Code 39
* @param $code (string) code to represent.
* @param string $code code to represent.
* @return array barcode representation.
* @protected
*/
@ -681,7 +681,7 @@ class TCPDFBarcode {
/**
* Calculate CODE 93 checksum (modulo 47).
* @param $code (string) code to represent.
* @param string $code code to represent.
* @return string checksum code.
* @protected
*/
@ -730,7 +730,7 @@ class TCPDFBarcode {
/**
* Checksum for standard 2 of 5 barcodes.
* @param $code (string) code to process.
* @param string $code code to process.
* @return int checksum.
* @protected
*/
@ -755,8 +755,8 @@ class TCPDFBarcode {
* MSI.
* Variation of Plessey code, with similar applications
* Contains digits (0 to 9) and encodes the data only in the width of bars.
* @param $code (string) code to represent.
* @param $checksum (boolean) if true add a checksum to the code (modulo 11)
* @param string $code code to represent.
* @param boolean $checksum if true add a checksum to the code (modulo 11)
* @return array barcode representation.
* @protected
*/
@ -814,8 +814,8 @@ class TCPDFBarcode {
* Standard 2 of 5 barcodes.
* Used in airline ticket marking, photofinishing
* Contains digits (0 to 9) and encodes the data only in the width of bars.
* @param $code (string) code to represent.
* @param $checksum (boolean) if true add a checksum to the code
* @param string $code code to represent.
* @param boolean $checksum if true add a checksum to the code
* @return array barcode representation.
* @protected
*/
@ -828,7 +828,7 @@ class TCPDFBarcode {
$chr['5'] = '11101011101010';
$chr['6'] = '10111011101010';
$chr['7'] = '10101011101110';
$chr['8'] = '10101110111010';
$chr['8'] = '11101010111010';
$chr['9'] = '10111010111010';
if ($checksum) {
// add checksum
@ -838,7 +838,7 @@ class TCPDFBarcode {
// add leading zero if code-length is odd
$code = '0'.$code;
}
$seq = '11011010';
$seq = '1110111010';
$clen = strlen($code);
for ($i = 0; $i < $clen; ++$i) {
$digit = $code[$i];
@ -848,16 +848,15 @@ class TCPDFBarcode {
}
$seq .= $chr[$digit];
}
$seq .= '1101011';
$seq .= '111010111';
$bararray = array('code' => $code, 'maxw' => 0, 'maxh' => 1, 'bcode' => array());
return $this->binseq_to_array($seq, $bararray);
}
/**
* Convert binary barcode sequence to TCPDF barcode array.
* @param $seq (string) barcode as binary sequence.
* @param $bararray (array) barcode array.
* òparam array $bararray TCPDF barcode array to fill up
* Convert binary barcode sequence to WarnockPDF barcode array.
* @param string $seq barcode as binary sequence.
* @param array $bararray barcode array to fill up
* @return array barcode representation.
* @protected
*/
@ -886,8 +885,8 @@ class TCPDFBarcode {
* Interleaved 2 of 5 barcodes.
* Compact numeric code, widely used in industry, air cargo
* Contains digits (0 to 9) and encodes the data in the width of both bars and spaces.
* @param $code (string) code to represent.
* @param $checksum (boolean) if true add a checksum to the code
* @param string $code code to represent.
* @param boolean $checksum if true add a checksum to the code
* @return array barcode representation.
* @protected
*/
@ -938,7 +937,7 @@ class TCPDFBarcode {
} else {
$t = false; // space
}
$w = $seq[$j];
$w = (float)$seq[$j];
$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
$bararray['maxw'] += $w;
++$k;
@ -950,8 +949,8 @@ class TCPDFBarcode {
/**
* C128 barcodes.
* Very capable code, excellent density, high reliability; in very wide use world-wide
* @param $code (string) code to represent.
* @param $type (string) barcode type: A, B, C or empty for automatic switch (AUTO mode)
* @param string $code code to represent.
* @param string $type barcode type: A, B, C or empty for automatic switch (AUTO mode)
* @return array barcode representation.
* @protected
*/
@ -1271,7 +1270,7 @@ class TCPDFBarcode {
} else {
$t = false; // space
}
$w = $seq[$j];
$w = (float)$seq[$j];
$bararray['bcode'][] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
$bararray['maxw'] += $w;
}
@ -1281,7 +1280,7 @@ class TCPDFBarcode {
/**
* Split text code in A/B sequence for 128 code
* @param $code (string) code to split.
* @param string $code code to split.
* @return array sequence
* @protected
*/
@ -1319,8 +1318,8 @@ class TCPDFBarcode {
* EAN13: European Article Numbering international retail product code
* UPC-A: Universal product code seen on almost all retail products in the USA and Canada
* UPC-E: Short version of UPC symbol
* @param $code (string) code to represent.
* @param $len (string) barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
* @param string $code code to represent.
* @param string $len barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
* @return array barcode representation.
* @protected
*/
@ -1337,14 +1336,14 @@ class TCPDFBarcode {
// calculate check digit
$sum_a = 0;
for ($i = 1; $i < $data_len; $i+=2) {
$sum_a += (int) $code[$i];
$sum_a += $code[$i];
}
if ($len > 12) {
$sum_a *= 3;
}
$sum_b = 0;
for ($i = 0; $i < $data_len; $i+=2) {
$sum_b += (int) ($code[$i]);
$sum_b += ($code[$i]);
}
if ($len < 13) {
$sum_b *= 3;
@ -1512,8 +1511,8 @@ class TCPDFBarcode {
* UPC-Based Extensions
* 2-Digit Ext.: Used to indicate magazines and newspaper issue numbers
* 5-Digit Ext.: Used to mark suggested retail price of books
* @param $code (string) code to represent.
* @param $len (string) barcode type: 2 = 2-Digit, 5 = 5-Digit
* @param string $code code to represent.
* @param string $len barcode type: 2 = 2-Digit, 5 = 5-Digit
* @return array barcode representation.
* @protected
*/
@ -1587,8 +1586,8 @@ class TCPDFBarcode {
/**
* POSTNET and PLANET barcodes.
* Used by U.S. Postal Service for automated mail sorting
* @param $code (string) zip code to represent. Must be a string containing a zip code of the form DDDDD or DDDDD-DDDD.
* @param $planet (boolean) if true print the PLANET barcode, otherwise print POSTNET
* @param string $code zip code to represent. Must be a string containing a zip code of the form DDDDD or DDDDD-DDDD.
* @param boolean $planet if true print the PLANET barcode, otherwise print POSTNET
* @return array barcode representation.
* @protected
*/
@ -1660,8 +1659,8 @@ class TCPDFBarcode {
* RMS4CC - CBC - KIX
* RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) - KIX (Klant index - Customer index)
* RM4SCC is the name of the barcode symbology used by the Royal Mail for its Cleanmail service.
* @param $code (string) code to print
* @param $kix (boolean) if true prints the KIX variation (doesn't use the start and end symbols, and the checksum) - in this case the house number must be sufficed with an X and placed at the end of the code.
* @param string $code code to print
* @param boolean $kix if true prints the KIX variation (doesn't use the start and end symbols, and the checksum) - in this case the house number must be sufficed with an X and placed at the end of the code.
* @return array barcode representation.
* @protected
*/
@ -1812,7 +1811,7 @@ class TCPDFBarcode {
/**
* CODABAR barcodes.
* Older code often used in library systems, sometimes in blood banks
* @param $code (string) code to represent.
* @param string $code code to represent.
* @return array barcode representation.
* @protected
*/
@ -1856,7 +1855,7 @@ class TCPDFBarcode {
} else {
$t = false; // space
}
$w = $seq[$j];
$w = (float)$seq[$j];
$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
$bararray['maxw'] += $w;
++$k;
@ -1868,7 +1867,7 @@ class TCPDFBarcode {
/**
* CODE11 barcodes.
* Used primarily for labeling telecommunications equipment
* @param $code (string) code to represent.
* @param string $code code to represent.
* @return array barcode representation.
* @protected
*/
@ -1947,7 +1946,7 @@ class TCPDFBarcode {
} else {
$t = false; // space
}
$w = $seq[$j];
$w = (float)$seq[$j];
$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
$bararray['maxw'] += $w;
++$k;
@ -1959,7 +1958,7 @@ class TCPDFBarcode {
/**
* Pharmacode
* Contains digits (0 to 9)
* @param $code (string) code to represent.
* @param string $code code to represent.
* @return array barcode representation.
* @protected
*/
@ -1985,7 +1984,7 @@ class TCPDFBarcode {
/**
* Pharmacode two-track
* Contains digits (0 to 9)
* @param $code (string) code to represent.
* @param string $code code to represent.
* @return array barcode representation.
* @protected
*/
@ -2047,7 +2046,7 @@ class TCPDFBarcode {
* (requires PHP bcmath extension)
* Intelligent Mail barcode is a 65-bar code for use on mail in the United States.
* The fields are described as follows:<ul><li>The Barcode Identifier shall be assigned by USPS to encode the presort identification that is currently printed in human readable form on the optional endorsement line (OEL) as well as for future USPS use. This shall be two digits, with the second digit in the range of 0–4. The allowable encoding ranges shall be 00–04, 10–14, 20–24, 30–34, 40–44, 50–54, 60–64, 70–74, 80–84, and 90–94.</li><li>The Service Type Identifier shall be assigned by USPS for any combination of services requested on the mailpiece. The allowable encoding range shall be 000http://it2.php.net/manual/en/function.dechex.php–999. Each 3-digit value shall correspond to a particular mail class with a particular combination of service(s). Each service program, such as OneCode Confirm and OneCode ACS, shall provide the list of Service Type Identifier values.</li><li>The Mailer or Customer Identifier shall be assigned by USPS as a unique, 6 or 9 digit number that identifies a business entity. The allowable encoding range for the 6 digit Mailer ID shall be 000000- 899999, while the allowable encoding range for the 9 digit Mailer ID shall be 900000000-999999999.</li><li>The Serial or Sequence Number shall be assigned by the mailer for uniquely identifying and tracking mailpieces. The allowable encoding range shall be 000000000–999999999 when used with a 6 digit Mailer ID and 000000-999999 when used with a 9 digit Mailer ID. e. The Delivery Point ZIP Code shall be assigned by the mailer for routing the mailpiece. This shall replace POSTNET for routing the mailpiece to its final delivery point. The length may be 0, 5, 9, or 11 digits. The allowable encoding ranges shall be no ZIP Code, 00000–99999, 000000000–999999999, and 00000000000–99999999999.</li></ul>
* @param $code (string) code to print, separate the ZIP (routing code) from the rest using a minus char '-' (BarcodeID_ServiceTypeID_MailerID_SerialNumber-RoutingCode)
* @param string $code code to print, separate the ZIP (routing code) from the rest using a minus char '-' (BarcodeID_ServiceTypeID_MailerID_SerialNumber-RoutingCode)
* @return array barcode representation.
* @protected
*/
@ -2172,7 +2171,7 @@ class TCPDFBarcode {
/**
* IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
*
* @param $code (string) pre-formatted IMB barcode (65 chars "FADT")
* @param string $code pre-formatted IMB barcode (65 chars "FADT")
* @return array barcode representation.
* @protected
*/
@ -2223,7 +2222,7 @@ class TCPDFBarcode {
/**
* Convert large integer number to hexadecimal representation.
* (requires PHP bcmath extension)
* @param $number (string) number to convert specified as a string
* @param string $number number to convert specified as a string
* @return string hexadecimal representation
*/
public function dec_to_hex($number) {
@ -2247,7 +2246,7 @@ class TCPDFBarcode {
/**
* Convert large hexadecimal number to decimal representation (string).
* (requires PHP bcmath extension)
* @param $hex (string) hexadecimal number to convert specified as a string
* @param string $hex hexadecimal number to convert specified as a string
* @return string hexadecimal representation
*/
public function hex_to_dec($hex) {
@ -2263,7 +2262,7 @@ class TCPDFBarcode {
/**
* Intelligent Mail Barcode calculation of Frame Check Sequence
* @param $code_arr (string) array of hexadecimal values (13 bytes holding 102 bits right justified).
* @param string $code_arr array of hexadecimal values (13 bytes holding 102 bits right justified).
* @return int 11 bit Frame Check Sequence as integer (decimal base)
* @protected
*/
@ -2299,7 +2298,7 @@ class TCPDFBarcode {
/**
* Reverse unsigned short value
* @param $num (int) value to reversr
* @param int $num value to reversr
* @return int reversed value
* @protected
*/
@ -2315,8 +2314,8 @@ class TCPDFBarcode {
/**
* generate Nof13 tables used for Intelligent Mail Barcode
* @param $n (int) is the type of table: 2 for 2of13 table, 5 for 5of13table
* @param $size (int) size of table (78 for n=2 and 1287 for n=5)
* @param int $n is the type of table: 2 for 2of13 table, 5 for 5of13table
* @param int $size size of table (78 for n=2 and 1287 for n=5)
* @return array requested table
* @protected
*/

View file

@ -53,7 +53,7 @@ class TCPDF2DBarcode {
* Array representation of barcode.
* @protected
*/
protected $barcode_array = false;
protected $barcode_array = array();
/**
* This is the class constructor.
@ -62,8 +62,8 @@ class TCPDF2DBarcode {
* <li>$arrcode['num_rows'] required number of rows</li>
* <li>$arrcode['num_cols'] required number of columns</li>
* <li>$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)</li></ul>
* @param $code (string) code to print
* @param $type (string) type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
* @param string $code code to print
* @param string $type type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parameters are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
*/
public function __construct($code, $type) {
$this->setBarcode($code, $type);
@ -79,9 +79,9 @@ class TCPDF2DBarcode {
/**
* Send barcode as SVG image object to the standard output.
* @param $w (int) Width of a single rectangle element in user units.
* @param $h (int) Height of a single rectangle element in user units.
* @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
* @param int $w Width of a single rectangle element in user units.
* @param int $h Height of a single rectangle element in user units.
* @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
* @public
*/
public function getBarcodeSVG($w=3, $h=3, $color='black') {
@ -99,9 +99,9 @@ class TCPDF2DBarcode {
/**
* Return a SVG string representation of barcode.
* @param $w (int) Width of a single rectangle element in user units.
* @param $h (int) Height of a single rectangle element in user units.
* @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
* @param int $w Width of a single rectangle element in user units.
* @param int $h Height of a single rectangle element in user units.
* @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
* @return string SVG code.
* @public
*/
@ -135,9 +135,9 @@ class TCPDF2DBarcode {
/**
* Return an HTML representation of barcode.
* @param $w (int) Width of a single rectangle element in pixels.
* @param $h (int) Height of a single rectangle element in pixels.
* @param $color (string) Foreground color for bar elements (background is transparent).
* @param int $w Width of a single rectangle element in pixels.
* @param int $h Height of a single rectangle element in pixels.
* @param string $color Foreground color for bar elements (background is transparent).
* @return string HTML code.
* @public
*/
@ -164,9 +164,9 @@ class TCPDF2DBarcode {
/**
* Send a PNG image representation of barcode (requires GD or Imagick library).
* @param $w (int) Width of a single rectangle element in pixels.
* @param $h (int) Height of a single rectangle element in pixels.
* @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
* @param int $w Width of a single rectangle element in pixels.
* @param int $h Height of a single rectangle element in pixels.
* @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
* @public
*/
public function getBarcodePNG($w=3, $h=3, $color=array(0,0,0)) {
@ -184,10 +184,10 @@ class TCPDF2DBarcode {
/**
* Return a PNG image representation of barcode (requires GD or Imagick library).
* @param $w (int) Width of a single rectangle element in pixels.
* @param $h (int) Height of a single rectangle element in pixels.
* @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
* @return image or false in case of error.
* @param int $w Width of a single rectangle element in pixels.
* @param int $h Height of a single rectangle element in pixels.
* @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
* @return string|Imagick|false image or false in case of error.
* @public
*/
public function getBarcodePngData($w=3, $h=3, $color=array(0,0,0)) {
@ -245,9 +245,9 @@ class TCPDF2DBarcode {
/**
* Set the barcode.
* @param $code (string) code to print
* @param $type (string) type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
* @return array
* @param string $code code to print
* @param string $type type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parameters are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
* @return void
*/
public function setBarcode($code, $type) {
$mode = explode(',', $type);
@ -338,7 +338,7 @@ class TCPDF2DBarcode {
break;
}
default: {
$this->barcode_array = false;
$this->barcode_array = array();
}
}
}

View file

@ -60,8 +60,8 @@ class TCPDF_IMPORT extends TCPDF {
/**
* Import an existing PDF document
* @param $filename (string) Filename of the PDF document to import.
* @return true in case of success, false otherwise
* @param string $filename Filename of the PDF document to import.
* @return void
* @public
* @since 1.0.000 (2011-05-24)
*/

View file

@ -91,8 +91,8 @@ class TCPDF_PARSER {
/**
* Parse a PDF document an return an array of objects.
* @param $data (string) PDF data to parse.
* @param $cfg (array) Array of configuration parameters:
* @param string $data PDF data to parse.
* @param array $cfg Array of configuration parameters:
* 'die_for_errors' : if true termitate the program execution in case of error, otherwise thows an exception;
* 'ignore_filter_decoding_errors' : if true ignore filter decoding errors;
* 'ignore_missing_filter_decoders' : if true ignore missing filter decoding errors.
@ -130,7 +130,7 @@ class TCPDF_PARSER {
/**
* Set the configuration parameters.
* @param $cfg (array) Array of configuration parameters:
* @param array $cfg Array of configuration parameters:
* 'die_for_errors' : if true termitate the program execution in case of error, otherwise thows an exception;
* 'ignore_filter_decoding_errors' : if true ignore filter decoding errors;
* 'ignore_missing_filter_decoders' : if true ignore missing filter decoding errors.
@ -150,7 +150,7 @@ class TCPDF_PARSER {
/**
* Return an array of parsed PDF document objects.
* @return (array) Array of parsed PDF document objects.
* @return array Array of parsed PDF document objects.
* @public
* @since 1.0.000 (2011-06-26)
*/
@ -160,9 +160,9 @@ class TCPDF_PARSER {
/**
* Get Cross-Reference (xref) table and trailer data from PDF document data.
* @param $offset (int) xref offset (if know).
* @param $xref (array) previous xref array (if any).
* @return Array containing xref and trailer data.
* @param int $offset xref offset (if know).
* @param array $xref previous xref array (if any).
* @return array containing xref and trailer data.
* @protected
* @since 1.0.000 (2011-05-24)
*/
@ -202,9 +202,9 @@ class TCPDF_PARSER {
/**
* Decode the Cross-Reference section
* @param $startxref (int) Offset at which the xref section starts (position of the 'xref' keyword).
* @param $xref (array) Previous xref array (if any).
* @return Array containing xref and trailer data.
* @param int $startxref Offset at which the xref section starts (position of the 'xref' keyword).
* @param array $xref Previous xref array (if any).
* @return array containing xref and trailer data.
* @protected
* @since 1.0.000 (2011-06-20)
*/
@ -274,9 +274,9 @@ class TCPDF_PARSER {
/**
* Decode the Cross-Reference Stream section
* @param $startxref (int) Offset at which the xref section starts.
* @param $xref (array) Previous xref array (if any).
* @return Array containing xref and trailer data.
* @param int $startxref Offset at which the xref section starts.
* @param array $xref Previous xref array (if any).
* @return array containing xref and trailer data.
* @protected
* @since 1.0.003 (2013-03-16)
*/
@ -489,7 +489,7 @@ class TCPDF_PARSER {
/**
* Get object type, raw value and offset to next object
* @param $offset (int) Object offset.
* @param int $offset Object offset.
* @return array containing object type, raw value and offset to next object
* @protected
* @since 1.0.000 (2011-06-20)
@ -667,9 +667,9 @@ class TCPDF_PARSER {
/**
* Get content of indirect object.
* @param $obj_ref (string) Object number and generation number separated by underscore character.
* @param $offset (int) Object offset.
* @param $decoding (boolean) If true decode streams.
* @param string $obj_ref Object number and generation number separated by underscore character.
* @param int $offset Object offset.
* @param boolean $decoding If true decode streams.
* @return array containing object data.
* @protected
* @since 1.0.000 (2011-05-24)
@ -712,7 +712,7 @@ class TCPDF_PARSER {
/**
* Get the content of object, resolving indect object reference if necessary.
* @param $obj (string) Object value.
* @param string $obj Object value.
* @return array containing object data.
* @protected
* @since 1.0.000 (2011-06-26)
@ -734,8 +734,8 @@ class TCPDF_PARSER {
/**
* Decode the specified stream.
* @param $sdic (array) Stream's dictionary array.
* @param $stream (string) Stream to decode.
* @param array $sdic Stream's dictionary array.
* @param string $stream Stream to decode.
* @return array containing decoded stream data and remaining filters.
* @protected
* @since 1.0.000 (2011-06-22)
@ -796,7 +796,7 @@ class TCPDF_PARSER {
/**
* Throw an exception or print an error message and die if the K_TCPDF_PARSER_THROW_EXCEPTION_ERROR constant is set to true.
* @param $msg (string) The error message
* @param string $msg The error message
* @public
* @since 1.0.000 (2011-05-23)
*/

View file

@ -39,7 +39,7 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'googleplus', 'GooglePlus', 'https://www.googleplus.com/{socialid}', 'fa-google-plus', 0);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'instagram', 'Instagram', 'https://www.instagram.com/{socialid}', 'fa-instagram', 1);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'linkedin', 'LinkedIn', 'https://www.linkedin.com/{socialid}', 'fa-linkedin', 1);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'linkedin', 'LinkedIn', 'https://www.linkedin.com/in/{socialid}', 'fa-linkedin', 1);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'mastodon', 'Mastodon', '{socialid}', '', 0);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'meetup', 'Meetup', '{socialid}', 'fa-meetup', 0);
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'periscope', 'Periscope', '{socialid}', '', 0);

View file

@ -46,7 +46,8 @@ if ($action == 'update') {
$var_min_percent = GETPOST('var_min_percent', 'array');
$fk_level = GETPOST('fk_level', 'array');
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$check = isset($var_min_percent[$i]);
if ($i != 1) {
@ -71,7 +72,7 @@ if ($action == 'update') {
$check1 = true;
$check2 = $i_var_min_percent;
} else {
$check1 = $i_fk_level >= 1 && $i_fk_level <= $conf->global->PRODUIT_MULTIPRICES_LIMIT;
$check1 = $i_fk_level >= 1 && $i_fk_level <= $produit_multiprices_limit;
$check2 = $i_var_percent && ($i_var_min_percent || (string) $i_var_min_percent === '0');
}
@ -145,7 +146,8 @@ print '<span class="opacitymedium">'.$langs->trans("MultiPriceRuleDesc").'</span
// Array that contains the number of prices available
$price_options = array();
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$price_options[$i] = $langs->trans('SellingPrice').' '.$i;
}
?>
@ -160,13 +162,13 @@ for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
<td></td>
<td style="text-align: center"><input type="text" style="text-align: right" name="var_min_percent[1]" size="5" value="<?php echo price(isset($rules[1]) ? $rules[1]->var_min_percent : 0, 2) ?>"> <?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' 1') ?></td>
</tr>
<?php for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) : ?>
<?php for ($i = 2; $i <= $produit_multiprices_limit; $i++) : ?>
<tr>
<td class="fieldrequired" style="text-align: center"><?php
echo $langs->trans('SellingPrice').' '.$i;
// Label of price
$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
if (!empty($conf->global->$keyforlabel)) {
if (!empty(getDolGlobalString('$keyforlabel'))) {
print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
}
?>

View file

@ -134,7 +134,7 @@ if (!empty($user->socid)) {
}
// Load object modCodeProduct
$module = (getDolGlobalString('PRODUCT_CODEPRODUCT_ADDON') ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
$module = getDolGlobalString('PRODUCT_CODEPRODUCT_ADDON', 'mod_codeproduct_leopard');
if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {
$module = substr($module, 0, dol_strlen($module) - 4);
}
@ -672,7 +672,8 @@ if (empty($reshook)) {
// MultiPrix
if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 2; $i <= $produit_multiprices_limit; $i++) {
if (GETPOSTISSET("price_".$i)) {
$object->multiprices["$i"] = price2num(GETPOST("price_".$i), 'MU');
$object->multiprices_base_type["$i"] = GETPOST("multiprices_base_type_".$i);
@ -690,6 +691,7 @@ if (empty($reshook)) {
if (!$ref && getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
// Generate ref...
'@phan-var ModeleProductCode $modCodeProduct';
$ref = $modCodeProduct->getNextValue($object, $type);
}
@ -1067,7 +1069,7 @@ if (empty($reshook)) {
$price_base_type = $object->price_base_type;
// If multiprice
if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level) {
if (getDolGlobalString('PRODUIT_MULTIPRICES') && $soc->price_level) {
$pu_ht = $object->multiprices[$soc->price_level];
$pu_ttc = $object->multiprices_ttc[$soc->price_level];
$price_base_type = $object->multiprices_base_type[$soc->price_level];
@ -1279,7 +1281,7 @@ llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-product page-card');
// Load object modBarCodeProduct
$res = 0;
if (isModEnabled('barcode') && getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
$module = strtolower(getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM'));
$dirbarcode = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
foreach ($dirbarcode as $dirroot) {
$res = dol_include_once($dirroot.$module.'.php');
@ -1323,7 +1325,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Load object modCodeProduct
$module = (getDolGlobalString('PRODUCT_CODEPRODUCT_ADDON') ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
$module = getDolGlobalString('PRODUCT_CODEPRODUCT_ADDON', 'mod_codeproduct_leopard');
if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {
$module = substr($module, 0, dol_strlen($module) - 4);
}
@ -1440,7 +1442,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
';
}
if (isset($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS) && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced') {
print '
if (this.value == 2) {
$("#field_mask, #mask_option").toggleClass("hideobject");
@ -1581,7 +1583,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
print '<tr><td>'.$langs->trans("Weight").'</td><td>';
print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ? GETPOST('weight_units', 'alpha') : (!getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT') ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ? GETPOST('weight_units', 'alpha') : (!getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT') ? 0 : getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT')), 0, 2);
print '</td></tr>';
}
@ -1614,7 +1616,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Net Measure
print '<tr><td>'.$langs->trans("NetMeasure").'</td><td>';
print '<input name="net_measure" size="4" value="'.GETPOST('net_measure').'">';
print $formproduct->selectMeasuringUnits("net_measure_units", '', GETPOSTISSET('net_measure_units') ? GETPOST('net_measure_units', 'alpha') : (!getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT') ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 0);
print $formproduct->selectMeasuringUnits("net_measure_units", '', GETPOSTISSET('net_measure_units') ? GETPOST('net_measure_units', 'alpha') : (!getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT') ? 0 : getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT')), 0, 0);
print '</td></tr>';
}
}
@ -1623,7 +1625,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if (getDolGlobalString('PRODUCT_USE_UNITS')) {
print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
print '<td>';
print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, 'units');
print $form->selectUnits(empty($line->fk_unit) ? getDolGlobalString('PRODUCT_USE_UNITS') : $line->fk_unit, 'units');
print '</td></tr>';
}
@ -1671,7 +1673,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Note (private, no output on invoices, propales...)
//if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) available in create mode
//if (!empty(getDolGlobalString('MAIN_DISABLE_NOTES_TAB'))) available in create mode
//{
print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
@ -1714,7 +1716,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Price
print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
print $form->selectPriceBaseType(getDolGlobalString('PRODUCT_PRICE_BASE_TYPE'), "price_base_type");
print '</td></tr>';
// Min price

View file

@ -1035,7 +1035,7 @@ class Product extends CommonObject
// phpcs:enable
global $conf;
if (isModEnabled('barcode') && getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
$module = strtolower(getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM'));
$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
foreach ($dirsociete as $dirroot) {
@ -2750,7 +2750,8 @@ class Product extends CommonObject
// Load multiprices array
if (getDolGlobalString('PRODUIT_MULTIPRICES') && empty($ignore_price_load)) { // prices per segment
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
$sql .= " ,price_label";
@ -2866,7 +2867,8 @@ class Product extends CommonObject
return -1;
}
} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES') && empty($ignore_price_load)) { // prices per customer and quantity
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
$sql .= " FROM ".$this->db->prefix()."product_price";
@ -5922,7 +5924,7 @@ class Product extends CommonObject
$stock_sending_client = $this->stats_expedition['qty'];
}
if (isModEnabled("supplier_order")) {
$filterStatus = !getDolGlobalString('SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK') ? '3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK;
$filterStatus = getDolGlobalString('SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK', '3,4');
if (isset($includedraftpoforvirtual)) {
$filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
}
@ -6481,7 +6483,7 @@ class Product extends CommonObject
}
}
$maxpricesupplier *= $conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE;
$maxpricesupplier *= getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE');
}
}

View file

@ -205,7 +205,8 @@ if (empty($reshook)) {
if (!$error) {
if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
// Force the update of the price of the product using the new VAT
if ($object->multiprices_base_type[$i] == 'HT') {
$oldprice = $object->multiprices[$i];
@ -298,7 +299,8 @@ if (empty($reshook)) {
//Shall we generate prices using price rules?
$object->price_autogen = (int) (GETPOST('usePriceRules') == 'on');
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
if (!isset($newprice[$i])) {
continue;
}
@ -1069,7 +1071,8 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
print '<td style="text-align: right">'.$langs->trans("MinPrice").'</td>';
print '</tr>';
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
print '<tr class="oddeven">';
// Label of price
@ -1086,7 +1089,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
print '</form>';
} else {
print $langs->trans("SellingPrice").' '.$i;
if (!empty($conf->global->$keyforlabel)) {
if (!empty(getDolGlobalString('$keyforlabel'))) {
print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
}
}
@ -1119,7 +1122,7 @@ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUS
// Price by quantity
if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) { // TODO Fix the form included into a tr instead of a td
print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i;
if (!empty($conf->global->$keyforlabel)) {
if (!empty(getDolGlobalString('$keyforlabel'))) {
print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
}
print '</td><td colspan="2">';
@ -1611,7 +1614,8 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
print '<tbody>';
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalInt('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
print '<tr class="oddeven">';
print '<td>';
$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;

View file

@ -2497,11 +2497,14 @@ class Project extends CommonObject
}
$return .= '<span class="info-box-label">'.dol_print_date($this->date_end, 'day').'</span>';
}*/
if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
if (property_exists($this, 'thirdparty') && !is_null($this->thirdparty) && is_object($this->thirdparty) && $this->thirdparty instanceof Societe) {
$return .= '<br><div class="info-box-ref tdoverflowmax150 inline-block valignmiddle">'.$this->thirdparty->getNomUrl(1);
$return .= '</div><div class="inline-block valignmiddle">';
$return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone', $this->thirdparty->phone, 0, 'marginleftonly');
$return .= '</div>';
if (!empty($this->thirdparty->phone)) {
$return .= '<div class="inline-block valignmiddle">';
$return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone', $this->thirdparty->phone, 0, 'marginleftonly');
$return .= '</div>';
}
}
if (!empty($arraydata['assignedusers'])) {
$return .= '<br>';

View file

@ -141,6 +141,16 @@ if (empty($validpaymentmethod)) {
httponly_accessforbidden('No valid payment mode');
}
// Common variables
$creditor = $mysoc->name;
$paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
$paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
if (getDolGlobalString($paramcreditorlong)) {
$creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
} elseif (getDolGlobalString($paramcreditor)) {
$creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
}
$ispaymentok = false;
// If payment is ok
@ -238,6 +248,12 @@ if (empty($doactionsthenredirect)) {
print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
}
print '</div>';
} elseif ($creditor) {
print '<div class="backgreypublicpayment">';
print '<div class="logopublicpayment">';
print $creditor;
print '</div>';
print '</div>';
}
if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
print '<div class="backimagepublicpayment">';

View file

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
/* Copyright (C) 2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -301,7 +301,7 @@ class CompanyPaymentMode extends CommonObject
// For backward compatibility
$this->iban = $this->iban_prefix;
$this->date_modification = $this->tmps;
$this->date_modification = $this->tms;
//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
return $result;

View file

@ -204,7 +204,8 @@ class ProductCombination
if ($fk_price_level > 0) {
$combination_price_levels[$fk_price_level] = ProductCombinationLevel::createFromParent($this->db, $this, $fk_price_level);
} else {
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$combination_price_levels[$i] = ProductCombinationLevel::createFromParent($this->db, $this, $i);
}
}
@ -553,7 +554,8 @@ class ProductCombination
// MultiPrix
if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
if ($parent->multiprices[$i] != '' || isset($this->combination_price_levels[$i]->variation_price)) {
$new_type = empty($parent->multiprices_base_type[$i]) ? 'HT' : $parent->multiprices_base_type[$i];
$new_min_price = $parent->multiprices_min[$i];
@ -744,16 +746,16 @@ class ProductCombination
* [...]
* )
*
* @param User $user Object user
* @param Product $product Parent product
* @param array<int,int> $combinations Attribute and value combinations.
* @param User $user User
* @param Product $product Parent Product
* @param array<int,int> $combinations Attribute and value combinations.
* @param array<int,array<int,array{weight:string|float,price:string|float}>> $variations Price and weight variations (example: $variations[fk_product_attribute][fk_product_attribute_value]['weight'])
* @param bool|array $price_var_percent Is the price variation a relative variation?
* @param bool|float $forced_pricevar If the price variation is forced
* @param bool|float $forced_weightvar If the weight variation is forced
* @param bool|string $forced_refvar If the reference is forced
* @param string $ref_ext External reference
* @return int<-1,1> Return integer <0 KO, >0 OK
* @param bool|bool[] $price_var_percent Is the price variation value a relative variation (in %)? (it is an array if global constant "PRODUIT_MULTIPRICES" is on)
* @param false|float|float[] $forced_pricevar Value of the price variation if it is forced ; in currency or percent. (it is an array if global constant "PRODUIT_MULTIPRICES" is on)
* @param false|float $forced_weightvar Value of the weight variation if it is forced
* @param false|string $forced_refvar Value of the reference if it is forced
* @param string $ref_ext External reference
* @return int<-1,1> Return integer <0 KO, >0 OK
*/
public function createProductCombination(User $user, Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false, $forced_refvar = false, $ref_ext = '')
{
@ -846,8 +848,9 @@ class ProductCombination
$price_impact[1] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
// Manage Price levels
if ($conf->global->PRODUIT_MULTIPRICES) {
for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 2; $i <= $produit_multiprices_limit; $i++) {
$price_impact[$i] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
}
}
@ -874,8 +877,9 @@ class ProductCombination
$newcomb->variation_ref_ext = $this->db->escape($ref_ext);
// Init price level
if ($conf->global->PRODUIT_MULTIPRICES) {
for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
$produit_multiprices_limit = getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
for ($i = 1; $i <= $produit_multiprices_limit; $i++) {
$productCombinationLevel = new ProductCombinationLevel($this->db);
$productCombinationLevel->fk_product_attribute_combination = $newcomb->id;
$productCombinationLevel->fk_price_level = $i;
@ -1300,7 +1304,7 @@ class ProductCombinationLevel
$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
$sql .= " WHERE fk_product_attribute_combination = ".(int) $fk_product_attribute_combination;
$sql .= " AND fk_price_level > ".intval($conf->global->PRODUIT_MULTIPRICES_LIMIT);
$sql .= " AND fk_price_level > ".(int) getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT');
$res = $this->db->query($sql);
return $res ? 1 : -1;

View file

@ -40,8 +40,12 @@ $weight_impact = GETPOSTFLOAT('weight_impact', 2);
$price_impact_percent = (bool) GETPOST('price_impact_percent');
$price_impact = $price_impact_percent ? GETPOSTFLOAT('price_impact', 2) : GETPOSTFLOAT('price_impact', 'MU');
// for PRODUIT_MULTIPRICES
$level_price_impact = GETPOST('level_price_impact', 'array');
$level_price_impact = array_map('price2num', $level_price_impact);
$level_price_impact = array_map('floatval', $level_price_impact);
$level_price_impact_percent = GETPOST('level_price_impact_percent', 'array');
$level_price_impact_percent = array_map('boolval', $level_price_impact_percent);
$form = new Form($db);
@ -154,10 +158,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
$weight_impact = price2num($weight_impact);
$price_impact = price2num($price_impact);
// for conf PRODUIT_MULTIPRICES
if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
$level_price_impact = array_map('price2num', $level_price_impact);
} else {
if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
$level_price_impact = array(1 => $price_impact);
$level_price_impact_percent = array(1 => $price_impact_percent);
}
@ -280,15 +281,13 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
// for conf PRODUIT_MULTIPRICES
if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
$level_price_impact = array_map('price2num', $level_price_impact);
$prodcomb->variation_price = (float) $level_price_impact[1];
$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
$prodcomb->variation_price = $level_price_impact[1];
$prodcomb->variation_price_percentage = $level_price_impact_percent[1];
} else {
$level_price_impact = array(1 => $price_impact);
$level_price_impact_percent = array(1 => $price_impact_percent);
$prodcomb->variation_price = (float) $price_impact;
$prodcomb->variation_price = $price_impact;
$prodcomb->variation_price_percentage = $price_impact_percent;
}

View file

@ -210,9 +210,22 @@ class Target extends CommonObject
*/
public function initListOfTriggers()
{
$entitytoicon = array(
'societe' => 'company',
'facture' => 'bill',
'commande' => 'order',
'order_supplier' => 'supplier_order',
'proposal_supplier' => 'supplier_proposal',
'invoice_supplier' => 'supplier_invoice',
'facturerec' => 'bill',
'ficheinter' => 'intervention',
'shipping' => 'shipment',
'contrat' => 'contract',
'recruitment' => 'recruitmentjobposition',
);
// Define the array $arrayofkeyval for $this->fields["trigger_codes"]
if (!empty($this->fields["trigger_codes"]['arrayofkeyval']) && is_array($this->fields["trigger_codes"]['arrayofkeyval']) && !empty($this->fields["trigger_codes"]["multiinput"])) {
$sql = "SELECT c.code, c.label FROM ".MAIN_DB_PREFIX."c_action_trigger as c ORDER BY c.rang DESC";
$sql = "SELECT c.code, c.label, c.elementtype FROM ".MAIN_DB_PREFIX."c_action_trigger as c ORDER BY c.rang ASC";
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
@ -220,7 +233,8 @@ class Target extends CommonObject
$arraytrigger = array();
while ($i < $num) {
$obj = $this->db->fetch_object($resql);
$arraytrigger[$obj->code] = $obj->label.' ('.$obj->code.')';
$elementtype = (!empty($entitytoicon[$obj->elementtype]) ? $entitytoicon[$obj->elementtype] : $obj->elementtype);
$arraytrigger[$obj->code] = img_object("", $elementtype).' '.$obj->label.' ('.$obj->code.')';
$i++;
}
$this->fields["trigger_codes"]['arrayofkeyval'] = $arraytrigger;

View file

@ -4625,7 +4625,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') { // Edit properties
$formmail->withlayout = 1;
$showlinktolayout = $formmail->withlayout;
$showlinktoai = ($formmail->withaiprompt && isModEnabled('ai')) ? 'textgenerationwebpage' : '';
if ($action == 'createcontainer' && $showlinktolayout && $showlinktoai) {
if (($action == 'createcontainer' && $showlinktolayout) || ($action == 'createcontainer' && $showlinktoai)) {
print '<tr><td class="titlefield tdtop">';
if ($conf->browser->layout == 'phone') {
print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');