Dolibarr / dolibarr

htdocs/fourn/product/list.php

Spacing +4 added lines, -4 removed lines

@@ -29,9 +29,9 @@ 
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
 
 // Load translation files required by the page
@@ -308,7 +308,7 @@ 
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

htdocs/public/payment/paymentok.php

Spacing +49 added lines, -49 removed lines

@@ -146,9 +146,9 @@ 
 $paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
 $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
 if (getDolGlobalString($paramcreditorlong)) {
-	$creditor = getDolGlobalString($paramcreditorlong);	// use label long of the seller to show
+	$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
+	$creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
 }
 
 
@@ -197,7 +197,7 @@ 
 
 $head = '';
 if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -257,7 +257,7 @@ 
 	}
 	if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
 		print '<div class="backimagepublicpayment">';
-		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="' . getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
+		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
 		print '</div>';
 	}
 
@@ -277,7 +277,7 @@ 
 			// Set by newpayment.php
 			$currencyCodeType   = $_SESSION['currencyCodeType'];
 			$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-			$paymentType        = $_SESSION['PaymentType'];			// Value can be 'Mark', 'Sole', 'Sale' for example
+			$paymentType        = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example
 			// From env
 			$ipaddress          = $_SESSION['ipaddress'];
 
@@ -380,10 +380,10 @@ 
 	$ipaddress = $_SESSION['ipaddress'];
 }
 if (empty($TRANSACTIONID)) {
-	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' :$_SESSION['TRANSACTIONID'];	// pi_... or ch_...
+	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_...
 	if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
 		// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
-		$TRANSACTIONID   = GETPOST('payment_intent', 'alphanohtml');
+		$TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
 	}
 }
 if (empty($FinalPaymentAmt)) {
@@ -488,7 +488,7 @@ 
 
 						// Set amount for the subscription:
 						// - First check the amount of the member type.
-						$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
+						$amountbytype = $adht->amountByType(1); // Load the array of amount per type
 						$amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid];
 						// - If not found, take the default amount
 						if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
@@ -509,7 +509,7 @@ 
 				if (getDolGlobalString('MEMBER_MIN_AMOUNT')) {
 					if ($FinalPaymentAmt < $conf->global->MEMBER_MIN_AMOUNT) {
 						$error++;
-						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed (' . getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
+						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed ('.getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
 						dol_syslog("Failed to validate member (amount lower than minimum): ".$errmsg, LOG_ERR, 0, '_payment');
@@ -525,7 +525,7 @@ 
 					dol_syslog("Failed to validate member (bad currency check): ".$errmsg, LOG_ERR, 0, '_payment');
 				}
 
-				if (! $error) {
+				if (!$error) {
 					// We validate the member (no effect if it is already validated)
 					$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
 					if ($result < 0 || empty($object->datevalid)) {
@@ -688,7 +688,7 @@ 
 						$thirdparty = new Societe($db);
 						$thirdparty->fetch($thirdparty_id);
 
-						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';	// This also set $stripearrayofkeysbyenv
+						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv
 						$stripe = new Stripe($db);
 						//$stripeacc = $stripe->getStripeAccount($service);		Already defined previously
 
@@ -703,7 +703,7 @@ 
 
 								if (preg_match('/^pi_/', $TRANSACTIONID)) {
 									// This may throw an error if not found.
-									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID);	// payment_intent (pi_...)
+									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...)
 								} else {
 									// This throw an error if not found
 									$chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...)
@@ -906,7 +906,7 @@ 
 				$paiement->paiementid   = $paymentTypeId;
 				$paiement->num_payment = '';
 				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
-				$paiement->ext_payment_id = $TRANSACTIONID;		// TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
+				$paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
 				//$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer->id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key'];	// TODO LDR It would be better if we could store this. Do we have customer->id and publishable_key ?
 				$paiement->ext_payment_site = $service;
 
@@ -978,7 +978,7 @@ 
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
-		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$object = new Commande($db);
 		$result = $object->fetch((int) $tmptag['ORD']);
 		if ($result) {
@@ -1013,14 +1013,14 @@ 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (isModEnabled('invoice')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromOrder($object, $user);
 					if ($result > 0) {
 						$object->classifyBilled($user);
 						$invoice->validate($user);
 						// Creation of payment line
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 						$paiement = new Paiement($db);
 						$paiement->datepaye = $now;
 						if ($currencyCodeType == $conf->currency) {
@@ -1034,14 +1034,14 @@ 
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-						$paiement->ext_payment_id = $TRANSACTIONID;		// pi_... for Stripe, ...
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 						if (!$error) {
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
 							if ($paiement_id < 0) {
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
@@ -1078,7 +1078,7 @@ 
 								}
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 								if ($result < 0) {
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 									$ispostactionok = -1;
 									$error++;
 								} else {
@@ -1086,7 +1086,7 @@ 
 									$ispostactionok = 1;
 								}
 							} else {
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 								$ispostactionok = -1;
 								$error++;
 							}
@@ -1098,11 +1098,11 @@ 
 							$db->rollback();
 						}
 					} else {
-						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
+						$postactionmessages[] = 'Failed to create invoice form order '.$tmptag['ORD'].'.';
 						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of order '.$tmptag['ORD'].'. May be payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -1110,7 +1110,7 @@ 
 				$ispostactionok = -1;
 			}
 		} else {
-			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
+			$postactionmessages[] = 'Order paid '.$tmptag['ORD'].' was not found';
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
@@ -1167,7 +1167,7 @@ 
 				$paiement->datep = $now;
 				$paiement->paymenttype = $paymentTypeId;
 				$paiement->num_payment = '';
-				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+				$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
 				$paiement->ext_payment_id = $TRANSACTIONID;
 				$paiement->ext_payment_site = $service;
 
@@ -1384,7 +1384,7 @@ 
 						$db->rollback();
 					}
 
-					if (! $error) {
+					if (!$error) {
 						// Sending mail
 						$thirdparty = new Societe($db);
 						$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
@@ -1402,7 +1402,7 @@ 
 							// Get email content from template
 							$arraydefaultmessage = null;
 
-							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT');	// Email to send for Event organization registration
+							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'); // Email to send for Event organization registration
 
 							if (!empty($idoftemplatetouse)) {
 								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1604,18 +1604,18 @@ 
 						} else {
 							$booth->status = ConferenceOrBooth::STATUS_SUGGESTED;
 							$resultboothupdate = $booth->update($user);
-							if ($resultboothupdate<0) {
+							if ($resultboothupdate < 0) {
 								// Finding the thirdparty by getting the invoice
 								$invoice = new Facture($db);
 								$resultinvoice = $invoice->fetch($ref);
-								if ($resultinvoice<0) {
+								if ($resultinvoice < 0) {
 									$postactionmessages[] = 'Could not find the associated invoice.';
 									$ispostactionok = -1;
 									$error++;
 								} else {
 									$thirdparty = new Societe($db);
 									$resultthirdparty = $thirdparty->fetch($invoice->socid);
-									if ($resultthirdparty<0) {
+									if ($resultthirdparty < 0) {
 										$error++;
 										setEventMessages(null, $thirdparty->errors, "errors");
 									} else {
@@ -1631,7 +1631,7 @@ 
 										// Get email content from template
 										$arraydefaultmessage = null;
 
-										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH');	// Email sent after registration for a Booth
+										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'); // Email sent after registration for a Booth
 
 										if (!empty($idoftemplatetouse)) {
 											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1687,7 +1687,7 @@ 
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
-		include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 		$object = new Contrat($db);
 		$result = $object->fetch((int) $tmptag['CON']);
 		if ($result) {
@@ -1725,14 +1725,14 @@ 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (isModEnabled('invoice')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
 					if ($result > 0) {
 						// $object->classifyBilled($user);
 						$invoice->validate($user);
 						// Creation of payment line
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 						$paiement = new Paiement($db);
 						$paiement->datepaye = $now;
 						if ($currencyCodeType == $conf->currency) {
@@ -1746,14 +1746,14 @@ 
 						}
 						$paiement->paiementid = $paymentTypeId;
 						$paiement->num_payment = '';
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
-						$paiement->ext_payment_id = $TRANSACTIONID;		// pi_... for Stripe, ...
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+						$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
 
 						if (!$error) {
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
 							if ($paiement_id < 0) {
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 								$ispostactionok = -1;
 								$error++;
 							} else {
@@ -1790,7 +1790,7 @@ 
 								}
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
 								if ($result < 0) {
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
 									$ispostactionok = -1;
 									$error++;
 								} else {
@@ -1798,7 +1798,7 @@ 
 									$ispostactionok = 1;
 								}
 							} else {
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 								$ispostactionok = -1;
 								$error++;
 							}
@@ -1810,15 +1810,15 @@ 
 							$db->rollback();
 						}
 					} else {
-						$msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
+						$msg = 'Failed to create invoice form contract '.$tmptag['CON'];
 						if (!empty($cols)) {
-							$msg .= ' and col '. $cols .'.';
+							$msg .= ' and col '.$cols.'.';
 						}
 						$postactionmessages[] = $msg;
 						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of contract ' . $tmptag['CON'] .'. Maybe payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of contract '.$tmptag['CON'].'. Maybe payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -1826,9 +1826,9 @@ 
 				$ispostactionok = -1;
 			}
 		} else {
-			$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
+			$msg = 'Contract paid '.$tmptag['CON'].' was not found';
 			if (!empty($cols)) {
-				$msg .= ' for col '.$tmptag['COL'] .'.';
+				$msg .= ' for col '.$tmptag['COL'].'.';
 			}
 			$postactionmessages[] = $msg;
 			$ispostactionok = -1;
@@ -1844,8 +1844,8 @@ 
 	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
 	// Set by newpayment.php
 	$currencyCodeType   = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType'];
-	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '': $_SESSION["FinalPaymentAmt"];
-	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType'];	// Seems used by paypal only
+	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"];
+	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only
 
 	if (is_object($object) && method_exists($object, 'call_trigger')) {
 		// Call trigger
@@ -2082,7 +2082,7 @@ 
 		// Redirect to a success page
 		// Paymentok page must be created for the specific website
 		$ext_urlok = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentok&fulltag='.$FULLTAG;
-		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok) ."';</script>";
+		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok)."';</script>";
 	} else {
 		// Redirect to an error page
 		// Paymentko page must be created for the specific website

htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php

Indentation +18 added lines, -18 removed lines

@@ -162,29 +162,29 @@ 
 	/**
 	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
 	 */
-    define('QRSPEC_WIDTH_MAX', 177);
+	define('QRSPEC_WIDTH_MAX', 177);
 
 	// -----------------------------------------------------
 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH',    0);
 
-    /**
+	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS',    1);
 
-    /**
+	/**
 	 * Matrix index to get remainder from $capacity array.
 	 */
-    define('QRCAP_REMINDER', 2);
+	define('QRCAP_REMINDER', 2);
 
-    /**
+	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+	define('QRCAP_EC',       3);
 
 	// -----------------------------------------------------
 
@@ -193,33 +193,33 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS',  20);
 
-    /**
+	/**
 	 * Max number of symbols for structured mode
 	 */
-    define('MAX_STRUCTURED_SYMBOLS', 16);
+	define('MAX_STRUCTURED_SYMBOLS', 16);
 
 	// -----------------------------------------------------
 
-    // Masks
+	// Masks
 
-    /**
+	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+	define('N1',  3);
 
-    /**
+	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
 	define('N2',  3);
 
-    /**
+	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
 	 */
 	define('N3', 40);
 
-    /**
+	/**
 	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
 	 */
 	define('N4', 10);
@@ -2592,7 +2592,7 @@ 
 	}
 
 	/**
-	* Return block number 1
+	 * Return block number 1
 	 * @param array $spec
 	 * @return int value
 	 */

Spacing +263 added lines, -263 removed lines

@@ -169,12 +169,12 @@ 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+    define('QRCAP_WIDTH', 0);
 
     /**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+    define('QRCAP_WORDS', 1);
 
     /**
 	 * Matrix index to get remainder from $capacity array.
@@ -184,7 +184,7 @@ 
     /**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+    define('QRCAP_EC', 3);
 
 	// -----------------------------------------------------
 
@@ -193,7 +193,7 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+    define('STRUCTURE_HEADER_BITS', 20);
 
     /**
 	 * Max number of symbols for structured mode
@@ -207,12 +207,12 @@ 
     /**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+    define('N1', 3);
 
     /**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
-	define('N2',  3);
+	define('N2', 3);
 
     /**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
@@ -439,7 +439,7 @@ 
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
 		36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
-		 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, //
+		 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, //
 		-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
 		25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
@@ -452,47 +452,47 @@ 
 	 * @protected
 	 */
 	protected $capacity = array(
-		array(  0,    0, 0, array(   0,    0,    0,    0)), //
-		array( 21,   26, 0, array(   7,   10,   13,   17)), //  1
-		array( 25,   44, 7, array(  10,   16,   22,   28)), //
-		array( 29,   70, 7, array(  15,   26,   36,   44)), //
-		array( 33,  100, 7, array(  20,   36,   52,   64)), //
-		array( 37,  134, 7, array(  26,   48,   72,   88)), //  5
-		array( 41,  172, 7, array(  36,   64,   96,  112)), //
-		array( 45,  196, 0, array(  40,   72,  108,  130)), //
-		array( 49,  242, 0, array(  48,   88,  132,  156)), //
-		array( 53,  292, 0, array(  60,  110,  160,  192)), //
-		array( 57,  346, 0, array(  72,  130,  192,  224)), // 10
-		array( 61,  404, 0, array(  80,  150,  224,  264)), //
-		array( 65,  466, 0, array(  96,  176,  260,  308)), //
-		array( 69,  532, 0, array( 104,  198,  288,  352)), //
-		array( 73,  581, 3, array( 120,  216,  320,  384)), //
-		array( 77,  655, 3, array( 132,  240,  360,  432)), // 15
-		array( 81,  733, 3, array( 144,  280,  408,  480)), //
-		array( 85,  815, 3, array( 168,  308,  448,  532)), //
-		array( 89,  901, 3, array( 180,  338,  504,  588)), //
-		array( 93,  991, 3, array( 196,  364,  546,  650)), //
-		array( 97, 1085, 3, array( 224,  416,  600,  700)), // 20
-		array(101, 1156, 4, array( 224,  442,  644,  750)), //
-		array(105, 1258, 4, array( 252,  476,  690,  816)), //
-		array(109, 1364, 4, array( 270,  504,  750,  900)), //
-		array(113, 1474, 4, array( 300,  560,  810,  960)), //
-		array(117, 1588, 4, array( 312,  588,  870, 1050)), // 25
-		array(121, 1706, 4, array( 336,  644,  952, 1110)), //
-		array(125, 1828, 4, array( 360,  700, 1020, 1200)), //
-		array(129, 1921, 3, array( 390,  728, 1050, 1260)), //
-		array(133, 2051, 3, array( 420,  784, 1140, 1350)), //
-		array(137, 2185, 3, array( 450,  812, 1200, 1440)), // 30
-		array(141, 2323, 3, array( 480,  868, 1290, 1530)), //
-		array(145, 2465, 3, array( 510,  924, 1350, 1620)), //
-		array(149, 2611, 3, array( 540,  980, 1440, 1710)), //
-		array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
-		array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
-		array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
-		array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
-		array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
-		array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
-		array(177, 3706, 0, array( 750, 1372, 2040, 2430))  // 40
+		array(0, 0, 0, array(0, 0, 0, 0)), //
+		array(21, 26, 0, array(7, 10, 13, 17)), //  1
+		array(25, 44, 7, array(10, 16, 22, 28)), //
+		array(29, 70, 7, array(15, 26, 36, 44)), //
+		array(33, 100, 7, array(20, 36, 52, 64)), //
+		array(37, 134, 7, array(26, 48, 72, 88)), //  5
+		array(41, 172, 7, array(36, 64, 96, 112)), //
+		array(45, 196, 0, array(40, 72, 108, 130)), //
+		array(49, 242, 0, array(48, 88, 132, 156)), //
+		array(53, 292, 0, array(60, 110, 160, 192)), //
+		array(57, 346, 0, array(72, 130, 192, 224)), // 10
+		array(61, 404, 0, array(80, 150, 224, 264)), //
+		array(65, 466, 0, array(96, 176, 260, 308)), //
+		array(69, 532, 0, array(104, 198, 288, 352)), //
+		array(73, 581, 3, array(120, 216, 320, 384)), //
+		array(77, 655, 3, array(132, 240, 360, 432)), // 15
+		array(81, 733, 3, array(144, 280, 408, 480)), //
+		array(85, 815, 3, array(168, 308, 448, 532)), //
+		array(89, 901, 3, array(180, 338, 504, 588)), //
+		array(93, 991, 3, array(196, 364, 546, 650)), //
+		array(97, 1085, 3, array(224, 416, 600, 700)), // 20
+		array(101, 1156, 4, array(224, 442, 644, 750)), //
+		array(105, 1258, 4, array(252, 476, 690, 816)), //
+		array(109, 1364, 4, array(270, 504, 750, 900)), //
+		array(113, 1474, 4, array(300, 560, 810, 960)), //
+		array(117, 1588, 4, array(312, 588, 870, 1050)), // 25
+		array(121, 1706, 4, array(336, 644, 952, 1110)), //
+		array(125, 1828, 4, array(360, 700, 1020, 1200)), //
+		array(129, 1921, 3, array(390, 728, 1050, 1260)), //
+		array(133, 2051, 3, array(420, 784, 1140, 1350)), //
+		array(137, 2185, 3, array(450, 812, 1200, 1440)), // 30
+		array(141, 2323, 3, array(480, 868, 1290, 1530)), //
+		array(145, 2465, 3, array(510, 924, 1350, 1620)), //
+		array(149, 2611, 3, array(540, 980, 1440, 1710)), //
+		array(153, 2761, 3, array(570, 1036, 1530, 1800)), //
+		array(157, 2876, 0, array(570, 1064, 1590, 1890)), // 35
+		array(161, 3034, 0, array(600, 1120, 1680, 1980)), //
+		array(165, 3196, 0, array(630, 1204, 1770, 2100)), //
+		array(169, 3362, 0, array(660, 1260, 1860, 2220)), //
+		array(173, 3532, 0, array(720, 1316, 1950, 2310)), //
+		array(177, 3706, 0, array(750, 1372, 2040, 2430))  // 40
 	);
 
 	/**
@@ -501,9 +501,9 @@ 
 	 */
 	protected $lengthTableBits = array(
 		array(10, 12, 14),
-		array( 9, 11, 13),
-		array( 8, 16, 16),
-		array( 8, 10, 12)
+		array(9, 11, 13),
+		array(8, 16, 16),
+		array(8, 10, 12)
 	);
 
 	/**
@@ -512,47 +512,47 @@ 
 	 * @protected
 	 */
 	protected $eccTable = array(
-		array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)), //
-		array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //  1
-		array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //
-		array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)), //
-		array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)), //
-		array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), //  5
-		array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)), //
-		array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)), //
-		array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)), //
-		array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)), //
-		array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), // 10
-		array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)), //
-		array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)), //
-		array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)), //
-		array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)), //
-		array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), // 15
-		array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)), //
-		array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)), //
-		array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)), //
-		array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)), //
-		array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), // 20
-		array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)), //
-		array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)), //
-		array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)), //
-		array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)), //
-		array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
-		array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)), //
-		array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)), //
-		array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
-		array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)), //
-		array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
-		array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)), //
-		array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)), //
-		array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)), //
-		array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)), //
-		array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), // 35
-		array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
-		array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)), //
-		array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
-		array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)), //
-		array(array(19,  6), array(18, 31), array(34, 34), array(20, 61))  // 40
+		array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)), //
+		array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //  1
+		array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //
+		array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)), //
+		array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)), //
+		array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), //  5
+		array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)), //
+		array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)), //
+		array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)), //
+		array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)), //
+		array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), // 10
+		array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)), //
+		array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)), //
+		array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)), //
+		array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)), //
+		array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), // 15
+		array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)), //
+		array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)), //
+		array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)), //
+		array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)), //
+		array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), // 20
+		array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)), //
+		array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)), //
+		array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)), //
+		array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)), //
+		array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), // 25
+		array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), //
+		array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)), //
+		array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)), //
+		array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)), //
+		array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
+		array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)), //
+		array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), //
+		array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), //
+		array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), //
+		array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), // 35
+		array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)), //
+		array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), //
+		array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)), //
+		array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), //
+		array(array(19, 6), array(18, 31), array(34, 34), array(20, 61))  // 40
 	);
 
 	/**
@@ -562,9 +562,9 @@ 
 	 * @protected
 	 */
 	protected $alignmentPattern = array(
-		array( 0,  0),
-		array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), //  1- 5
-		array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
+		array(0, 0),
+		array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), //  1- 5
+		array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
 		array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
 		array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
 		array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
@@ -640,7 +640,7 @@ 
 		foreach ($qrTab as $line) {
 			$arrAdd = array();
 			foreach (str_split($line) as $char) {
-				$arrAdd[] = ($char=='1')?1:0;
+				$arrAdd[] = ($char == '1') ? 1 : 0;
 			}
 			$barcode_array['bcode'][] = $arrAdd;
 		}
@@ -665,8 +665,8 @@ 
 		$len = count($frame);
 		// the frame is square (width = height)
 		foreach ($frame as &$frameLine) {
-			for ($i=0; $i<$len; $i++) {
-				$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
+			for ($i = 0; $i < $len; $i++) {
+				$frameLine[$i] = (ord($frameLine[$i])&1) ? '1' : '0';
 			}
 		}
 		return $frame;
@@ -717,10 +717,10 @@ 
 		$this->dir = -1;
 		$this->bit = -1;
 		// inteleaved data and ecc codes
-		for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
+		for ($i = 0; $i < ($this->dataLength + $this->eccLength); $i++) {
 			$code = $this->getCode();
 			$bit = 0x80;
-			for ($j=0; $j<8; $j++) {
+			for ($j = 0; $j < 8; $j++) {
 				$addr = $this->getNextPosition();
 				$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
 				$bit = $bit >> 1;
@@ -728,7 +728,7 @@ 
 		}
 		// remainder bits
 		$j = $this->getRemainder($this->version);
-		for ($i=0; $i<$j; $i++) {
+		for ($i = 0; $i < $j; $i++) {
 			$addr = $this->getNextPosition();
 			$this->setFrameAt($addr, 0x02);
 		}
@@ -818,7 +818,7 @@ 
 			}
 			$this->x = $x;
 			$this->y = $y;
-		} while(ord($this->frame[$y][$x]) & 0x80);
+		} while (ord($this->frame[$y][$x]) & 0x80);
 		return array('x'=>$x, 'y'=>$y);
 	}
 
@@ -839,7 +839,7 @@ 
 		$dataPos = 0;
 		$eccPos = 0;
 		$endfor = $this->rsBlockNum1($spec);
-		for ($i=0; $i < $endfor; ++$i) {
+		for ($i = 0; $i < $endfor; ++$i) {
 			$ecc = array_slice($this->ecccode, $eccPos);
 			$this->rsblocks[$blockNo] = array();
 			$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -847,7 +847,7 @@ 
 			$this->rsblocks[$blockNo]['eccLength'] = $el;
 			$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
 			$this->rsblocks[$blockNo]['ecc'] = $ecc;
-			$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
+			$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
 			$dataPos += $dl;
 			$eccPos += $el;
 			$blockNo++;
@@ -862,7 +862,7 @@ 
 			return -1;
 		}
 		$endfor = $this->rsBlockNum2($spec);
-		for ($i=0; $i < $endfor; ++$i) {
+		for ($i = 0; $i < $endfor; ++$i) {
 			$ecc = array_slice($this->ecccode, $eccPos);
 			$this->rsblocks[$blockNo] = array();
 			$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -885,7 +885,7 @@ 
 	protected function getCode() {
 		if ($this->count < $this->dataLength) {
 			$row = $this->count % $this->blocks;
-			$col = (int)($this->count / $this->blocks);
+			$col = (int) ($this->count / $this->blocks);
 			if ($col >= $this->rsblocks[0]['dataLength']) {
 				$row += $this->b1;
 			}
@@ -893,7 +893,7 @@ 
 			$ret = $this->rsblocks[$row]['data'][$col];
 		} elseif ($this->count < $this->dataLength + $this->eccLength) {
 			$row = ($this->count - $this->dataLength) % $this->blocks;
-			$col = (int)(($this->count - $this->dataLength) / $this->blocks);
+			$col = (int) (($this->count - $this->dataLength) / $this->blocks);
 			$ret = $this->rsblocks[$row]['ecc'][$col];
 		} else {
 			return 0;
@@ -916,8 +916,8 @@ 
 	 */
 	 protected function writeFormatInformation($width, &$frame, $mask, $level) {
 		$blacks = 0;
-		$format =  $this->getFormatInfo($mask, $level);
-		for ($i=0; $i<8; ++$i) {
+		$format = $this->getFormatInfo($mask, $level);
+		for ($i = 0; $i < 8; ++$i) {
 			if ($format & 1) {
 				$blacks += 2;
 				$v = 0x85;
@@ -932,7 +932,7 @@ 
 			}
 			$format = $format >> 1;
 		}
-		for ($i=0; $i<7; ++$i) {
+		for ($i = 0; $i < 7; ++$i) {
 		if ($format & 1) {
 			$blacks += 2;
 			$v = 0x85;
@@ -997,7 +997,7 @@ 
 	 * @return int mask
 	 */
 	 protected function mask4($x, $y) {
-		return (((int)($y / 2)) + ((int)($x / 3))) & 1;
+		return (((int) ($y / 2)) + ((int) ($x / 3))) & 1;
 	}
 
 	/**
@@ -1039,13 +1039,13 @@ 
 	 */
 	protected function generateMaskNo($maskNo, $width, $frame) {
 		$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
-		for ($y=0; $y<$width; ++$y) {
-			for ($x=0; $x<$width; ++$x) {
+		for ($y = 0; $y < $width; ++$y) {
+			for ($x = 0; $x < $width; ++$x) {
 				if (ord($frame[$y][$x]) & 0x80) {
 					$bitMask[$y][$x] = 0;
 				} else {
 					$maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
-					$bitMask[$y][$x] = ($maskFunc == 0)?1:0;
+					$bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
 				}
 			}
 		}
@@ -1061,7 +1061,7 @@ 
 	 * @param boolean $maskGenOnly
 	 * @return int b
 	 */
-	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
+	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) {
 		$b = 0;
 		$bitMask = array();
 		$bitMask = $this->generateMaskNo($maskNo, $width, $s);
@@ -1069,12 +1069,12 @@ 
 			return;
 		}
 		$d = $s;
-		for ($y=0; $y<$width; ++$y) {
-			for ($x=0; $x<$width; ++$x) {
+		for ($y = 0; $y < $width; ++$y) {
+			for ($x = 0; $x < $width; ++$x) {
 				if ($bitMask[$y][$x] == 1) {
-					$d[$y][$x] = chr(ord($s[$y][$x]) ^ ((int)($bitMask[$y][$x])));
+					$d[$y][$x] = chr(ord($s[$y][$x]) ^ ((int) ($bitMask[$y][$x])));
 				}
-				$b += (int)(ord($d[$y][$x]) & 1);
+				$b += (int) (ord($d[$y][$x]) & 1);
 			}
 		}
 		return $b;
@@ -1102,20 +1102,20 @@ 
 	 */
 	 protected function calcN1N3($length) {
 		$demerit = 0;
-		for ($i=0; $i<$length; ++$i) {
+		for ($i = 0; $i < $length; ++$i) {
 			if ($this->runLength[$i] >= 5) {
 				$demerit += (N1 + ($this->runLength[$i] - 5));
 			}
 			if ($i & 1) {
-				if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
-					$fact = (int)($this->runLength[$i] / 3);
-					if (($this->runLength[$i-2] == $fact)
-						AND ($this->runLength[$i-1] == $fact)
-						AND ($this->runLength[$i+1] == $fact)
-						AND ($this->runLength[$i+2] == $fact)) {
-						if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
+				if (($i >= 3) AND ($i < ($length - 2)) AND ($this->runLength[$i] % 3 == 0)) {
+					$fact = (int) ($this->runLength[$i] / 3);
+					if (($this->runLength[$i - 2] == $fact)
+						AND ($this->runLength[$i - 1] == $fact)
+						AND ($this->runLength[$i + 1] == $fact)
+						AND ($this->runLength[$i + 2] == $fact)) {
+						if (($this->runLength[$i - 3] < 0) OR ($this->runLength[$i - 3] >= (4 * $fact))) {
 							$demerit += N3;
-						} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
+						} elseif ((($i + 3) >= $length) OR ($this->runLength[$i + 3] >= (4 * $fact))) {
 							$demerit += N3;
 						}
 					}
@@ -1134,17 +1134,17 @@ 
 	 protected function evaluateSymbol($width, $frame) {
 		$head = 0;
 		$demerit = 0;
-		for ($y=0; $y<$width; ++$y) {
+		for ($y = 0; $y < $width; ++$y) {
 			$head = 0;
 			$this->runLength[0] = 1;
 			$frameY = $frame[$y];
 			if ($y > 0) {
-				$frameYM = $frame[$y-1];
+				$frameYM = $frame[$y - 1];
 			}
-			for ($x=0; $x<$width; ++$x) {
+			for ($x = 0; $x < $width; ++$x) {
 				if (($x > 0) AND ($y > 0)) {
-					$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
-					$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
+					$b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
+					$w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
 					if (($b22 | ($w22 ^ 1)) & 1) {
 						$demerit += N2;
 					}
@@ -1154,7 +1154,7 @@ 
 					$head = 1;
 					$this->runLength[$head] = 1;
 				} elseif ($x > 0) {
-					if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
+					if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
 						$head++;
 						$this->runLength[$head] = 1;
 					} else {
@@ -1162,18 +1162,18 @@ 
 					}
 				}
 			}
-			$demerit += $this->calcN1N3($head+1);
+			$demerit += $this->calcN1N3($head + 1);
 		}
-		for ($x=0; $x<$width; ++$x) {
+		for ($x = 0; $x < $width; ++$x) {
 			$head = 0;
 			$this->runLength[0] = 1;
-			for ($y=0; $y<$width; ++$y) {
+			for ($y = 0; $y < $width; ++$y) {
 				if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
 					$this->runLength[0] = -1;
 					$head = 1;
 					$this->runLength[$head] = 1;
 				} elseif ($y > 0) {
-					if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
+					if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
 						$head++;
 						$this->runLength[$head] = 1;
 					} else {
@@ -1181,7 +1181,7 @@ 
 					}
 				}
 			}
-			$demerit += $this->calcN1N3($head+1);
+			$demerit += $this->calcN1N3($head + 1);
 		}
 		return $demerit;
 	}
@@ -1200,8 +1200,8 @@ 
 		$checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
 		if (QR_FIND_FROM_RANDOM !== false) {
 			$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
-			for ($i = 0; $i <  $howManuOut; ++$i) {
-				$remPos = rand (0, count($checked_masks)-1);
+			for ($i = 0; $i < $howManuOut; ++$i) {
+				$remPos = rand(0, count($checked_masks) - 1);
 				unset($checked_masks[$remPos]);
 				$checked_masks = array_values($checked_masks);
 			}
@@ -1213,8 +1213,8 @@ 
 			$blacks = 0;
 			$blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
 			$blacks += $this->writeFormatInformation($width, $mask, $i, $level);
-			$blacks  = (int)(100 * $blacks / ($width * $width));
-			$demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
+			$blacks  = (int) (100 * $blacks / ($width * $width));
+			$demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);
 			$demerit += $this->evaluateSymbol($width, $mask);
 			if ($demerit < $minDemerit) {
 				$minDemerit = $demerit;
@@ -1239,7 +1239,7 @@ 
 		if ($pos >= strlen($str)) {
 			return false;
 		}
-		return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
+		return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
 	}
 
 	/**
@@ -1270,8 +1270,8 @@ 
 		} elseif ($this->isalnumat($this->dataStr, $pos)) {
 			return QR_MODE_AN;
 		} elseif ($this->hint == QR_MODE_KJ) {
-			if ($pos+1 < strlen($this->dataStr)) {
-				$d = $this->dataStr[$pos+1];
+			if ($pos + 1 < strlen($this->dataStr)) {
+				$d = $this->dataStr[$pos + 1];
 				$word = (ord($c) << 8) | ord($d);
 				if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
 					return QR_MODE_KJ;
@@ -1288,7 +1288,7 @@ 
 	 protected function eatNum() {
 		$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 		$p = 0;
-		while($this->isdigitat($this->dataStr, $p)) {
+		while ($this->isdigitat($this->dataStr, $p)) {
 			$p++;
 		}
 		$run = $p;
@@ -1304,7 +1304,7 @@ 
 		if ($mode == QR_MODE_AN) {
 			$dif = $this->estimateBitsModeNum($run) + 4 + $ln
 			+ $this->estimateBitsModeAn(1)        // + 4 + la
-			- $this->estimateBitsModeAn($run + 1);// - 4 - la
+			- $this->estimateBitsModeAn($run + 1); // - 4 - la
 			if ($dif > 0) {
 				return $this->eatAn();
 			}
@@ -1318,13 +1318,13 @@ 
 	 * @return int run
 	 */
 	 protected function eatAn() {
-		$la = $this->lengthIndicator(QR_MODE_AN,  $this->version);
+		$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
 		$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
-		$p =1 ;
-		while($this->isalnumat($this->dataStr, $p)) {
+		$p = 1;
+		while ($this->isalnumat($this->dataStr, $p)) {
 			if ($this->isdigitat($this->dataStr, $p)) {
 				$q = $p;
-				while($this->isdigitat($this->dataStr, $q)) {
+				while ($this->isdigitat($this->dataStr, $q)) {
 					$q++;
 				}
 				$dif = $this->estimateBitsModeAn($p) // + 4 + la
@@ -1358,7 +1358,7 @@ 
 	 */
 	 protected function eatKanji() {
 		$p = 0;
-		while($this->identifyMode($p) == QR_MODE_KJ) {
+		while ($this->identifyMode($p) == QR_MODE_KJ) {
 			$p += 2;
 		}
 		$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
@@ -1375,14 +1375,14 @@ 
 		$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
 		$p = 1;
 		$dataStrLen = strlen($this->dataStr);
-		while($p < $dataStrLen) {
+		while ($p < $dataStrLen) {
 			$mode = $this->identifyMode($p);
 			if ($mode == QR_MODE_KJ) {
 				break;
 			}
 			if ($mode == QR_MODE_NM) {
 				$q = $p;
-				while($this->isdigitat($this->dataStr, $q)) {
+				while ($this->isdigitat($this->dataStr, $q)) {
 					$q++;
 				}
 				$dif = $this->estimateBitsMode8($p) // + 4 + l8
@@ -1395,7 +1395,7 @@ 
 				}
 			} elseif ($mode == QR_MODE_AN) {
 				$q = $p;
-				while($this->isalnumat($this->dataStr, $q)) {
+				while ($this->isalnumat($this->dataStr, $q)) {
 					$q++;
 				}
 				$dif = $this->estimateBitsMode8($p)  // + 4 + l8
@@ -1487,7 +1487,7 @@ 
 	 * @param array $bstream
 	 * @return array input item
 	 */
-	 protected function newInputItem($mode, $size, $data, $bstream=null) {
+	 protected function newInputItem($mode, $size, $data, $bstream = null) {
 		$setData = array_slice($data, 0, $size);
 		if (count($setData) < $size) {
 			$setData = array_merge($setData, array_fill(0, ($size - count($setData)), 0));
@@ -1510,23 +1510,23 @@ 
 	 * @return array input item
 	 */
 	 protected function encodeModeNum($inputitem, $version) {
-		$words = (int)($inputitem['size'] / 3);
+		$words = (int) ($inputitem['size'] / 3);
 		$inputitem['bstream'] = array();
 		$val = 0x1;
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_NM, $version), $inputitem['size']);
-		for ($i=0; $i < $words; ++$i) {
-			$val  = (ord($inputitem['data'][$i*3  ]) - ord('0')) * 100;
-			$val += (ord($inputitem['data'][$i*3+1]) - ord('0')) * 10;
-			$val += (ord($inputitem['data'][$i*3+2]) - ord('0'));
+		for ($i = 0; $i < $words; ++$i) {
+			$val  = (ord($inputitem['data'][$i * 3]) - ord('0')) * 100;
+			$val += (ord($inputitem['data'][$i * 3 + 1]) - ord('0')) * 10;
+			$val += (ord($inputitem['data'][$i * 3 + 2]) - ord('0'));
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val);
 		}
 		if ($inputitem['size'] - $words * 3 == 1) {
-			$val = ord($inputitem['data'][$words*3]) - ord('0');
+			$val = ord($inputitem['data'][$words * 3]) - ord('0');
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
 		} elseif (($inputitem['size'] - ($words * 3)) == 2) {
-			$val  = (ord($inputitem['data'][$words*3  ]) - ord('0')) * 10;
-			$val += (ord($inputitem['data'][$words*3+1]) - ord('0'));
+			$val  = (ord($inputitem['data'][$words * 3]) - ord('0')) * 10;
+			$val += (ord($inputitem['data'][$words * 3 + 1]) - ord('0'));
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val);
 		}
 		return $inputitem;
@@ -1539,13 +1539,13 @@ 
 	 * @return array input item
 	 */
 	 protected function encodeModeAn($inputitem, $version) {
-		$words = (int)($inputitem['size'] / 2);
+		$words = (int) ($inputitem['size'] / 2);
 		$inputitem['bstream'] = array();
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
-		for ($i=0; $i < $words; ++$i) {
-			$val  = (int)($this->lookAnTable(ord($inputitem['data'][$i*2])) * 45);
-			$val += (int)($this->lookAnTable(ord($inputitem['data'][($i*2)+1])));
+		for ($i = 0; $i < $words; ++$i) {
+			$val  = (int) ($this->lookAnTable(ord($inputitem['data'][$i * 2])) * 45);
+			$val += (int) ($this->lookAnTable(ord($inputitem['data'][($i * 2) + 1])));
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
 		}
 		if ($inputitem['size'] & 1) {
@@ -1565,7 +1565,7 @@ 
 		$inputitem['bstream'] = array();
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4);
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_8B, $version), $inputitem['size']);
-		for ($i=0; $i < $inputitem['size']; ++$i) {
+		for ($i = 0; $i < $inputitem['size']; ++$i) {
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][$i]));
 		}
 		return $inputitem;
@@ -1580,9 +1580,9 @@ 
 	 protected function encodeModeKanji($inputitem, $version) {
 		$inputitem['bstream'] = array();
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8);
-		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int)($inputitem['size'] / 2));
-		for ($i=0; $i<$inputitem['size']; $i+=2) {
-			$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i+1]);
+		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int) ($inputitem['size'] / 2));
+		for ($i = 0; $i < $inputitem['size']; $i += 2) {
+			$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i + 1]);
 			if ($val <= 0x9ffc) {
 				$val -= 0x8140;
 			} else {
@@ -1627,7 +1627,7 @@ 
 			$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
 			$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
 		} else {
-			switch($inputitem['mode']) {
+			switch ($inputitem['mode']) {
 				case QR_MODE_NM: {
 					$inputitem = $this->encodeModeNum($inputitem, $version);
 					break;
@@ -1708,7 +1708,7 @@ 
 		$parity = 0;
 		foreach ($items as $item) {
 			if ($item['mode'] != QR_MODE_ST) {
-				for ($i=$item['size']-1; $i>=0; --$i) {
+				for ($i = $item['size'] - 1; $i >= 0; --$i) {
 					$parity ^= $item['data'][$i];
 				}
 			}
@@ -1723,8 +1723,8 @@ 
 	 * @return boolean true or false
 	 */
 	 protected function checkModeNum($size, $data) {
-		for ($i=0; $i<$size; ++$i) {
-			if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
+		for ($i = 0; $i < $size; ++$i) {
+			if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))) {
 				return false;
 			}
 		}
@@ -1737,7 +1737,7 @@ 
 	 * @return int value
 	 */
 	protected function lookAnTable($c) {
-		return (($c > 127)?-1:$this->anTable[$c]);
+		return (($c > 127) ?-1 : $this->anTable[$c]);
 	}
 
 	/**
@@ -1747,7 +1747,7 @@ 
 	 * @return boolean true or false
 	 */
 	 protected function checkModeAn($size, $data) {
-		for ($i=0; $i<$size; ++$i) {
+		for ($i = 0; $i < $size; ++$i) {
 			if ($this->lookAnTable(ord($data[$i])) == -1) {
 				return false;
 			}
@@ -1761,9 +1761,9 @@ 
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsModeNum($size) {
-		$w = (int)($size / 3);
+		$w = (int) ($size / 3);
 		$bits = ($w * 10);
-		switch($size - ($w * 3)) {
+		switch ($size - ($w * 3)) {
 			case 1: {
 				$bits += 4;
 				break;
@@ -1782,7 +1782,7 @@ 
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsModeAn($size) {
-		$bits = (int)($size * 5.5); // (size / 2 ) * 11
+		$bits = (int) ($size * 5.5); // (size / 2 ) * 11
 		if ($size & 1) {
 			$bits += 6;
 		}
@@ -1795,7 +1795,7 @@ 
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsMode8($size) {
-		return (int)($size * 8);
+		return (int) ($size * 8);
 	}
 
 	/**
@@ -1804,7 +1804,7 @@ 
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsModeKanji($size) {
-		return (int)($size * 6.5); // (size / 2 ) * 13
+		return (int) ($size * 6.5); // (size / 2 ) * 13
 	}
 
 	/**
@@ -1817,8 +1817,8 @@ 
 		if ($size & 1) {
 			return false;
 		}
-		for ($i=0; $i<$size; $i+=2) {
-			$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
+		for ($i = 0; $i < $size; $i += 2) {
+			$val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
 			if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
 				return false;
 			}
@@ -1837,7 +1837,7 @@ 
 		if ($size <= 0) {
 			return false;
 		}
-		switch($mode) {
+		switch ($mode) {
 			case QR_MODE_NM: {
 				return $this->checkModeNum($size, $data);
 			}
@@ -1872,7 +1872,7 @@ 
 			$version = 1;
 		}
 		foreach ($items as $item) {
-			switch($item['mode']) {
+			switch ($item['mode']) {
 				case QR_MODE_NM: {
 					$bits = $this->estimateBitsModeNum($item['size']);
 					break;
@@ -1898,7 +1898,7 @@ 
 			}
 			$l = $this->lengthIndicator($item['mode'], $version);
 			$m = 1 << $l;
-			$num = (int)(($item['size'] + $m - 1) / $m);
+			$num = (int) (($item['size'] + $m - 1) / $m);
 			$bits += $num * (4 + $l);
 		}
 		return $bits;
@@ -1915,7 +1915,7 @@ 
 		do {
 			$prev = $version;
 			$bits = $this->estimateBitStreamSize($items, $prev);
-			$version = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+			$version = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level);
 			if ($version < 0) {
 				return -1;
 			}
@@ -1932,9 +1932,9 @@ 
 	 */
 	 protected function lengthOfCode($mode, $version, $bits) {
 		$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
-		switch($mode) {
+		switch ($mode) {
 			case QR_MODE_NM: {
-				$chunks = (int)($payload / 10);
+				$chunks = (int) ($payload / 10);
 				$remain = $payload - $chunks * 10;
 				$size = $chunks * 3;
 				if ($remain >= 7) {
@@ -1945,7 +1945,7 @@ 
 				break;
 			}
 			case QR_MODE_AN: {
-				$chunks = (int)($payload / 11);
+				$chunks = (int) ($payload / 11);
 				$remain = $payload - $chunks * 11;
 				$size = $chunks * 2;
 				if ($remain >= 6) {
@@ -1954,15 +1954,15 @@ 
 				break;
 			}
 			case QR_MODE_8B: {
-				$size = (int)($payload / 8);
+				$size = (int) ($payload / 8);
 				break;
 			}
 			case QR_MODE_KJ: {
-				$size = (int)(($payload / 13) * 2);
+				$size = (int) (($payload / 13) * 2);
 				break;
 			}
 			case QR_MODE_ST: {
-				$size = (int)($payload / 8);
+				$size = (int) ($payload / 8);
 				break;
 			}
 			default: {
@@ -2012,7 +2012,7 @@ 
 			if ($bits < 0) {
 				return -1;
 			}
-			$ver = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
+			$ver = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level);
 			if ($ver < 0) {
 				return -1;
 			} elseif ($ver > $this->version) {
@@ -2043,14 +2043,14 @@ 
 			return $this->appendNum($bstream, $maxbits - $bits, 0);
 		}
 		$bits += 4;
-		$words = (int)(($bits + 7) / 8);
+		$words = (int) (($bits + 7) / 8);
 		$padding = array();
 		$padding = $this->appendNum($padding, $words * 8 - $bits + 4, 0);
 		$padlen = $maxwords - $words;
 		if ($padlen > 0) {
 			$padbuf = array();
-			for ($i=0; $i<$padlen; ++$i) {
-				$padbuf[$i] = ($i&1)?0x11:0xec;
+			for ($i = 0; $i < $padlen; ++$i) {
+				$padbuf[$i] = ($i&1) ? 0x11 : 0xec;
 			}
 			$padding = $this->appendBytes($padding, $padlen, $padbuf);
 		}
@@ -2116,7 +2116,7 @@ 
 	 protected function newFromNum($bits, $num) {
 		$bstream = $this->allocate($bits);
 		$mask = 1 << ($bits - 1);
-		for ($i=0; $i<$bits; ++$i) {
+		for ($i = 0; $i < $bits; ++$i) {
 			if ($num & $mask) {
 				$bstream[$i] = 1;
 			} else {
@@ -2135,10 +2135,10 @@ 
 	 */
 	 protected function newFromBytes($size, $data) {
 		$bstream = $this->allocate($size * 8);
-		$p=0;
-		for ($i=0; $i<$size; ++$i) {
+		$p = 0;
+		for ($i = 0; $i < $size; ++$i) {
 			$mask = 0x80;
-			for ($j=0; $j<8; ++$j) {
+			for ($j = 0; $j < 8; ++$j) {
 				if ($data[$i] & $mask) {
 					$bstream[$p] = 1;
 				} else {
@@ -2210,12 +2210,12 @@ 
 		if ($size == 0) {
 			return array();
 		}
-		$data = array_fill(0, (int)(($size + 7) / 8), 0);
-		$bytes = (int)($size / 8);
+		$data = array_fill(0, (int) (($size + 7) / 8), 0);
+		$bytes = (int) ($size / 8);
 		$p = 0;
-		for ($i=0; $i<$bytes; $i++) {
+		for ($i = 0; $i < $bytes; $i++) {
 			$v = 0;
-			for ($j=0; $j<8; $j++) {
+			for ($j = 0; $j < 8; $j++) {
 				$v = $v << 1;
 				$v |= $bstream[$p];
 				$p++;
@@ -2224,7 +2224,7 @@ 
 		}
 		if ($size & 7) {
 			$v = 0;
-			for ($j=0; $j<($size & 7); $j++) {
+			for ($j = 0; $j < ($size & 7); $j++) {
 				$v = $v << 1;
 				$v |= $bstream[$p];
 				$p++;
@@ -2247,8 +2247,8 @@ 
 	 * @param int $replLen length of the repl string
 	 * @return array srctab
 	 */
-	 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
-		$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
+	 protected function qrstrset($srctab, $x, $y, $repl, $replLen = false) {
+		$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
 		return $srctab;
 	}
 
@@ -2268,7 +2268,7 @@ 
 	 * @param int $level error correction level
 	 * @return int ECC size (bytes)
 	 */
-	protected function getECCLength($version, $level){
+	protected function getECCLength($version, $level) {
 		return $this->capacity[$version][QRCAP_EC][$level];
 	}
 
@@ -2369,14 +2369,14 @@ 
 		$ecc = $this->getECCLength($version, $level);
 		if ($b2 == 0) {
 			$spec[0] = $b1;
-			$spec[1] = (int)($data / $b1);
-			$spec[2] = (int)($ecc / $b1);
+			$spec[1] = (int) ($data / $b1);
+			$spec[2] = (int) ($ecc / $b1);
 			$spec[3] = 0;
 			$spec[4] = 0;
 		} else {
 			$spec[0] = $b1;
-			$spec[1] = (int)($data / ($b1 + $b2));
-			$spec[2] = (int)($ecc  / ($b1 + $b2));
+			$spec[1] = (int) ($data / ($b1 + $b2));
+			$spec[2] = (int) ($ecc / ($b1 + $b2));
 			$spec[3] = $b2;
 			$spec[4] = $spec[1] + 1;
 		}
@@ -2400,8 +2400,8 @@ 
 			);
 		$yStart = $oy - 2;
 		$xStart = $ox - 2;
-		for ($y=0; $y < 5; $y++) {
-			$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
+		for ($y = 0; $y < 5; $y++) {
+			$frame = $this->qrstrset($frame, $xStart, $yStart + $y, $finder[$y]);
 		}
 		return $frame;
 	}
@@ -2421,7 +2421,7 @@ 
 		if ($d < 0) {
 			$w = 2;
 		} else {
-			$w = (int)(($width - $this->alignmentPattern[$version][0]) / $d + 2);
+			$w = (int) (($width - $this->alignmentPattern[$version][0]) / $d + 2);
 		}
 		if ($w * $w - 3 == 1) {
 			$x = $this->alignmentPattern[$version][0];
@@ -2431,15 +2431,15 @@ 
 		}
 		$cx = $this->alignmentPattern[$version][0];
 		$wo = $w - 1;
-		for ($x=1; $x < $wo; ++$x) {
+		for ($x = 1; $x < $wo; ++$x) {
 			$frame = $this->putAlignmentMarker($frame, 6, $cx);
-			$frame = $this->putAlignmentMarker($frame, $cx,  6);
+			$frame = $this->putAlignmentMarker($frame, $cx, 6);
 			$cx += $d;
 		}
 		$cy = $this->alignmentPattern[$version][0];
-		for ($y=0; $y < $wo; ++$y) {
+		for ($y = 0; $y < $wo; ++$y) {
 			$cx = $this->alignmentPattern[$version][0];
-			for ($x=0; $x < $wo; ++$x) {
+			for ($x = 0; $x < $wo; ++$x) {
 				$frame = $this->putAlignmentMarker($frame, $cx, $cy);
 				$cx += $d;
 			}
@@ -2493,7 +2493,7 @@ 
 		"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
 		"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
 		);
-		for ($y=0; $y < 7; $y++) {
+		for ($y = 0; $y < 7; $y++) {
 			$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
 		}
 		return $frame;
@@ -2506,7 +2506,7 @@ 
 	 */
 	protected function createFrame($version) {
 		$width = $this->capacity[$version][QRCAP_WIDTH];
-		$frameLine = str_repeat ("\0", $width);
+		$frameLine = str_repeat("\0", $width);
 		$frame = array_fill(0, $width, $frameLine);
 		// Finder pattern
 		$frame = $this->putFinderPattern($frame, 0, 0);
@@ -2514,7 +2514,7 @@ 
 		$frame = $this->putFinderPattern($frame, 0, $width - 7);
 		// Separator
 		$yOffset = $width - 7;
-		for ($y=0; $y < 7; ++$y) {
+		for ($y = 0; $y < 7; ++$y) {
 			$frame[$y][7] = "\xc0";
 			$frame[$y][$width - 8] = "\xc0";
 			$frame[$yOffset][7] = "\xc0";
@@ -2522,22 +2522,22 @@ 
 		}
 		$setPattern = str_repeat("\xc0", 8);
 		$frame = $this->qrstrset($frame, 0, 7, $setPattern);
-		$frame = $this->qrstrset($frame, $width-8, 7, $setPattern);
+		$frame = $this->qrstrset($frame, $width - 8, 7, $setPattern);
 		$frame = $this->qrstrset($frame, 0, $width - 8, $setPattern);
 		// Format info
 		$setPattern = str_repeat("\x84", 9);
 		$frame = $this->qrstrset($frame, 0, 8, $setPattern);
 		$frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8);
 		$yOffset = $width - 8;
-		for ($y=0; $y < 8; ++$y,++$yOffset) {
+		for ($y = 0; $y < 8; ++$y, ++$yOffset) {
 			$frame[$y][8] = "\x84";
 			$frame[$yOffset][8] = "\x84";
 		}
 		// Timing pattern
 		$wo = $width - 15;
-		for ($i=1; $i < $wo; ++$i) {
-			$frame[6][7+$i] = chr(0x90 | ($i & 1));
-			$frame[7+$i][6] = chr(0x90 | ($i & 1));
+		for ($i = 1; $i < $wo; ++$i) {
+			$frame[6][7 + $i] = chr(0x90 | ($i & 1));
+			$frame[7 + $i][6] = chr(0x90 | ($i & 1));
 		}
 		// Alignment pattern
 		$frame = $this->putAlignmentPattern($version, $frame, $width);
@@ -2545,16 +2545,16 @@ 
 		if ($version >= 7) {
 			$vinf = $this->getVersionPattern($version);
 			$v = $vinf;
-			for ($x=0; $x<6; ++$x) {
-				for ($y=0; $y<3; ++$y) {
-					$frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
+			for ($x = 0; $x < 6; ++$x) {
+				for ($y = 0; $y < 3; ++$y) {
+					$frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));
 					$v = $v >> 1;
 				}
 			}
 			$v = $vinf;
-			for ($y=0; $y<6; ++$y) {
-				for ($x=0; $x<3; ++$x) {
-					$frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
+			for ($y = 0; $y < 6; ++$y) {
+				for ($x = 0; $x < 3; ++$x) {
+					$frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));
 					$v = $v >> 1;
 				}
 			}
@@ -2725,16 +2725,16 @@ 
 		if (($symsize < 0) OR ($symsize > 8)) {
 			return $rs;
 		}
-		if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
+		if (($fcr < 0) OR ($fcr >= (1 << $symsize))) {
 			return $rs;
 		}
-		if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
+		if (($prim <= 0) OR ($prim >= (1 << $symsize))) {
 			return $rs;
 		}
-		if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
+		if (($nroots < 0) OR ($nroots >= (1 << $symsize))) {
 			return $rs;
 		}
-		if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
+		if (($pad < 0) OR ($pad >= ((1 << $symsize) - 1 - $nroots))) {
 			return $rs;
 		}
 		$rs = array();
@@ -2744,13 +2744,13 @@ 
 		$rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
 		$rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
 		// PHP style macro replacement ;)
-		$NN =& $rs['nn'];
-		$A0 =& $NN;
+		$NN = & $rs['nn'];
+		$A0 = & $NN;
 		// Generate Galois field lookup tables
 		$rs['index_of'][0] = $A0; // log(zero) = -inf
 		$rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
 		$sr = 1;
-		for ($i=0; $i<$rs['nn']; ++$i) {
+		for ($i = 0; $i < $rs['nn']; ++$i) {
 			$rs['index_of'][$sr] = $i;
 			$rs['alpha_to'][$i] = $sr;
 			$sr <<= 1;
@@ -2770,19 +2770,19 @@ 
 		$rs['nroots'] = $nroots;
 		$rs['gfpoly'] = $gfpoly;
 		// Find prim-th root of 1, used in decoding
-		for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
+		for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
 			; // intentional empty-body loop!
 		}
-		$rs['iprim'] = (int)($iprim / $prim);
+		$rs['iprim'] = (int) ($iprim / $prim);
 		$rs['genpoly'][0] = 1;
-		for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
-			$rs['genpoly'][$i+1] = 1;
+		for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {
+			$rs['genpoly'][$i + 1] = 1;
 			// Multiply rs->genpoly[] by  @**(root + x)
 			for ($j = $i; $j > 0; --$j) {
 				if ($rs['genpoly'][$j] != 0) {
-					$rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
+					$rs['genpoly'][$j] = $rs['genpoly'][$j - 1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
 				} else {
-					$rs['genpoly'][$j] = $rs['genpoly'][$j-1];
+					$rs['genpoly'][$j] = $rs['genpoly'][$j - 1];
 				}
 			}
 			// rs->genpoly[0] can never be zero
@@ -2803,26 +2803,26 @@ 
 	 * @return parity array
 	 */
 	 protected function encode_rs_char($rs, $data, $parity) {
-		$MM       =& $rs['mm']; // bits per symbol
-		$NN       =& $rs['nn']; // the total number of symbols in a RS block
-		$ALPHA_TO =& $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
-		$INDEX_OF =& $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
-		$GENPOLY  =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
-		$NROOTS   =& $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
-		$FCR      =& $rs['fcr']; // first consecutive root, index form
-		$PRIM     =& $rs['prim']; // primitive element, index form
-		$IPRIM    =& $rs['iprim']; // prim-th root of 1, index form
-		$PAD      =& $rs['pad']; // the number of pad symbols in a block
-		$A0       =& $NN;
+		$MM       = & $rs['mm']; // bits per symbol
+		$NN       = & $rs['nn']; // the total number of symbols in a RS block
+		$ALPHA_TO = & $rs['alpha_to']; // the address of an array of NN elements to convert Galois field elements in index (log) form to polynomial form
+		$INDEX_OF = & $rs['index_of']; // the address of an array of NN elements to convert Galois field elements in polynomial form to index (log) form
+		$GENPOLY  = & $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
+		$NROOTS   = & $rs['nroots']; // the number of roots in the RS code generator polynomial, which is the same as the number of parity symbols in a block
+		$FCR      = & $rs['fcr']; // first consecutive root, index form
+		$PRIM     = & $rs['prim']; // primitive element, index form
+		$IPRIM    = & $rs['iprim']; // prim-th root of 1, index form
+		$PAD      = & $rs['pad']; // the number of pad symbols in a block
+		$A0       = & $NN;
 		$parity = array_fill(0, $NROOTS, 0);
-		for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
+		for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {
 			$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
 			if ($feedback != $A0) {
 				// feedback term is non-zero
 				// This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
 				// always be for the polynomials constructed by init_rs()
 				$feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
-				for ($j=1; $j < $NROOTS; ++$j) {
+				for ($j = 1; $j < $NROOTS; ++$j) {
 				$parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
 				}
 			}

Upper-Lower-Casing +30 added lines, -30 removed lines

@@ -613,7 +613,7 @@ 
 	 */
 	public function __construct($code, $eclevel = 'L') {
 		$barcode_array = array();
-		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
+		if ((is_null($code)) or ($code == '\0') or ($code == '')) {
 			return false;
 		}
 		// set error correction level
@@ -621,10 +621,10 @@ 
 		if ($this->level === false) {
 			$this->level = QR_ECLEVEL_L;
 		}
-		if (($this->hint != QR_MODE_8B) AND ($this->hint != QR_MODE_KJ)) {
+		if (($this->hint != QR_MODE_8B) and ($this->hint != QR_MODE_KJ)) {
 			return false;
 		}
-		if (($this->version < 0) OR ($this->version > QRSPEC_VERSION_MAX)) {
+		if (($this->version < 0) or ($this->version > QRSPEC_VERSION_MAX)) {
 			return false;
 		}
 		$this->items = array();
@@ -813,7 +813,7 @@ 
 					}
 				}
 			}
-			if (($x < 0) OR ($y < 0)) {
+			if (($x < 0) or ($y < 0)) {
 				return NULL;
 			}
 			$this->x = $x;
@@ -1107,15 +1107,15 @@ 
 				$demerit += (N1 + ($this->runLength[$i] - 5));
 			}
 			if ($i & 1) {
-				if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
+				if (($i >= 3) and ($i < ($length-2)) and ($this->runLength[$i] % 3 == 0)) {
 					$fact = (int)($this->runLength[$i] / 3);
 					if (($this->runLength[$i-2] == $fact)
-						AND ($this->runLength[$i-1] == $fact)
-						AND ($this->runLength[$i+1] == $fact)
-						AND ($this->runLength[$i+2] == $fact)) {
-						if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
+						and ($this->runLength[$i-1] == $fact)
+						and ($this->runLength[$i+1] == $fact)
+						and ($this->runLength[$i+2] == $fact)) {
+						if (($this->runLength[$i-3] < 0) or ($this->runLength[$i-3] >= (4 * $fact))) {
 							$demerit += N3;
-						} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
+						} elseif ((($i+3) >= $length) or ($this->runLength[$i+3] >= (4 * $fact))) {
 							$demerit += N3;
 						}
 					}
@@ -1142,14 +1142,14 @@ 
 				$frameYM = $frame[$y-1];
 			}
 			for ($x=0; $x<$width; ++$x) {
-				if (($x > 0) AND ($y > 0)) {
+				if (($x > 0) and ($y > 0)) {
 					$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
 					$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
 					if (($b22 | ($w22 ^ 1)) & 1) {
 						$demerit += N2;
 					}
 				}
-				if (($x == 0) AND (ord($frameY[$x]) & 1)) {
+				if (($x == 0) and (ord($frameY[$x]) & 1)) {
 					$this->runLength[0] = -1;
 					$head = 1;
 					$this->runLength[$head] = 1;
@@ -1168,7 +1168,7 @@ 
 			$head = 0;
 			$this->runLength[0] = 1;
 			for ($y=0; $y<$width; ++$y) {
-				if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
+				if (($y == 0) and (ord($frame[$y][$x]) & 1)) {
 					$this->runLength[0] = -1;
 					$head = 1;
 					$this->runLength[$head] = 1;
@@ -1273,7 +1273,7 @@ 
 			if ($pos+1 < strlen($this->dataStr)) {
 				$d = $this->dataStr[$pos+1];
 				$word = (ord($c) << 8) | ord($d);
-				if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
+				if (($word >= 0x8140 && $word <= 0x9ffc) or ($word >= 0xe040 && $word <= 0xebbf)) {
 					return QR_MODE_KJ;
 				}
 			}
@@ -1466,7 +1466,7 @@ 
 			if ($mode == QR_MODE_KJ) {
 				$p += 2;
 			} else {
-				if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) {
+				if ((ord($this->dataStr[$p]) >= ord('a')) and (ord($this->dataStr[$p]) <= ord('z'))) {
 					$this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
 				}
 				$p++;
@@ -1690,7 +1690,7 @@ 
 		if ($size > MAX_STRUCTURED_SYMBOLS) {
 			return -1;
 		}
-		if (($index <= 0) OR ($index > MAX_STRUCTURED_SYMBOLS)) {
+		if (($index <= 0) or ($index > MAX_STRUCTURED_SYMBOLS)) {
 			return -1;
 		}
 		$buf = array($size, $index, $parity);
@@ -1724,7 +1724,7 @@ 
 	 */
 	 protected function checkModeNum($size, $data) {
 		for ($i=0; $i<$size; ++$i) {
-			if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
+			if ((ord($data[$i]) < ord('0')) or (ord($data[$i]) > ord('9'))){
 				return false;
 			}
 		}
@@ -1819,7 +1819,7 @@ 
 		}
 		for ($i=0; $i<$size; $i+=2) {
 			$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
-			if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
+			if (($val < 0x8140) or (($val > 0x9ffc) and ($val < 0xe040)) or ($val > 0xebbf)) {
 				return false;
 			}
 		}
@@ -2158,7 +2158,7 @@ 
 	 * @return array bitstream
 	 */
 	 protected function appendBitstream($bitstream, $append) {
-		if ((!is_array($append)) OR (count($append) == 0)) {
+		if ((!is_array($append)) or (count($append) == 0)) {
 			return $bitstream;
 		}
 		if (count($bitstream) == 0) {
@@ -2454,7 +2454,7 @@ 
 	 * @return string BCH encoded version information pattern
 	 */
 	protected function getVersionPattern($version) {
-		if (($version < 7) OR ($version > QRSPEC_VERSION_MAX)) {
+		if (($version < 7) or ($version > QRSPEC_VERSION_MAX)) {
 			return 0;
 		}
 		return $this->versionPattern[($version - 7)];
@@ -2467,10 +2467,10 @@ 
 	 * @return string BCH encoded format information pattern
 	 */
 	protected function getFormatInfo($mask, $level) {
-		if (($mask < 0) OR ($mask > 7)) {
+		if (($mask < 0) or ($mask > 7)) {
 			return 0;
 		}
-		if (($level < 0) OR ($level > 3)) {
+		if (($level < 0) or ($level > 3)) {
 			return 0;
 		}
 		return $this->formatInfo[$level][$mask];
@@ -2570,7 +2570,7 @@ 
 	 * @return array array of unsigned char.
 	 */
 	protected function newFrame($version) {
-		if (($version < 1) OR ($version > QRSPEC_VERSION_MAX)) {
+		if (($version < 1) or ($version > QRSPEC_VERSION_MAX)) {
 			return NULL;
 		}
 		if (!isset($this->frames[$version])) {
@@ -2679,8 +2679,8 @@ 
 	 */
 	 protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
 		foreach ($this->rsitems as $rs) {
-			if (($rs['pad'] != $pad) OR ($rs['nroots'] != $nroots) OR ($rs['mm'] != $symsize)
-				OR ($rs['gfpoly'] != $gfpoly) OR ($rs['fcr'] != $fcr) OR ($rs['prim'] != $prim)) {
+			if (($rs['pad'] != $pad) or ($rs['nroots'] != $nroots) or ($rs['mm'] != $symsize)
+				or ($rs['gfpoly'] != $gfpoly) or ($rs['fcr'] != $fcr) or ($rs['prim'] != $prim)) {
 				continue;
 			}
 			return $rs;
@@ -2722,19 +2722,19 @@ 
 		// Based on Reed solomon encoder by Phil Karn, KA9Q (GNU-LGPLv2)
 		$rs = null;
 		// Check parameter ranges
-		if (($symsize < 0) OR ($symsize > 8)) {
+		if (($symsize < 0) or ($symsize > 8)) {
 			return $rs;
 		}
-		if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
+		if (($fcr < 0) or ($fcr >= (1<<$symsize))) {
 			return $rs;
 		}
-		if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
+		if (($prim <= 0) or ($prim >= (1<<$symsize))) {
 			return $rs;
 		}
-		if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
+		if (($nroots < 0) or ($nroots >= (1<<$symsize))) {
 			return $rs;
 		}
-		if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
+		if (($pad < 0) or ($pad >= ((1<<$symsize) -1 - $nroots))) {
 			return $rs;
 		}
 		$rs = array();

htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php

Upper-Lower-Casing +34 added lines, -34 removed lines

@@ -234,7 +234,7 @@ 
 	 */
 	public function __construct($code) {
 		$barcode_array = array();
-		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
+		if ((is_null($code)) or ($code == '\0') or ($code == '')) {
 			return false;
 		}
 		// get data codewords
@@ -256,12 +256,12 @@ 
 			return false;
 		} elseif ($params[11] > $nd) {
 			// add padding
-			if ((($params[11] - $nd) > 1) AND ($cw[($nd - 1)] != 254)) {
+			if ((($params[11] - $nd) > 1) and ($cw[($nd - 1)] != 254)) {
 				if ($this->last_enc == ENC_EDF) {
 					// switch to ASCII encoding
 					$cw[] = 124;
 					++$nd;
-				} elseif (($this->last_enc != ENC_ASCII) AND ($this->last_enc != ENC_BASE256)) {
+				} elseif (($this->last_enc != ENC_ASCII) and ($this->last_enc != ENC_BASE256)) {
 					// switch to ASCII encoding
 					$cw[] = 254;
 					++$nd;
@@ -364,7 +364,7 @@ 
 	 * @protected
 	 */
 	protected function getGFProduct($a, $b, $log, $alog, $gf) {
-		if (($a == 0) OR ($b == 0)) {
+		if (($a == 0) or ($b == 0)) {
 			return 0;
 		}
 		return ($alog[($log[$a] + $log[$b]) % ($gf - 1)]);
@@ -477,35 +477,35 @@ 
 		$status = false;
 		switch ($mode) {
 			case ENC_ASCII: { // ASCII character 0 to 127
-				$status = (($chr >= 0) AND ($chr <= 127));
+				$status = (($chr >= 0) and ($chr <= 127));
 				break;
 			}
 			case ENC_C40: { // Upper-case alphanumeric
-				$status = (($chr == 32) OR (($chr >= 48) AND ($chr <= 57)) OR (($chr >= 65) AND ($chr <= 90)));
+				$status = (($chr == 32) or (($chr >= 48) and ($chr <= 57)) or (($chr >= 65) and ($chr <= 90)));
 				break;
 			}
 			case ENC_TXT: { // Lower-case alphanumeric
-				$status = (($chr == 32) OR (($chr >= 48) AND ($chr <= 57)) OR (($chr >= 97) AND ($chr <= 122)));
+				$status = (($chr == 32) or (($chr >= 48) and ($chr <= 57)) or (($chr >= 97) and ($chr <= 122)));
 				break;
 			}
 			case ENC_X12: { // ANSI X12
-				$status = (($chr == 13) OR ($chr == 42) OR ($chr == 62));
+				$status = (($chr == 13) or ($chr == 42) or ($chr == 62));
 				break;
 			}
 			case ENC_EDF: { // ASCII character 32 to 94
-				$status = (($chr >= 32) AND ($chr <= 94));
+				$status = (($chr >= 32) and ($chr <= 94));
 				break;
 			}
 			case ENC_BASE256: { // Function character (FNC1, Structured Append, Reader Program, or Code Page)
-				$status = (($chr == 232) OR ($chr == 233) OR ($chr == 234) OR ($chr == 241));
+				$status = (($chr == 232) or ($chr == 233) or ($chr == 234) or ($chr == 241));
 				break;
 			}
 			case ENC_ASCII_EXT: { // ASCII character 128 to 255
-				$status = (($chr >= 128) AND ($chr <= 255));
+				$status = (($chr >= 128) and ($chr <= 255));
 				break;
 			}
 			case ENC_ASCII_NUM: { // ASCII digits
-				$status = (($chr >= 48) AND ($chr <= 57));
+				$status = (($chr >= 48) and ($chr <= 57));
 				break;
 			}
 		}
@@ -583,7 +583,7 @@ 
 				$numch[ENC_TXT] += (4 / 3);
 			}
 			// STEP O
-			if ($this->isCharMode($chr, ENC_X12) OR $this->isCharMode($chr, ENC_C40)) {
+			if ($this->isCharMode($chr, ENC_X12) or $this->isCharMode($chr, ENC_C40)) {
 				$numch[ENC_X12] += (2 / 3);
 			} elseif ($this->isCharMode($chr, ENC_ASCII_EXT)) {
 				$numch[ENC_X12] += (13 / 3);
@@ -610,7 +610,7 @@ 
 					return ENC_ASCII;
 				}
 				if ((($numch[ENC_BASE256] + 1) <= $numch[ENC_ASCII])
-					OR (($numch[ENC_BASE256] + 1) < min($numch[ENC_C40], $numch[ENC_TXT], $numch[ENC_X12], $numch[ENC_EDF]))) {
+					or (($numch[ENC_BASE256] + 1) < min($numch[ENC_C40], $numch[ENC_TXT], $numch[ENC_X12], $numch[ENC_EDF]))) {
 					return ENC_BASE256;
 				}
 				if (($numch[ENC_EDF] + 1) < min($numch[ENC_ASCII], $numch[ENC_C40], $numch[ENC_TXT], $numch[ENC_X12], $numch[ENC_BASE256])) {
@@ -632,7 +632,7 @@ 
 							$tmpchr = ord($data[$k]);
 							if ($this->isCharMode($tmpchr, ENC_X12)) {
 								return ENC_X12;
-							} elseif (!($this->isCharMode($tmpchr, ENC_X12) OR $this->isCharMode($tmpchr, ENC_C40))) {
+							} elseif (!($this->isCharMode($tmpchr, ENC_X12) or $this->isCharMode($tmpchr, ENC_C40))) {
 								break;
 							}
 							++$k;
@@ -716,7 +716,7 @@ 
 			$this->last_enc = $enc;
 			switch ($enc) {
 				case ENC_ASCII: { // STEP B. While in ASCII encodation
-					if (($data_length > 1) AND ($pos < ($data_length - 1)) AND ($this->isCharMode(ord($data[$pos]), ENC_ASCII_NUM) AND $this->isCharMode(ord($data[$pos + 1]), ENC_ASCII_NUM))) {
+					if (($data_length > 1) and ($pos < ($data_length - 1)) and ($this->isCharMode(ord($data[$pos]), ENC_ASCII_NUM) and $this->isCharMode(ord($data[$pos + 1]), ENC_ASCII_NUM))) {
 						// 1. If the next data sequence is at least 2 consecutive digits, encode the next two digits as a double digit in ASCII mode.
 						$cw[] = (intval(substr($data, $pos, 2)) + 130);
 						++$cw_num;
@@ -781,10 +781,10 @@ 
 							} 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])) {
+							} elseif (($enc == ENC_C40) and isset($this->chset['S3C'][$chr])) {
 								$temp_cw[] = 2; // shift 3
 								$shiftset = $this->chset['S3C'];
-							} elseif (($enc == ENC_TXT) AND isset($this->chset['S3T'][$chr])) {
+							} elseif (($enc == ENC_TXT) and isset($this->chset['S3T'][$chr])) {
 								$temp_cw[] = 2; // shift 3
 								$shiftset = $this->chset['S3T'];
 							} else {
@@ -820,12 +820,12 @@ 
 								break;
 							}
 						}
-					} while (($p > 0) AND ($epos < $data_length));
+					} while (($p > 0) and ($epos < $data_length));
 					// process last data (if any)
 					if ($p > 0) {
 						// get remaining number of data symbols
 						$cwr = ($this->getMaxDataCodewords($cw_num) - $cw_num);
-						if (($cwr == 1) AND ($p == 1)) {
+						if (($cwr == 1) and ($p == 1)) {
 							// d. If one symbol character remains and one C40 value (data character) remains to be encoded
 							$c1 = array_shift($temp_cw);
 							--$p;
@@ -834,7 +834,7 @@ 
 							$pos = $epos;
 							$enc = ENC_ASCII;
 							$this->last_enc = $enc;
-						} elseif (($cwr == 2) AND ($p == 1)) {
+						} elseif (($cwr == 2) and ($p == 1)) {
 							// c. If two symbol characters remain and only one C40 value (data character) remains to be encoded
 							$c1 = array_shift($temp_cw);
 							--$p;
@@ -844,7 +844,7 @@ 
 							$pos = $epos;
 							$enc = ENC_ASCII;
 							$this->last_enc = $enc;
-						} elseif (($cwr == 2) AND ($p == 2)) {
+						} elseif (($cwr == 2) and ($p == 2)) {
 							// b. If two symbol characters remain and two C40 values remain to be encoded
 							$c1 = array_shift($temp_cw);
 							$c2 = array_shift($temp_cw);
@@ -883,8 +883,8 @@ 
 							$temp_cw[] = $chr;
 							++$field_length;
 						}
-						if (($field_length == 4) OR ($epos == $data_length) OR !$this->isCharMode($chr, ENC_EDF)) {
-							if (($epos == $data_length) AND ($field_length < 3)) {
+						if (($field_length == 4) or ($epos == $data_length) or !$this->isCharMode($chr, ENC_EDF)) {
+							if (($epos == $data_length) and ($field_length < 3)) {
 								$enc = ENC_ASCII;
 								$cw[] = $this->getSwitchEncodingCodeword($enc);
 								++$cw_num;
@@ -931,7 +931,7 @@ 
 					// initialize temporary array with 0 length
 					$temp_cw = array();
 					$field_length = 0;
-					while (($pos < $data_length) AND ($field_length <= 1555)) {
+					while (($pos < $data_length) and ($field_length <= 1555)) {
 						$newenc = $this->lookAheadTest($data, $pos, $enc);
 						if ($newenc != $enc) {
 							// 1. If the look-ahead test (starting at step J) indicates another mode, switch to that mode.
@@ -1122,46 +1122,46 @@ 
 		$col = 0;
 		do {
 			// repeatedly first check for one of the special corner cases, then
-			if (($row == $nrow) AND ($col == 0)) {
+			if (($row == $nrow) and ($col == 0)) {
 				$marr = $this->placeCornerA($marr, $nrow, $ncol, $chr);
 				++$chr;
 			}
-			if (($row == ($nrow - 2)) AND ($col == 0) AND ($ncol % 4)) {
+			if (($row == ($nrow - 2)) and ($col == 0) and ($ncol % 4)) {
 				$marr = $this->placeCornerB($marr, $nrow, $ncol, $chr);
 				++$chr;
 			}
-			if (($row == ($nrow - 2)) AND ($col == 0) AND (($ncol % 8) == 4)) {
+			if (($row == ($nrow - 2)) and ($col == 0) and (($ncol % 8) == 4)) {
 				$marr = $this->placeCornerC($marr, $nrow, $ncol, $chr);
 				++$chr;
 			}
-			if (($row == ($nrow + 4)) AND ($col == 2) AND (!($ncol % 8))) {
+			if (($row == ($nrow + 4)) and ($col == 2) and (!($ncol % 8))) {
 				$marr = $this->placeCornerD($marr, $nrow, $ncol, $chr);
 				++$chr;
 			}
 			// sweep upward diagonally, inserting successive characters,
 			do {
-				if (($row < $nrow) AND ($col >= 0) AND (!$marr[(($row * $ncol) + $col)])) {
+				if (($row < $nrow) and ($col >= 0) and (!$marr[(($row * $ncol) + $col)])) {
 					$marr = $this->placeUtah($marr, $nrow, $ncol, $row, $col, $chr);
 					++$chr;
 				}
 				$row -= 2;
 				$col += 2;
-			} while (($row >= 0) AND ($col < $ncol));
+			} while (($row >= 0) and ($col < $ncol));
 			++$row;
 			$col += 3;
 			// & then sweep downward diagonally, inserting successive characters,...
 			do {
-				if (($row >= 0) AND ($col < $ncol) AND (!$marr[(($row * $ncol) + $col)])) {
+				if (($row >= 0) and ($col < $ncol) and (!$marr[(($row * $ncol) + $col)])) {
 					$marr = $this->placeUtah($marr, $nrow, $ncol, $row, $col, $chr);
 					++$chr;
 				}
 				$row += 2;
 				$col -= 2;
-			} while (($row < $nrow) AND ($col >= 0));
+			} while (($row < $nrow) and ($col >= 0));
 			$row += 3;
 			++$col;
 			// ... until the entire array is scanned
-		} while (($row < $nrow) OR ($col < $ncol));
+		} while (($row < $nrow) or ($col < $ncol));
 		// lastly, if the lower righthand corner is untouched, fill in fixed pattern
 		if (!$marr[(($nrow * $ncol) - 1)]) {
 			$marr[(($nrow * $ncol) - 1)] = 1;

htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php

Spacing +363 added lines, -363 removed lines

@@ -115,10 +115,10 @@ 
 	 * @protected
 	 */
 	protected $textsubmodes = array(
-		array(0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5a,0x20,0xFD,0xFE,0xFF), // Alpha
-		array(0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x20,0xFD,0xFE,0xFF), // Lower
-		array(0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x26,0x0d,0x09,0x2c,0x3a,0x23,0x2d,0x2e,0x24,0x2f,0x2b,0x25,0x2a,0x3d,0x5e,0xFB,0x20,0xFD,0xFE,0xFF), // Mixed
-		array(0x3b,0x3c,0x3e,0x40,0x5b,0x5c,0x5d,0x5f,0x60,0x7e,0x21,0x0d,0x09,0x2c,0x3a,0x0a,0x2d,0x2e,0x24,0x2f,0x22,0x7c,0x2a,0x28,0x29,0x3f,0x7b,0x7d,0x27,0xFF) // Puntuaction
+		array(0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x20, 0xFD, 0xFE, 0xFF), // Alpha
+		array(0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20, 0xFD, 0xFE, 0xFF), // Lower
+		array(0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x26, 0x0d, 0x09, 0x2c, 0x3a, 0x23, 0x2d, 0x2e, 0x24, 0x2f, 0x2b, 0x25, 0x2a, 0x3d, 0x5e, 0xFB, 0x20, 0xFD, 0xFE, 0xFF), // Mixed
+		array(0x3b, 0x3c, 0x3e, 0x40, 0x5b, 0x5c, 0x5d, 0x5f, 0x60, 0x7e, 0x21, 0x0d, 0x09, 0x2c, 0x3a, 0x0a, 0x2d, 0x2e, 0x24, 0x2f, 0x22, 0x7c, 0x2a, 0x28, 0x29, 0x3f, 0x7b, 0x7d, 0x27, 0xFF) // Puntuaction
 	);
 
 	/**
@@ -126,10 +126,10 @@ 
 	 * @protected
 	 */
 	protected $textlatch = array(
-		'01' => array(27), '02' => array(28), '03' => array(28,25), //
-		'10' => array(28,28), '12' => array(28), '13' => array(28,25), //
+		'01' => array(27), '02' => array(28), '03' => array(28, 25), //
+		'10' => array(28, 28), '12' => array(28), '13' => array(28, 25), //
 		'20' => array(28), '21' => array(27), '23' => array(25), //
-		'30' => array(29), '31' => array(29,27), '32' => array(29,28) //
+		'30' => array(29), '31' => array(29, 27), '32' => array(29, 28) //
 	);
 
 	/**
@@ -155,287 +155,287 @@ 
 	 */
 	protected $clusters = array(
 		array( // cluster 0 -----------------------------------------------------------------------
-			0x1d5c0,0x1eaf0,0x1f57c,0x1d4e0,0x1ea78,0x1f53e,0x1a8c0,0x1d470,0x1a860,0x15040, //  10
-			0x1a830,0x15020,0x1adc0,0x1d6f0,0x1eb7c,0x1ace0,0x1d678,0x1eb3e,0x158c0,0x1ac70, //  20
-			0x15860,0x15dc0,0x1aef0,0x1d77c,0x15ce0,0x1ae78,0x1d73e,0x15c70,0x1ae3c,0x15ef0, //  30
-			0x1af7c,0x15e78,0x1af3e,0x15f7c,0x1f5fa,0x1d2e0,0x1e978,0x1f4be,0x1a4c0,0x1d270, //  40
-			0x1e93c,0x1a460,0x1d238,0x14840,0x1a430,0x1d21c,0x14820,0x1a418,0x14810,0x1a6e0, //  50
-			0x1d378,0x1e9be,0x14cc0,0x1a670,0x1d33c,0x14c60,0x1a638,0x1d31e,0x14c30,0x1a61c, //  60
-			0x14ee0,0x1a778,0x1d3be,0x14e70,0x1a73c,0x14e38,0x1a71e,0x14f78,0x1a7be,0x14f3c, //  70
-			0x14f1e,0x1a2c0,0x1d170,0x1e8bc,0x1a260,0x1d138,0x1e89e,0x14440,0x1a230,0x1d11c, //  80
-			0x14420,0x1a218,0x14410,0x14408,0x146c0,0x1a370,0x1d1bc,0x14660,0x1a338,0x1d19e, //  90
-			0x14630,0x1a31c,0x14618,0x1460c,0x14770,0x1a3bc,0x14738,0x1a39e,0x1471c,0x147bc, // 100
-			0x1a160,0x1d0b8,0x1e85e,0x14240,0x1a130,0x1d09c,0x14220,0x1a118,0x1d08e,0x14210, // 110
-			0x1a10c,0x14208,0x1a106,0x14360,0x1a1b8,0x1d0de,0x14330,0x1a19c,0x14318,0x1a18e, // 120
-			0x1430c,0x14306,0x1a1de,0x1438e,0x14140,0x1a0b0,0x1d05c,0x14120,0x1a098,0x1d04e, // 130
-			0x14110,0x1a08c,0x14108,0x1a086,0x14104,0x141b0,0x14198,0x1418c,0x140a0,0x1d02e, // 140
-			0x1a04c,0x1a046,0x14082,0x1cae0,0x1e578,0x1f2be,0x194c0,0x1ca70,0x1e53c,0x19460, // 150
-			0x1ca38,0x1e51e,0x12840,0x19430,0x12820,0x196e0,0x1cb78,0x1e5be,0x12cc0,0x19670, // 160
-			0x1cb3c,0x12c60,0x19638,0x12c30,0x12c18,0x12ee0,0x19778,0x1cbbe,0x12e70,0x1973c, // 170
-			0x12e38,0x12e1c,0x12f78,0x197be,0x12f3c,0x12fbe,0x1dac0,0x1ed70,0x1f6bc,0x1da60, // 180
-			0x1ed38,0x1f69e,0x1b440,0x1da30,0x1ed1c,0x1b420,0x1da18,0x1ed0e,0x1b410,0x1da0c, // 190
-			0x192c0,0x1c970,0x1e4bc,0x1b6c0,0x19260,0x1c938,0x1e49e,0x1b660,0x1db38,0x1ed9e, // 200
-			0x16c40,0x12420,0x19218,0x1c90e,0x16c20,0x1b618,0x16c10,0x126c0,0x19370,0x1c9bc, // 210
-			0x16ec0,0x12660,0x19338,0x1c99e,0x16e60,0x1b738,0x1db9e,0x16e30,0x12618,0x16e18, // 220
-			0x12770,0x193bc,0x16f70,0x12738,0x1939e,0x16f38,0x1b79e,0x16f1c,0x127bc,0x16fbc, // 230
-			0x1279e,0x16f9e,0x1d960,0x1ecb8,0x1f65e,0x1b240,0x1d930,0x1ec9c,0x1b220,0x1d918, // 240
-			0x1ec8e,0x1b210,0x1d90c,0x1b208,0x1b204,0x19160,0x1c8b8,0x1e45e,0x1b360,0x19130, // 250
-			0x1c89c,0x16640,0x12220,0x1d99c,0x1c88e,0x16620,0x12210,0x1910c,0x16610,0x1b30c, // 260
-			0x19106,0x12204,0x12360,0x191b8,0x1c8de,0x16760,0x12330,0x1919c,0x16730,0x1b39c, // 270
-			0x1918e,0x16718,0x1230c,0x12306,0x123b8,0x191de,0x167b8,0x1239c,0x1679c,0x1238e, // 280
-			0x1678e,0x167de,0x1b140,0x1d8b0,0x1ec5c,0x1b120,0x1d898,0x1ec4e,0x1b110,0x1d88c, // 290
-			0x1b108,0x1d886,0x1b104,0x1b102,0x12140,0x190b0,0x1c85c,0x16340,0x12120,0x19098, // 300
-			0x1c84e,0x16320,0x1b198,0x1d8ce,0x16310,0x12108,0x19086,0x16308,0x1b186,0x16304, // 310
-			0x121b0,0x190dc,0x163b0,0x12198,0x190ce,0x16398,0x1b1ce,0x1638c,0x12186,0x16386, // 320
-			0x163dc,0x163ce,0x1b0a0,0x1d858,0x1ec2e,0x1b090,0x1d84c,0x1b088,0x1d846,0x1b084, // 330
-			0x1b082,0x120a0,0x19058,0x1c82e,0x161a0,0x12090,0x1904c,0x16190,0x1b0cc,0x19046, // 340
-			0x16188,0x12084,0x16184,0x12082,0x120d8,0x161d8,0x161cc,0x161c6,0x1d82c,0x1d826, // 350
-			0x1b042,0x1902c,0x12048,0x160c8,0x160c4,0x160c2,0x18ac0,0x1c570,0x1e2bc,0x18a60, // 360
-			0x1c538,0x11440,0x18a30,0x1c51c,0x11420,0x18a18,0x11410,0x11408,0x116c0,0x18b70, // 370
-			0x1c5bc,0x11660,0x18b38,0x1c59e,0x11630,0x18b1c,0x11618,0x1160c,0x11770,0x18bbc, // 380
-			0x11738,0x18b9e,0x1171c,0x117bc,0x1179e,0x1cd60,0x1e6b8,0x1f35e,0x19a40,0x1cd30, // 390
-			0x1e69c,0x19a20,0x1cd18,0x1e68e,0x19a10,0x1cd0c,0x19a08,0x1cd06,0x18960,0x1c4b8, // 400
-			0x1e25e,0x19b60,0x18930,0x1c49c,0x13640,0x11220,0x1cd9c,0x1c48e,0x13620,0x19b18, // 410
-			0x1890c,0x13610,0x11208,0x13608,0x11360,0x189b8,0x1c4de,0x13760,0x11330,0x1cdde, // 420
-			0x13730,0x19b9c,0x1898e,0x13718,0x1130c,0x1370c,0x113b8,0x189de,0x137b8,0x1139c, // 430
-			0x1379c,0x1138e,0x113de,0x137de,0x1dd40,0x1eeb0,0x1f75c,0x1dd20,0x1ee98,0x1f74e, // 440
-			0x1dd10,0x1ee8c,0x1dd08,0x1ee86,0x1dd04,0x19940,0x1ccb0,0x1e65c,0x1bb40,0x19920, // 450
-			0x1eedc,0x1e64e,0x1bb20,0x1dd98,0x1eece,0x1bb10,0x19908,0x1cc86,0x1bb08,0x1dd86, // 460
-			0x19902,0x11140,0x188b0,0x1c45c,0x13340,0x11120,0x18898,0x1c44e,0x17740,0x13320, // 470
-			0x19998,0x1ccce,0x17720,0x1bb98,0x1ddce,0x18886,0x17710,0x13308,0x19986,0x17708, // 480
-			0x11102,0x111b0,0x188dc,0x133b0,0x11198,0x188ce,0x177b0,0x13398,0x199ce,0x17798, // 490
-			0x1bbce,0x11186,0x13386,0x111dc,0x133dc,0x111ce,0x177dc,0x133ce,0x1dca0,0x1ee58, // 500
-			0x1f72e,0x1dc90,0x1ee4c,0x1dc88,0x1ee46,0x1dc84,0x1dc82,0x198a0,0x1cc58,0x1e62e, // 510
-			0x1b9a0,0x19890,0x1ee6e,0x1b990,0x1dccc,0x1cc46,0x1b988,0x19884,0x1b984,0x19882, // 520
-			0x1b982,0x110a0,0x18858,0x1c42e,0x131a0,0x11090,0x1884c,0x173a0,0x13190,0x198cc, // 530
-			0x18846,0x17390,0x1b9cc,0x11084,0x17388,0x13184,0x11082,0x13182,0x110d8,0x1886e, // 540
-			0x131d8,0x110cc,0x173d8,0x131cc,0x110c6,0x173cc,0x131c6,0x110ee,0x173ee,0x1dc50, // 550
-			0x1ee2c,0x1dc48,0x1ee26,0x1dc44,0x1dc42,0x19850,0x1cc2c,0x1b8d0,0x19848,0x1cc26, // 560
-			0x1b8c8,0x1dc66,0x1b8c4,0x19842,0x1b8c2,0x11050,0x1882c,0x130d0,0x11048,0x18826, // 570
-			0x171d0,0x130c8,0x19866,0x171c8,0x1b8e6,0x11042,0x171c4,0x130c2,0x171c2,0x130ec, // 580
-			0x171ec,0x171e6,0x1ee16,0x1dc22,0x1cc16,0x19824,0x19822,0x11028,0x13068,0x170e8, // 590
-			0x11022,0x13062,0x18560,0x10a40,0x18530,0x10a20,0x18518,0x1c28e,0x10a10,0x1850c, // 600
-			0x10a08,0x18506,0x10b60,0x185b8,0x1c2de,0x10b30,0x1859c,0x10b18,0x1858e,0x10b0c, // 610
-			0x10b06,0x10bb8,0x185de,0x10b9c,0x10b8e,0x10bde,0x18d40,0x1c6b0,0x1e35c,0x18d20, // 620
-			0x1c698,0x18d10,0x1c68c,0x18d08,0x1c686,0x18d04,0x10940,0x184b0,0x1c25c,0x11b40, // 630
-			0x10920,0x1c6dc,0x1c24e,0x11b20,0x18d98,0x1c6ce,0x11b10,0x10908,0x18486,0x11b08, // 640
-			0x18d86,0x10902,0x109b0,0x184dc,0x11bb0,0x10998,0x184ce,0x11b98,0x18dce,0x11b8c, // 650
-			0x10986,0x109dc,0x11bdc,0x109ce,0x11bce,0x1cea0,0x1e758,0x1f3ae,0x1ce90,0x1e74c, // 660
-			0x1ce88,0x1e746,0x1ce84,0x1ce82,0x18ca0,0x1c658,0x19da0,0x18c90,0x1c64c,0x19d90, // 670
-			0x1cecc,0x1c646,0x19d88,0x18c84,0x19d84,0x18c82,0x19d82,0x108a0,0x18458,0x119a0, // 680
-			0x10890,0x1c66e,0x13ba0,0x11990,0x18ccc,0x18446,0x13b90,0x19dcc,0x10884,0x13b88, // 690
-			0x11984,0x10882,0x11982,0x108d8,0x1846e,0x119d8,0x108cc,0x13bd8,0x119cc,0x108c6, // 700
-			0x13bcc,0x119c6,0x108ee,0x119ee,0x13bee,0x1ef50,0x1f7ac,0x1ef48,0x1f7a6,0x1ef44, // 710
-			0x1ef42,0x1ce50,0x1e72c,0x1ded0,0x1ef6c,0x1e726,0x1dec8,0x1ef66,0x1dec4,0x1ce42, // 720
-			0x1dec2,0x18c50,0x1c62c,0x19cd0,0x18c48,0x1c626,0x1bdd0,0x19cc8,0x1ce66,0x1bdc8, // 730
-			0x1dee6,0x18c42,0x1bdc4,0x19cc2,0x1bdc2,0x10850,0x1842c,0x118d0,0x10848,0x18426, // 740
-			0x139d0,0x118c8,0x18c66,0x17bd0,0x139c8,0x19ce6,0x10842,0x17bc8,0x1bde6,0x118c2, // 750
-			0x17bc4,0x1086c,0x118ec,0x10866,0x139ec,0x118e6,0x17bec,0x139e6,0x17be6,0x1ef28, // 760
-			0x1f796,0x1ef24,0x1ef22,0x1ce28,0x1e716,0x1de68,0x1ef36,0x1de64,0x1ce22,0x1de62, // 770
-			0x18c28,0x1c616,0x19c68,0x18c24,0x1bce8,0x19c64,0x18c22,0x1bce4,0x19c62,0x1bce2, // 780
-			0x10828,0x18416,0x11868,0x18c36,0x138e8,0x11864,0x10822,0x179e8,0x138e4,0x11862, // 790
-			0x179e4,0x138e2,0x179e2,0x11876,0x179f6,0x1ef12,0x1de34,0x1de32,0x19c34,0x1bc74, // 800
-			0x1bc72,0x11834,0x13874,0x178f4,0x178f2,0x10540,0x10520,0x18298,0x10510,0x10508, // 810
-			0x10504,0x105b0,0x10598,0x1058c,0x10586,0x105dc,0x105ce,0x186a0,0x18690,0x1c34c, // 820
-			0x18688,0x1c346,0x18684,0x18682,0x104a0,0x18258,0x10da0,0x186d8,0x1824c,0x10d90, // 830
-			0x186cc,0x10d88,0x186c6,0x10d84,0x10482,0x10d82,0x104d8,0x1826e,0x10dd8,0x186ee, // 840
-			0x10dcc,0x104c6,0x10dc6,0x104ee,0x10dee,0x1c750,0x1c748,0x1c744,0x1c742,0x18650, // 850
-			0x18ed0,0x1c76c,0x1c326,0x18ec8,0x1c766,0x18ec4,0x18642,0x18ec2,0x10450,0x10cd0, // 860
-			0x10448,0x18226,0x11dd0,0x10cc8,0x10444,0x11dc8,0x10cc4,0x10442,0x11dc4,0x10cc2, // 870
-			0x1046c,0x10cec,0x10466,0x11dec,0x10ce6,0x11de6,0x1e7a8,0x1e7a4,0x1e7a2,0x1c728, // 880
-			0x1cf68,0x1e7b6,0x1cf64,0x1c722,0x1cf62,0x18628,0x1c316,0x18e68,0x1c736,0x19ee8, // 890
-			0x18e64,0x18622,0x19ee4,0x18e62,0x19ee2,0x10428,0x18216,0x10c68,0x18636,0x11ce8, // 900
-			0x10c64,0x10422,0x13de8,0x11ce4,0x10c62,0x13de4,0x11ce2,0x10436,0x10c76,0x11cf6, // 910
-			0x13df6,0x1f7d4,0x1f7d2,0x1e794,0x1efb4,0x1e792,0x1efb2,0x1c714,0x1cf34,0x1c712, // 920
-			0x1df74,0x1cf32,0x1df72,0x18614,0x18e34,0x18612,0x19e74,0x18e32,0x1bef4),        // 929
+			0x1d5c0, 0x1eaf0, 0x1f57c, 0x1d4e0, 0x1ea78, 0x1f53e, 0x1a8c0, 0x1d470, 0x1a860, 0x15040, //  10
+			0x1a830, 0x15020, 0x1adc0, 0x1d6f0, 0x1eb7c, 0x1ace0, 0x1d678, 0x1eb3e, 0x158c0, 0x1ac70, //  20
+			0x15860, 0x15dc0, 0x1aef0, 0x1d77c, 0x15ce0, 0x1ae78, 0x1d73e, 0x15c70, 0x1ae3c, 0x15ef0, //  30
+			0x1af7c, 0x15e78, 0x1af3e, 0x15f7c, 0x1f5fa, 0x1d2e0, 0x1e978, 0x1f4be, 0x1a4c0, 0x1d270, //  40
+			0x1e93c, 0x1a460, 0x1d238, 0x14840, 0x1a430, 0x1d21c, 0x14820, 0x1a418, 0x14810, 0x1a6e0, //  50
+			0x1d378, 0x1e9be, 0x14cc0, 0x1a670, 0x1d33c, 0x14c60, 0x1a638, 0x1d31e, 0x14c30, 0x1a61c, //  60
+			0x14ee0, 0x1a778, 0x1d3be, 0x14e70, 0x1a73c, 0x14e38, 0x1a71e, 0x14f78, 0x1a7be, 0x14f3c, //  70
+			0x14f1e, 0x1a2c0, 0x1d170, 0x1e8bc, 0x1a260, 0x1d138, 0x1e89e, 0x14440, 0x1a230, 0x1d11c, //  80
+			0x14420, 0x1a218, 0x14410, 0x14408, 0x146c0, 0x1a370, 0x1d1bc, 0x14660, 0x1a338, 0x1d19e, //  90
+			0x14630, 0x1a31c, 0x14618, 0x1460c, 0x14770, 0x1a3bc, 0x14738, 0x1a39e, 0x1471c, 0x147bc, // 100
+			0x1a160, 0x1d0b8, 0x1e85e, 0x14240, 0x1a130, 0x1d09c, 0x14220, 0x1a118, 0x1d08e, 0x14210, // 110
+			0x1a10c, 0x14208, 0x1a106, 0x14360, 0x1a1b8, 0x1d0de, 0x14330, 0x1a19c, 0x14318, 0x1a18e, // 120
+			0x1430c, 0x14306, 0x1a1de, 0x1438e, 0x14140, 0x1a0b0, 0x1d05c, 0x14120, 0x1a098, 0x1d04e, // 130
+			0x14110, 0x1a08c, 0x14108, 0x1a086, 0x14104, 0x141b0, 0x14198, 0x1418c, 0x140a0, 0x1d02e, // 140
+			0x1a04c, 0x1a046, 0x14082, 0x1cae0, 0x1e578, 0x1f2be, 0x194c0, 0x1ca70, 0x1e53c, 0x19460, // 150
+			0x1ca38, 0x1e51e, 0x12840, 0x19430, 0x12820, 0x196e0, 0x1cb78, 0x1e5be, 0x12cc0, 0x19670, // 160
+			0x1cb3c, 0x12c60, 0x19638, 0x12c30, 0x12c18, 0x12ee0, 0x19778, 0x1cbbe, 0x12e70, 0x1973c, // 170
+			0x12e38, 0x12e1c, 0x12f78, 0x197be, 0x12f3c, 0x12fbe, 0x1dac0, 0x1ed70, 0x1f6bc, 0x1da60, // 180
+			0x1ed38, 0x1f69e, 0x1b440, 0x1da30, 0x1ed1c, 0x1b420, 0x1da18, 0x1ed0e, 0x1b410, 0x1da0c, // 190
+			0x192c0, 0x1c970, 0x1e4bc, 0x1b6c0, 0x19260, 0x1c938, 0x1e49e, 0x1b660, 0x1db38, 0x1ed9e, // 200
+			0x16c40, 0x12420, 0x19218, 0x1c90e, 0x16c20, 0x1b618, 0x16c10, 0x126c0, 0x19370, 0x1c9bc, // 210
+			0x16ec0, 0x12660, 0x19338, 0x1c99e, 0x16e60, 0x1b738, 0x1db9e, 0x16e30, 0x12618, 0x16e18, // 220
+			0x12770, 0x193bc, 0x16f70, 0x12738, 0x1939e, 0x16f38, 0x1b79e, 0x16f1c, 0x127bc, 0x16fbc, // 230
+			0x1279e, 0x16f9e, 0x1d960, 0x1ecb8, 0x1f65e, 0x1b240, 0x1d930, 0x1ec9c, 0x1b220, 0x1d918, // 240
+			0x1ec8e, 0x1b210, 0x1d90c, 0x1b208, 0x1b204, 0x19160, 0x1c8b8, 0x1e45e, 0x1b360, 0x19130, // 250
+			0x1c89c, 0x16640, 0x12220, 0x1d99c, 0x1c88e, 0x16620, 0x12210, 0x1910c, 0x16610, 0x1b30c, // 260
+			0x19106, 0x12204, 0x12360, 0x191b8, 0x1c8de, 0x16760, 0x12330, 0x1919c, 0x16730, 0x1b39c, // 270
+			0x1918e, 0x16718, 0x1230c, 0x12306, 0x123b8, 0x191de, 0x167b8, 0x1239c, 0x1679c, 0x1238e, // 280
+			0x1678e, 0x167de, 0x1b140, 0x1d8b0, 0x1ec5c, 0x1b120, 0x1d898, 0x1ec4e, 0x1b110, 0x1d88c, // 290
+			0x1b108, 0x1d886, 0x1b104, 0x1b102, 0x12140, 0x190b0, 0x1c85c, 0x16340, 0x12120, 0x19098, // 300
+			0x1c84e, 0x16320, 0x1b198, 0x1d8ce, 0x16310, 0x12108, 0x19086, 0x16308, 0x1b186, 0x16304, // 310
+			0x121b0, 0x190dc, 0x163b0, 0x12198, 0x190ce, 0x16398, 0x1b1ce, 0x1638c, 0x12186, 0x16386, // 320
+			0x163dc, 0x163ce, 0x1b0a0, 0x1d858, 0x1ec2e, 0x1b090, 0x1d84c, 0x1b088, 0x1d846, 0x1b084, // 330
+			0x1b082, 0x120a0, 0x19058, 0x1c82e, 0x161a0, 0x12090, 0x1904c, 0x16190, 0x1b0cc, 0x19046, // 340
+			0x16188, 0x12084, 0x16184, 0x12082, 0x120d8, 0x161d8, 0x161cc, 0x161c6, 0x1d82c, 0x1d826, // 350
+			0x1b042, 0x1902c, 0x12048, 0x160c8, 0x160c4, 0x160c2, 0x18ac0, 0x1c570, 0x1e2bc, 0x18a60, // 360
+			0x1c538, 0x11440, 0x18a30, 0x1c51c, 0x11420, 0x18a18, 0x11410, 0x11408, 0x116c0, 0x18b70, // 370
+			0x1c5bc, 0x11660, 0x18b38, 0x1c59e, 0x11630, 0x18b1c, 0x11618, 0x1160c, 0x11770, 0x18bbc, // 380
+			0x11738, 0x18b9e, 0x1171c, 0x117bc, 0x1179e, 0x1cd60, 0x1e6b8, 0x1f35e, 0x19a40, 0x1cd30, // 390
+			0x1e69c, 0x19a20, 0x1cd18, 0x1e68e, 0x19a10, 0x1cd0c, 0x19a08, 0x1cd06, 0x18960, 0x1c4b8, // 400
+			0x1e25e, 0x19b60, 0x18930, 0x1c49c, 0x13640, 0x11220, 0x1cd9c, 0x1c48e, 0x13620, 0x19b18, // 410
+			0x1890c, 0x13610, 0x11208, 0x13608, 0x11360, 0x189b8, 0x1c4de, 0x13760, 0x11330, 0x1cdde, // 420
+			0x13730, 0x19b9c, 0x1898e, 0x13718, 0x1130c, 0x1370c, 0x113b8, 0x189de, 0x137b8, 0x1139c, // 430
+			0x1379c, 0x1138e, 0x113de, 0x137de, 0x1dd40, 0x1eeb0, 0x1f75c, 0x1dd20, 0x1ee98, 0x1f74e, // 440
+			0x1dd10, 0x1ee8c, 0x1dd08, 0x1ee86, 0x1dd04, 0x19940, 0x1ccb0, 0x1e65c, 0x1bb40, 0x19920, // 450
+			0x1eedc, 0x1e64e, 0x1bb20, 0x1dd98, 0x1eece, 0x1bb10, 0x19908, 0x1cc86, 0x1bb08, 0x1dd86, // 460
+			0x19902, 0x11140, 0x188b0, 0x1c45c, 0x13340, 0x11120, 0x18898, 0x1c44e, 0x17740, 0x13320, // 470
+			0x19998, 0x1ccce, 0x17720, 0x1bb98, 0x1ddce, 0x18886, 0x17710, 0x13308, 0x19986, 0x17708, // 480
+			0x11102, 0x111b0, 0x188dc, 0x133b0, 0x11198, 0x188ce, 0x177b0, 0x13398, 0x199ce, 0x17798, // 490
+			0x1bbce, 0x11186, 0x13386, 0x111dc, 0x133dc, 0x111ce, 0x177dc, 0x133ce, 0x1dca0, 0x1ee58, // 500
+			0x1f72e, 0x1dc90, 0x1ee4c, 0x1dc88, 0x1ee46, 0x1dc84, 0x1dc82, 0x198a0, 0x1cc58, 0x1e62e, // 510
+			0x1b9a0, 0x19890, 0x1ee6e, 0x1b990, 0x1dccc, 0x1cc46, 0x1b988, 0x19884, 0x1b984, 0x19882, // 520
+			0x1b982, 0x110a0, 0x18858, 0x1c42e, 0x131a0, 0x11090, 0x1884c, 0x173a0, 0x13190, 0x198cc, // 530
+			0x18846, 0x17390, 0x1b9cc, 0x11084, 0x17388, 0x13184, 0x11082, 0x13182, 0x110d8, 0x1886e, // 540
+			0x131d8, 0x110cc, 0x173d8, 0x131cc, 0x110c6, 0x173cc, 0x131c6, 0x110ee, 0x173ee, 0x1dc50, // 550
+			0x1ee2c, 0x1dc48, 0x1ee26, 0x1dc44, 0x1dc42, 0x19850, 0x1cc2c, 0x1b8d0, 0x19848, 0x1cc26, // 560
+			0x1b8c8, 0x1dc66, 0x1b8c4, 0x19842, 0x1b8c2, 0x11050, 0x1882c, 0x130d0, 0x11048, 0x18826, // 570
+			0x171d0, 0x130c8, 0x19866, 0x171c8, 0x1b8e6, 0x11042, 0x171c4, 0x130c2, 0x171c2, 0x130ec, // 580
+			0x171ec, 0x171e6, 0x1ee16, 0x1dc22, 0x1cc16, 0x19824, 0x19822, 0x11028, 0x13068, 0x170e8, // 590
+			0x11022, 0x13062, 0x18560, 0x10a40, 0x18530, 0x10a20, 0x18518, 0x1c28e, 0x10a10, 0x1850c, // 600
+			0x10a08, 0x18506, 0x10b60, 0x185b8, 0x1c2de, 0x10b30, 0x1859c, 0x10b18, 0x1858e, 0x10b0c, // 610
+			0x10b06, 0x10bb8, 0x185de, 0x10b9c, 0x10b8e, 0x10bde, 0x18d40, 0x1c6b0, 0x1e35c, 0x18d20, // 620
+			0x1c698, 0x18d10, 0x1c68c, 0x18d08, 0x1c686, 0x18d04, 0x10940, 0x184b0, 0x1c25c, 0x11b40, // 630
+			0x10920, 0x1c6dc, 0x1c24e, 0x11b20, 0x18d98, 0x1c6ce, 0x11b10, 0x10908, 0x18486, 0x11b08, // 640
+			0x18d86, 0x10902, 0x109b0, 0x184dc, 0x11bb0, 0x10998, 0x184ce, 0x11b98, 0x18dce, 0x11b8c, // 650
+			0x10986, 0x109dc, 0x11bdc, 0x109ce, 0x11bce, 0x1cea0, 0x1e758, 0x1f3ae, 0x1ce90, 0x1e74c, // 660
+			0x1ce88, 0x1e746, 0x1ce84, 0x1ce82, 0x18ca0, 0x1c658, 0x19da0, 0x18c90, 0x1c64c, 0x19d90, // 670
+			0x1cecc, 0x1c646, 0x19d88, 0x18c84, 0x19d84, 0x18c82, 0x19d82, 0x108a0, 0x18458, 0x119a0, // 680
+			0x10890, 0x1c66e, 0x13ba0, 0x11990, 0x18ccc, 0x18446, 0x13b90, 0x19dcc, 0x10884, 0x13b88, // 690
+			0x11984, 0x10882, 0x11982, 0x108d8, 0x1846e, 0x119d8, 0x108cc, 0x13bd8, 0x119cc, 0x108c6, // 700
+			0x13bcc, 0x119c6, 0x108ee, 0x119ee, 0x13bee, 0x1ef50, 0x1f7ac, 0x1ef48, 0x1f7a6, 0x1ef44, // 710
+			0x1ef42, 0x1ce50, 0x1e72c, 0x1ded0, 0x1ef6c, 0x1e726, 0x1dec8, 0x1ef66, 0x1dec4, 0x1ce42, // 720
+			0x1dec2, 0x18c50, 0x1c62c, 0x19cd0, 0x18c48, 0x1c626, 0x1bdd0, 0x19cc8, 0x1ce66, 0x1bdc8, // 730
+			0x1dee6, 0x18c42, 0x1bdc4, 0x19cc2, 0x1bdc2, 0x10850, 0x1842c, 0x118d0, 0x10848, 0x18426, // 740
+			0x139d0, 0x118c8, 0x18c66, 0x17bd0, 0x139c8, 0x19ce6, 0x10842, 0x17bc8, 0x1bde6, 0x118c2, // 750
+			0x17bc4, 0x1086c, 0x118ec, 0x10866, 0x139ec, 0x118e6, 0x17bec, 0x139e6, 0x17be6, 0x1ef28, // 760
+			0x1f796, 0x1ef24, 0x1ef22, 0x1ce28, 0x1e716, 0x1de68, 0x1ef36, 0x1de64, 0x1ce22, 0x1de62, // 770
+			0x18c28, 0x1c616, 0x19c68, 0x18c24, 0x1bce8, 0x19c64, 0x18c22, 0x1bce4, 0x19c62, 0x1bce2, // 780
+			0x10828, 0x18416, 0x11868, 0x18c36, 0x138e8, 0x11864, 0x10822, 0x179e8, 0x138e4, 0x11862, // 790
+			0x179e4, 0x138e2, 0x179e2, 0x11876, 0x179f6, 0x1ef12, 0x1de34, 0x1de32, 0x19c34, 0x1bc74, // 800
+			0x1bc72, 0x11834, 0x13874, 0x178f4, 0x178f2, 0x10540, 0x10520, 0x18298, 0x10510, 0x10508, // 810
+			0x10504, 0x105b0, 0x10598, 0x1058c, 0x10586, 0x105dc, 0x105ce, 0x186a0, 0x18690, 0x1c34c, // 820
+			0x18688, 0x1c346, 0x18684, 0x18682, 0x104a0, 0x18258, 0x10da0, 0x186d8, 0x1824c, 0x10d90, // 830
+			0x186cc, 0x10d88, 0x186c6, 0x10d84, 0x10482, 0x10d82, 0x104d8, 0x1826e, 0x10dd8, 0x186ee, // 840
+			0x10dcc, 0x104c6, 0x10dc6, 0x104ee, 0x10dee, 0x1c750, 0x1c748, 0x1c744, 0x1c742, 0x18650, // 850
+			0x18ed0, 0x1c76c, 0x1c326, 0x18ec8, 0x1c766, 0x18ec4, 0x18642, 0x18ec2, 0x10450, 0x10cd0, // 860
+			0x10448, 0x18226, 0x11dd0, 0x10cc8, 0x10444, 0x11dc8, 0x10cc4, 0x10442, 0x11dc4, 0x10cc2, // 870
+			0x1046c, 0x10cec, 0x10466, 0x11dec, 0x10ce6, 0x11de6, 0x1e7a8, 0x1e7a4, 0x1e7a2, 0x1c728, // 880
+			0x1cf68, 0x1e7b6, 0x1cf64, 0x1c722, 0x1cf62, 0x18628, 0x1c316, 0x18e68, 0x1c736, 0x19ee8, // 890
+			0x18e64, 0x18622, 0x19ee4, 0x18e62, 0x19ee2, 0x10428, 0x18216, 0x10c68, 0x18636, 0x11ce8, // 900
+			0x10c64, 0x10422, 0x13de8, 0x11ce4, 0x10c62, 0x13de4, 0x11ce2, 0x10436, 0x10c76, 0x11cf6, // 910
+			0x13df6, 0x1f7d4, 0x1f7d2, 0x1e794, 0x1efb4, 0x1e792, 0x1efb2, 0x1c714, 0x1cf34, 0x1c712, // 920
+			0x1df74, 0x1cf32, 0x1df72, 0x18614, 0x18e34, 0x18612, 0x19e74, 0x18e32, 0x1bef4), // 929
 		array( // cluster 3 -----------------------------------------------------------------------
-			0x1f560,0x1fab8,0x1ea40,0x1f530,0x1fa9c,0x1ea20,0x1f518,0x1fa8e,0x1ea10,0x1f50c, //  10
-			0x1ea08,0x1f506,0x1ea04,0x1eb60,0x1f5b8,0x1fade,0x1d640,0x1eb30,0x1f59c,0x1d620, //  20
-			0x1eb18,0x1f58e,0x1d610,0x1eb0c,0x1d608,0x1eb06,0x1d604,0x1d760,0x1ebb8,0x1f5de, //  30
-			0x1ae40,0x1d730,0x1eb9c,0x1ae20,0x1d718,0x1eb8e,0x1ae10,0x1d70c,0x1ae08,0x1d706, //  40
-			0x1ae04,0x1af60,0x1d7b8,0x1ebde,0x15e40,0x1af30,0x1d79c,0x15e20,0x1af18,0x1d78e, //  50
-			0x15e10,0x1af0c,0x15e08,0x1af06,0x15f60,0x1afb8,0x1d7de,0x15f30,0x1af9c,0x15f18, //  60
-			0x1af8e,0x15f0c,0x15fb8,0x1afde,0x15f9c,0x15f8e,0x1e940,0x1f4b0,0x1fa5c,0x1e920, //  70
-			0x1f498,0x1fa4e,0x1e910,0x1f48c,0x1e908,0x1f486,0x1e904,0x1e902,0x1d340,0x1e9b0, //  80
-			0x1f4dc,0x1d320,0x1e998,0x1f4ce,0x1d310,0x1e98c,0x1d308,0x1e986,0x1d304,0x1d302, //  90
-			0x1a740,0x1d3b0,0x1e9dc,0x1a720,0x1d398,0x1e9ce,0x1a710,0x1d38c,0x1a708,0x1d386, // 100
-			0x1a704,0x1a702,0x14f40,0x1a7b0,0x1d3dc,0x14f20,0x1a798,0x1d3ce,0x14f10,0x1a78c, // 110
-			0x14f08,0x1a786,0x14f04,0x14fb0,0x1a7dc,0x14f98,0x1a7ce,0x14f8c,0x14f86,0x14fdc, // 120
-			0x14fce,0x1e8a0,0x1f458,0x1fa2e,0x1e890,0x1f44c,0x1e888,0x1f446,0x1e884,0x1e882, // 130
-			0x1d1a0,0x1e8d8,0x1f46e,0x1d190,0x1e8cc,0x1d188,0x1e8c6,0x1d184,0x1d182,0x1a3a0, // 140
-			0x1d1d8,0x1e8ee,0x1a390,0x1d1cc,0x1a388,0x1d1c6,0x1a384,0x1a382,0x147a0,0x1a3d8, // 150
-			0x1d1ee,0x14790,0x1a3cc,0x14788,0x1a3c6,0x14784,0x14782,0x147d8,0x1a3ee,0x147cc, // 160
-			0x147c6,0x147ee,0x1e850,0x1f42c,0x1e848,0x1f426,0x1e844,0x1e842,0x1d0d0,0x1e86c, // 170
-			0x1d0c8,0x1e866,0x1d0c4,0x1d0c2,0x1a1d0,0x1d0ec,0x1a1c8,0x1d0e6,0x1a1c4,0x1a1c2, // 180
-			0x143d0,0x1a1ec,0x143c8,0x1a1e6,0x143c4,0x143c2,0x143ec,0x143e6,0x1e828,0x1f416, // 190
-			0x1e824,0x1e822,0x1d068,0x1e836,0x1d064,0x1d062,0x1a0e8,0x1d076,0x1a0e4,0x1a0e2, // 200
-			0x141e8,0x1a0f6,0x141e4,0x141e2,0x1e814,0x1e812,0x1d034,0x1d032,0x1a074,0x1a072, // 210
-			0x1e540,0x1f2b0,0x1f95c,0x1e520,0x1f298,0x1f94e,0x1e510,0x1f28c,0x1e508,0x1f286, // 220
-			0x1e504,0x1e502,0x1cb40,0x1e5b0,0x1f2dc,0x1cb20,0x1e598,0x1f2ce,0x1cb10,0x1e58c, // 230
-			0x1cb08,0x1e586,0x1cb04,0x1cb02,0x19740,0x1cbb0,0x1e5dc,0x19720,0x1cb98,0x1e5ce, // 240
-			0x19710,0x1cb8c,0x19708,0x1cb86,0x19704,0x19702,0x12f40,0x197b0,0x1cbdc,0x12f20, // 250
-			0x19798,0x1cbce,0x12f10,0x1978c,0x12f08,0x19786,0x12f04,0x12fb0,0x197dc,0x12f98, // 260
-			0x197ce,0x12f8c,0x12f86,0x12fdc,0x12fce,0x1f6a0,0x1fb58,0x16bf0,0x1f690,0x1fb4c, // 270
-			0x169f8,0x1f688,0x1fb46,0x168fc,0x1f684,0x1f682,0x1e4a0,0x1f258,0x1f92e,0x1eda0, // 280
-			0x1e490,0x1fb6e,0x1ed90,0x1f6cc,0x1f246,0x1ed88,0x1e484,0x1ed84,0x1e482,0x1ed82, // 290
-			0x1c9a0,0x1e4d8,0x1f26e,0x1dba0,0x1c990,0x1e4cc,0x1db90,0x1edcc,0x1e4c6,0x1db88, // 300
-			0x1c984,0x1db84,0x1c982,0x1db82,0x193a0,0x1c9d8,0x1e4ee,0x1b7a0,0x19390,0x1c9cc, // 310
-			0x1b790,0x1dbcc,0x1c9c6,0x1b788,0x19384,0x1b784,0x19382,0x1b782,0x127a0,0x193d8, // 320
-			0x1c9ee,0x16fa0,0x12790,0x193cc,0x16f90,0x1b7cc,0x193c6,0x16f88,0x12784,0x16f84, // 330
-			0x12782,0x127d8,0x193ee,0x16fd8,0x127cc,0x16fcc,0x127c6,0x16fc6,0x127ee,0x1f650, // 340
-			0x1fb2c,0x165f8,0x1f648,0x1fb26,0x164fc,0x1f644,0x1647e,0x1f642,0x1e450,0x1f22c, // 350
-			0x1ecd0,0x1e448,0x1f226,0x1ecc8,0x1f666,0x1ecc4,0x1e442,0x1ecc2,0x1c8d0,0x1e46c, // 360
-			0x1d9d0,0x1c8c8,0x1e466,0x1d9c8,0x1ece6,0x1d9c4,0x1c8c2,0x1d9c2,0x191d0,0x1c8ec, // 370
-			0x1b3d0,0x191c8,0x1c8e6,0x1b3c8,0x1d9e6,0x1b3c4,0x191c2,0x1b3c2,0x123d0,0x191ec, // 380
-			0x167d0,0x123c8,0x191e6,0x167c8,0x1b3e6,0x167c4,0x123c2,0x167c2,0x123ec,0x167ec, // 390
-			0x123e6,0x167e6,0x1f628,0x1fb16,0x162fc,0x1f624,0x1627e,0x1f622,0x1e428,0x1f216, // 400
-			0x1ec68,0x1f636,0x1ec64,0x1e422,0x1ec62,0x1c868,0x1e436,0x1d8e8,0x1c864,0x1d8e4, // 410
-			0x1c862,0x1d8e2,0x190e8,0x1c876,0x1b1e8,0x1d8f6,0x1b1e4,0x190e2,0x1b1e2,0x121e8, // 420
-			0x190f6,0x163e8,0x121e4,0x163e4,0x121e2,0x163e2,0x121f6,0x163f6,0x1f614,0x1617e, // 430
-			0x1f612,0x1e414,0x1ec34,0x1e412,0x1ec32,0x1c834,0x1d874,0x1c832,0x1d872,0x19074, // 440
-			0x1b0f4,0x19072,0x1b0f2,0x120f4,0x161f4,0x120f2,0x161f2,0x1f60a,0x1e40a,0x1ec1a, // 450
-			0x1c81a,0x1d83a,0x1903a,0x1b07a,0x1e2a0,0x1f158,0x1f8ae,0x1e290,0x1f14c,0x1e288, // 460
-			0x1f146,0x1e284,0x1e282,0x1c5a0,0x1e2d8,0x1f16e,0x1c590,0x1e2cc,0x1c588,0x1e2c6, // 470
-			0x1c584,0x1c582,0x18ba0,0x1c5d8,0x1e2ee,0x18b90,0x1c5cc,0x18b88,0x1c5c6,0x18b84, // 480
-			0x18b82,0x117a0,0x18bd8,0x1c5ee,0x11790,0x18bcc,0x11788,0x18bc6,0x11784,0x11782, // 490
-			0x117d8,0x18bee,0x117cc,0x117c6,0x117ee,0x1f350,0x1f9ac,0x135f8,0x1f348,0x1f9a6, // 500
-			0x134fc,0x1f344,0x1347e,0x1f342,0x1e250,0x1f12c,0x1e6d0,0x1e248,0x1f126,0x1e6c8, // 510
-			0x1f366,0x1e6c4,0x1e242,0x1e6c2,0x1c4d0,0x1e26c,0x1cdd0,0x1c4c8,0x1e266,0x1cdc8, // 520
-			0x1e6e6,0x1cdc4,0x1c4c2,0x1cdc2,0x189d0,0x1c4ec,0x19bd0,0x189c8,0x1c4e6,0x19bc8, // 530
-			0x1cde6,0x19bc4,0x189c2,0x19bc2,0x113d0,0x189ec,0x137d0,0x113c8,0x189e6,0x137c8, // 540
-			0x19be6,0x137c4,0x113c2,0x137c2,0x113ec,0x137ec,0x113e6,0x137e6,0x1fba8,0x175f0, // 550
-			0x1bafc,0x1fba4,0x174f8,0x1ba7e,0x1fba2,0x1747c,0x1743e,0x1f328,0x1f996,0x132fc, // 560
-			0x1f768,0x1fbb6,0x176fc,0x1327e,0x1f764,0x1f322,0x1767e,0x1f762,0x1e228,0x1f116, // 570
-			0x1e668,0x1e224,0x1eee8,0x1f776,0x1e222,0x1eee4,0x1e662,0x1eee2,0x1c468,0x1e236, // 580
-			0x1cce8,0x1c464,0x1dde8,0x1cce4,0x1c462,0x1dde4,0x1cce2,0x1dde2,0x188e8,0x1c476, // 590
-			0x199e8,0x188e4,0x1bbe8,0x199e4,0x188e2,0x1bbe4,0x199e2,0x1bbe2,0x111e8,0x188f6, // 600
-			0x133e8,0x111e4,0x177e8,0x133e4,0x111e2,0x177e4,0x133e2,0x177e2,0x111f6,0x133f6, // 610
-			0x1fb94,0x172f8,0x1b97e,0x1fb92,0x1727c,0x1723e,0x1f314,0x1317e,0x1f734,0x1f312, // 620
-			0x1737e,0x1f732,0x1e214,0x1e634,0x1e212,0x1ee74,0x1e632,0x1ee72,0x1c434,0x1cc74, // 630
-			0x1c432,0x1dcf4,0x1cc72,0x1dcf2,0x18874,0x198f4,0x18872,0x1b9f4,0x198f2,0x1b9f2, // 640
-			0x110f4,0x131f4,0x110f2,0x173f4,0x131f2,0x173f2,0x1fb8a,0x1717c,0x1713e,0x1f30a, // 650
-			0x1f71a,0x1e20a,0x1e61a,0x1ee3a,0x1c41a,0x1cc3a,0x1dc7a,0x1883a,0x1987a,0x1b8fa, // 660
-			0x1107a,0x130fa,0x171fa,0x170be,0x1e150,0x1f0ac,0x1e148,0x1f0a6,0x1e144,0x1e142, // 670
-			0x1c2d0,0x1e16c,0x1c2c8,0x1e166,0x1c2c4,0x1c2c2,0x185d0,0x1c2ec,0x185c8,0x1c2e6, // 680
-			0x185c4,0x185c2,0x10bd0,0x185ec,0x10bc8,0x185e6,0x10bc4,0x10bc2,0x10bec,0x10be6, // 690
-			0x1f1a8,0x1f8d6,0x11afc,0x1f1a4,0x11a7e,0x1f1a2,0x1e128,0x1f096,0x1e368,0x1e124, // 700
-			0x1e364,0x1e122,0x1e362,0x1c268,0x1e136,0x1c6e8,0x1c264,0x1c6e4,0x1c262,0x1c6e2, // 710
-			0x184e8,0x1c276,0x18de8,0x184e4,0x18de4,0x184e2,0x18de2,0x109e8,0x184f6,0x11be8, // 720
-			0x109e4,0x11be4,0x109e2,0x11be2,0x109f6,0x11bf6,0x1f9d4,0x13af8,0x19d7e,0x1f9d2, // 730
-			0x13a7c,0x13a3e,0x1f194,0x1197e,0x1f3b4,0x1f192,0x13b7e,0x1f3b2,0x1e114,0x1e334, // 740
-			0x1e112,0x1e774,0x1e332,0x1e772,0x1c234,0x1c674,0x1c232,0x1cef4,0x1c672,0x1cef2, // 750
-			0x18474,0x18cf4,0x18472,0x19df4,0x18cf2,0x19df2,0x108f4,0x119f4,0x108f2,0x13bf4, // 760
-			0x119f2,0x13bf2,0x17af0,0x1bd7c,0x17a78,0x1bd3e,0x17a3c,0x17a1e,0x1f9ca,0x1397c, // 770
-			0x1fbda,0x17b7c,0x1393e,0x17b3e,0x1f18a,0x1f39a,0x1f7ba,0x1e10a,0x1e31a,0x1e73a, // 780
-			0x1ef7a,0x1c21a,0x1c63a,0x1ce7a,0x1defa,0x1843a,0x18c7a,0x19cfa,0x1bdfa,0x1087a, // 790
-			0x118fa,0x139fa,0x17978,0x1bcbe,0x1793c,0x1791e,0x138be,0x179be,0x178bc,0x1789e, // 800
-			0x1785e,0x1e0a8,0x1e0a4,0x1e0a2,0x1c168,0x1e0b6,0x1c164,0x1c162,0x182e8,0x1c176, // 810
-			0x182e4,0x182e2,0x105e8,0x182f6,0x105e4,0x105e2,0x105f6,0x1f0d4,0x10d7e,0x1f0d2, // 820
-			0x1e094,0x1e1b4,0x1e092,0x1e1b2,0x1c134,0x1c374,0x1c132,0x1c372,0x18274,0x186f4, // 830
-			0x18272,0x186f2,0x104f4,0x10df4,0x104f2,0x10df2,0x1f8ea,0x11d7c,0x11d3e,0x1f0ca, // 840
-			0x1f1da,0x1e08a,0x1e19a,0x1e3ba,0x1c11a,0x1c33a,0x1c77a,0x1823a,0x1867a,0x18efa, // 850
-			0x1047a,0x10cfa,0x11dfa,0x13d78,0x19ebe,0x13d3c,0x13d1e,0x11cbe,0x13dbe,0x17d70, // 860
-			0x1bebc,0x17d38,0x1be9e,0x17d1c,0x17d0e,0x13cbc,0x17dbc,0x13c9e,0x17d9e,0x17cb8, // 870
-			0x1be5e,0x17c9c,0x17c8e,0x13c5e,0x17cde,0x17c5c,0x17c4e,0x17c2e,0x1c0b4,0x1c0b2, // 880
-			0x18174,0x18172,0x102f4,0x102f2,0x1e0da,0x1c09a,0x1c1ba,0x1813a,0x1837a,0x1027a, // 890
-			0x106fa,0x10ebe,0x11ebc,0x11e9e,0x13eb8,0x19f5e,0x13e9c,0x13e8e,0x11e5e,0x13ede, // 900
-			0x17eb0,0x1bf5c,0x17e98,0x1bf4e,0x17e8c,0x17e86,0x13e5c,0x17edc,0x13e4e,0x17ece, // 910
-			0x17e58,0x1bf2e,0x17e4c,0x17e46,0x13e2e,0x17e6e,0x17e2c,0x17e26,0x10f5e,0x11f5c, // 920
-			0x11f4e,0x13f58,0x19fae,0x13f4c,0x13f46,0x11f2e,0x13f6e,0x13f2c,0x13f26),        // 929
+			0x1f560, 0x1fab8, 0x1ea40, 0x1f530, 0x1fa9c, 0x1ea20, 0x1f518, 0x1fa8e, 0x1ea10, 0x1f50c, //  10
+			0x1ea08, 0x1f506, 0x1ea04, 0x1eb60, 0x1f5b8, 0x1fade, 0x1d640, 0x1eb30, 0x1f59c, 0x1d620, //  20
+			0x1eb18, 0x1f58e, 0x1d610, 0x1eb0c, 0x1d608, 0x1eb06, 0x1d604, 0x1d760, 0x1ebb8, 0x1f5de, //  30
+			0x1ae40, 0x1d730, 0x1eb9c, 0x1ae20, 0x1d718, 0x1eb8e, 0x1ae10, 0x1d70c, 0x1ae08, 0x1d706, //  40
+			0x1ae04, 0x1af60, 0x1d7b8, 0x1ebde, 0x15e40, 0x1af30, 0x1d79c, 0x15e20, 0x1af18, 0x1d78e, //  50
+			0x15e10, 0x1af0c, 0x15e08, 0x1af06, 0x15f60, 0x1afb8, 0x1d7de, 0x15f30, 0x1af9c, 0x15f18, //  60
+			0x1af8e, 0x15f0c, 0x15fb8, 0x1afde, 0x15f9c, 0x15f8e, 0x1e940, 0x1f4b0, 0x1fa5c, 0x1e920, //  70
+			0x1f498, 0x1fa4e, 0x1e910, 0x1f48c, 0x1e908, 0x1f486, 0x1e904, 0x1e902, 0x1d340, 0x1e9b0, //  80
+			0x1f4dc, 0x1d320, 0x1e998, 0x1f4ce, 0x1d310, 0x1e98c, 0x1d308, 0x1e986, 0x1d304, 0x1d302, //  90
+			0x1a740, 0x1d3b0, 0x1e9dc, 0x1a720, 0x1d398, 0x1e9ce, 0x1a710, 0x1d38c, 0x1a708, 0x1d386, // 100
+			0x1a704, 0x1a702, 0x14f40, 0x1a7b0, 0x1d3dc, 0x14f20, 0x1a798, 0x1d3ce, 0x14f10, 0x1a78c, // 110
+			0x14f08, 0x1a786, 0x14f04, 0x14fb0, 0x1a7dc, 0x14f98, 0x1a7ce, 0x14f8c, 0x14f86, 0x14fdc, // 120
+			0x14fce, 0x1e8a0, 0x1f458, 0x1fa2e, 0x1e890, 0x1f44c, 0x1e888, 0x1f446, 0x1e884, 0x1e882, // 130
+			0x1d1a0, 0x1e8d8, 0x1f46e, 0x1d190, 0x1e8cc, 0x1d188, 0x1e8c6, 0x1d184, 0x1d182, 0x1a3a0, // 140
+			0x1d1d8, 0x1e8ee, 0x1a390, 0x1d1cc, 0x1a388, 0x1d1c6, 0x1a384, 0x1a382, 0x147a0, 0x1a3d8, // 150
+			0x1d1ee, 0x14790, 0x1a3cc, 0x14788, 0x1a3c6, 0x14784, 0x14782, 0x147d8, 0x1a3ee, 0x147cc, // 160
+			0x147c6, 0x147ee, 0x1e850, 0x1f42c, 0x1e848, 0x1f426, 0x1e844, 0x1e842, 0x1d0d0, 0x1e86c, // 170
+			0x1d0c8, 0x1e866, 0x1d0c4, 0x1d0c2, 0x1a1d0, 0x1d0ec, 0x1a1c8, 0x1d0e6, 0x1a1c4, 0x1a1c2, // 180
+			0x143d0, 0x1a1ec, 0x143c8, 0x1a1e6, 0x143c4, 0x143c2, 0x143ec, 0x143e6, 0x1e828, 0x1f416, // 190
+			0x1e824, 0x1e822, 0x1d068, 0x1e836, 0x1d064, 0x1d062, 0x1a0e8, 0x1d076, 0x1a0e4, 0x1a0e2, // 200
+			0x141e8, 0x1a0f6, 0x141e4, 0x141e2, 0x1e814, 0x1e812, 0x1d034, 0x1d032, 0x1a074, 0x1a072, // 210
+			0x1e540, 0x1f2b0, 0x1f95c, 0x1e520, 0x1f298, 0x1f94e, 0x1e510, 0x1f28c, 0x1e508, 0x1f286, // 220
+			0x1e504, 0x1e502, 0x1cb40, 0x1e5b0, 0x1f2dc, 0x1cb20, 0x1e598, 0x1f2ce, 0x1cb10, 0x1e58c, // 230
+			0x1cb08, 0x1e586, 0x1cb04, 0x1cb02, 0x19740, 0x1cbb0, 0x1e5dc, 0x19720, 0x1cb98, 0x1e5ce, // 240
+			0x19710, 0x1cb8c, 0x19708, 0x1cb86, 0x19704, 0x19702, 0x12f40, 0x197b0, 0x1cbdc, 0x12f20, // 250
+			0x19798, 0x1cbce, 0x12f10, 0x1978c, 0x12f08, 0x19786, 0x12f04, 0x12fb0, 0x197dc, 0x12f98, // 260
+			0x197ce, 0x12f8c, 0x12f86, 0x12fdc, 0x12fce, 0x1f6a0, 0x1fb58, 0x16bf0, 0x1f690, 0x1fb4c, // 270
+			0x169f8, 0x1f688, 0x1fb46, 0x168fc, 0x1f684, 0x1f682, 0x1e4a0, 0x1f258, 0x1f92e, 0x1eda0, // 280
+			0x1e490, 0x1fb6e, 0x1ed90, 0x1f6cc, 0x1f246, 0x1ed88, 0x1e484, 0x1ed84, 0x1e482, 0x1ed82, // 290
+			0x1c9a0, 0x1e4d8, 0x1f26e, 0x1dba0, 0x1c990, 0x1e4cc, 0x1db90, 0x1edcc, 0x1e4c6, 0x1db88, // 300
+			0x1c984, 0x1db84, 0x1c982, 0x1db82, 0x193a0, 0x1c9d8, 0x1e4ee, 0x1b7a0, 0x19390, 0x1c9cc, // 310
+			0x1b790, 0x1dbcc, 0x1c9c6, 0x1b788, 0x19384, 0x1b784, 0x19382, 0x1b782, 0x127a0, 0x193d8, // 320
+			0x1c9ee, 0x16fa0, 0x12790, 0x193cc, 0x16f90, 0x1b7cc, 0x193c6, 0x16f88, 0x12784, 0x16f84, // 330
+			0x12782, 0x127d8, 0x193ee, 0x16fd8, 0x127cc, 0x16fcc, 0x127c6, 0x16fc6, 0x127ee, 0x1f650, // 340
+			0x1fb2c, 0x165f8, 0x1f648, 0x1fb26, 0x164fc, 0x1f644, 0x1647e, 0x1f642, 0x1e450, 0x1f22c, // 350
+			0x1ecd0, 0x1e448, 0x1f226, 0x1ecc8, 0x1f666, 0x1ecc4, 0x1e442, 0x1ecc2, 0x1c8d0, 0x1e46c, // 360
+			0x1d9d0, 0x1c8c8, 0x1e466, 0x1d9c8, 0x1ece6, 0x1d9c4, 0x1c8c2, 0x1d9c2, 0x191d0, 0x1c8ec, // 370
+			0x1b3d0, 0x191c8, 0x1c8e6, 0x1b3c8, 0x1d9e6, 0x1b3c4, 0x191c2, 0x1b3c2, 0x123d0, 0x191ec, // 380
+			0x167d0, 0x123c8, 0x191e6, 0x167c8, 0x1b3e6, 0x167c4, 0x123c2, 0x167c2, 0x123ec, 0x167ec, // 390
+			0x123e6, 0x167e6, 0x1f628, 0x1fb16, 0x162fc, 0x1f624, 0x1627e, 0x1f622, 0x1e428, 0x1f216, // 400
+			0x1ec68, 0x1f636, 0x1ec64, 0x1e422, 0x1ec62, 0x1c868, 0x1e436, 0x1d8e8, 0x1c864, 0x1d8e4, // 410
+			0x1c862, 0x1d8e2, 0x190e8, 0x1c876, 0x1b1e8, 0x1d8f6, 0x1b1e4, 0x190e2, 0x1b1e2, 0x121e8, // 420
+			0x190f6, 0x163e8, 0x121e4, 0x163e4, 0x121e2, 0x163e2, 0x121f6, 0x163f6, 0x1f614, 0x1617e, // 430
+			0x1f612, 0x1e414, 0x1ec34, 0x1e412, 0x1ec32, 0x1c834, 0x1d874, 0x1c832, 0x1d872, 0x19074, // 440
+			0x1b0f4, 0x19072, 0x1b0f2, 0x120f4, 0x161f4, 0x120f2, 0x161f2, 0x1f60a, 0x1e40a, 0x1ec1a, // 450
+			0x1c81a, 0x1d83a, 0x1903a, 0x1b07a, 0x1e2a0, 0x1f158, 0x1f8ae, 0x1e290, 0x1f14c, 0x1e288, // 460
+			0x1f146, 0x1e284, 0x1e282, 0x1c5a0, 0x1e2d8, 0x1f16e, 0x1c590, 0x1e2cc, 0x1c588, 0x1e2c6, // 470
+			0x1c584, 0x1c582, 0x18ba0, 0x1c5d8, 0x1e2ee, 0x18b90, 0x1c5cc, 0x18b88, 0x1c5c6, 0x18b84, // 480
+			0x18b82, 0x117a0, 0x18bd8, 0x1c5ee, 0x11790, 0x18bcc, 0x11788, 0x18bc6, 0x11784, 0x11782, // 490
+			0x117d8, 0x18bee, 0x117cc, 0x117c6, 0x117ee, 0x1f350, 0x1f9ac, 0x135f8, 0x1f348, 0x1f9a6, // 500
+			0x134fc, 0x1f344, 0x1347e, 0x1f342, 0x1e250, 0x1f12c, 0x1e6d0, 0x1e248, 0x1f126, 0x1e6c8, // 510
+			0x1f366, 0x1e6c4, 0x1e242, 0x1e6c2, 0x1c4d0, 0x1e26c, 0x1cdd0, 0x1c4c8, 0x1e266, 0x1cdc8, // 520
+			0x1e6e6, 0x1cdc4, 0x1c4c2, 0x1cdc2, 0x189d0, 0x1c4ec, 0x19bd0, 0x189c8, 0x1c4e6, 0x19bc8, // 530
+			0x1cde6, 0x19bc4, 0x189c2, 0x19bc2, 0x113d0, 0x189ec, 0x137d0, 0x113c8, 0x189e6, 0x137c8, // 540
+			0x19be6, 0x137c4, 0x113c2, 0x137c2, 0x113ec, 0x137ec, 0x113e6, 0x137e6, 0x1fba8, 0x175f0, // 550
+			0x1bafc, 0x1fba4, 0x174f8, 0x1ba7e, 0x1fba2, 0x1747c, 0x1743e, 0x1f328, 0x1f996, 0x132fc, // 560
+			0x1f768, 0x1fbb6, 0x176fc, 0x1327e, 0x1f764, 0x1f322, 0x1767e, 0x1f762, 0x1e228, 0x1f116, // 570
+			0x1e668, 0x1e224, 0x1eee8, 0x1f776, 0x1e222, 0x1eee4, 0x1e662, 0x1eee2, 0x1c468, 0x1e236, // 580
+			0x1cce8, 0x1c464, 0x1dde8, 0x1cce4, 0x1c462, 0x1dde4, 0x1cce2, 0x1dde2, 0x188e8, 0x1c476, // 590
+			0x199e8, 0x188e4, 0x1bbe8, 0x199e4, 0x188e2, 0x1bbe4, 0x199e2, 0x1bbe2, 0x111e8, 0x188f6, // 600
+			0x133e8, 0x111e4, 0x177e8, 0x133e4, 0x111e2, 0x177e4, 0x133e2, 0x177e2, 0x111f6, 0x133f6, // 610
+			0x1fb94, 0x172f8, 0x1b97e, 0x1fb92, 0x1727c, 0x1723e, 0x1f314, 0x1317e, 0x1f734, 0x1f312, // 620
+			0x1737e, 0x1f732, 0x1e214, 0x1e634, 0x1e212, 0x1ee74, 0x1e632, 0x1ee72, 0x1c434, 0x1cc74, // 630
+			0x1c432, 0x1dcf4, 0x1cc72, 0x1dcf2, 0x18874, 0x198f4, 0x18872, 0x1b9f4, 0x198f2, 0x1b9f2, // 640
+			0x110f4, 0x131f4, 0x110f2, 0x173f4, 0x131f2, 0x173f2, 0x1fb8a, 0x1717c, 0x1713e, 0x1f30a, // 650
+			0x1f71a, 0x1e20a, 0x1e61a, 0x1ee3a, 0x1c41a, 0x1cc3a, 0x1dc7a, 0x1883a, 0x1987a, 0x1b8fa, // 660
+			0x1107a, 0x130fa, 0x171fa, 0x170be, 0x1e150, 0x1f0ac, 0x1e148, 0x1f0a6, 0x1e144, 0x1e142, // 670
+			0x1c2d0, 0x1e16c, 0x1c2c8, 0x1e166, 0x1c2c4, 0x1c2c2, 0x185d0, 0x1c2ec, 0x185c8, 0x1c2e6, // 680
+			0x185c4, 0x185c2, 0x10bd0, 0x185ec, 0x10bc8, 0x185e6, 0x10bc4, 0x10bc2, 0x10bec, 0x10be6, // 690
+			0x1f1a8, 0x1f8d6, 0x11afc, 0x1f1a4, 0x11a7e, 0x1f1a2, 0x1e128, 0x1f096, 0x1e368, 0x1e124, // 700
+			0x1e364, 0x1e122, 0x1e362, 0x1c268, 0x1e136, 0x1c6e8, 0x1c264, 0x1c6e4, 0x1c262, 0x1c6e2, // 710
+			0x184e8, 0x1c276, 0x18de8, 0x184e4, 0x18de4, 0x184e2, 0x18de2, 0x109e8, 0x184f6, 0x11be8, // 720
+			0x109e4, 0x11be4, 0x109e2, 0x11be2, 0x109f6, 0x11bf6, 0x1f9d4, 0x13af8, 0x19d7e, 0x1f9d2, // 730
+			0x13a7c, 0x13a3e, 0x1f194, 0x1197e, 0x1f3b4, 0x1f192, 0x13b7e, 0x1f3b2, 0x1e114, 0x1e334, // 740
+			0x1e112, 0x1e774, 0x1e332, 0x1e772, 0x1c234, 0x1c674, 0x1c232, 0x1cef4, 0x1c672, 0x1cef2, // 750
+			0x18474, 0x18cf4, 0x18472, 0x19df4, 0x18cf2, 0x19df2, 0x108f4, 0x119f4, 0x108f2, 0x13bf4, // 760
+			0x119f2, 0x13bf2, 0x17af0, 0x1bd7c, 0x17a78, 0x1bd3e, 0x17a3c, 0x17a1e, 0x1f9ca, 0x1397c, // 770
+			0x1fbda, 0x17b7c, 0x1393e, 0x17b3e, 0x1f18a, 0x1f39a, 0x1f7ba, 0x1e10a, 0x1e31a, 0x1e73a, // 780
+			0x1ef7a, 0x1c21a, 0x1c63a, 0x1ce7a, 0x1defa, 0x1843a, 0x18c7a, 0x19cfa, 0x1bdfa, 0x1087a, // 790
+			0x118fa, 0x139fa, 0x17978, 0x1bcbe, 0x1793c, 0x1791e, 0x138be, 0x179be, 0x178bc, 0x1789e, // 800
+			0x1785e, 0x1e0a8, 0x1e0a4, 0x1e0a2, 0x1c168, 0x1e0b6, 0x1c164, 0x1c162, 0x182e8, 0x1c176, // 810
+			0x182e4, 0x182e2, 0x105e8, 0x182f6, 0x105e4, 0x105e2, 0x105f6, 0x1f0d4, 0x10d7e, 0x1f0d2, // 820
+			0x1e094, 0x1e1b4, 0x1e092, 0x1e1b2, 0x1c134, 0x1c374, 0x1c132, 0x1c372, 0x18274, 0x186f4, // 830
+			0x18272, 0x186f2, 0x104f4, 0x10df4, 0x104f2, 0x10df2, 0x1f8ea, 0x11d7c, 0x11d3e, 0x1f0ca, // 840
+			0x1f1da, 0x1e08a, 0x1e19a, 0x1e3ba, 0x1c11a, 0x1c33a, 0x1c77a, 0x1823a, 0x1867a, 0x18efa, // 850
+			0x1047a, 0x10cfa, 0x11dfa, 0x13d78, 0x19ebe, 0x13d3c, 0x13d1e, 0x11cbe, 0x13dbe, 0x17d70, // 860
+			0x1bebc, 0x17d38, 0x1be9e, 0x17d1c, 0x17d0e, 0x13cbc, 0x17dbc, 0x13c9e, 0x17d9e, 0x17cb8, // 870
+			0x1be5e, 0x17c9c, 0x17c8e, 0x13c5e, 0x17cde, 0x17c5c, 0x17c4e, 0x17c2e, 0x1c0b4, 0x1c0b2, // 880
+			0x18174, 0x18172, 0x102f4, 0x102f2, 0x1e0da, 0x1c09a, 0x1c1ba, 0x1813a, 0x1837a, 0x1027a, // 890
+			0x106fa, 0x10ebe, 0x11ebc, 0x11e9e, 0x13eb8, 0x19f5e, 0x13e9c, 0x13e8e, 0x11e5e, 0x13ede, // 900
+			0x17eb0, 0x1bf5c, 0x17e98, 0x1bf4e, 0x17e8c, 0x17e86, 0x13e5c, 0x17edc, 0x13e4e, 0x17ece, // 910
+			0x17e58, 0x1bf2e, 0x17e4c, 0x17e46, 0x13e2e, 0x17e6e, 0x17e2c, 0x17e26, 0x10f5e, 0x11f5c, // 920
+			0x11f4e, 0x13f58, 0x19fae, 0x13f4c, 0x13f46, 0x11f2e, 0x13f6e, 0x13f2c, 0x13f26), // 929
 		array( // cluster 6 -----------------------------------------------------------------------
-			0x1abe0,0x1d5f8,0x153c0,0x1a9f0,0x1d4fc,0x151e0,0x1a8f8,0x1d47e,0x150f0,0x1a87c, //  10
-			0x15078,0x1fad0,0x15be0,0x1adf8,0x1fac8,0x159f0,0x1acfc,0x1fac4,0x158f8,0x1ac7e, //  20
-			0x1fac2,0x1587c,0x1f5d0,0x1faec,0x15df8,0x1f5c8,0x1fae6,0x15cfc,0x1f5c4,0x15c7e, //  30
-			0x1f5c2,0x1ebd0,0x1f5ec,0x1ebc8,0x1f5e6,0x1ebc4,0x1ebc2,0x1d7d0,0x1ebec,0x1d7c8, //  40
-			0x1ebe6,0x1d7c4,0x1d7c2,0x1afd0,0x1d7ec,0x1afc8,0x1d7e6,0x1afc4,0x14bc0,0x1a5f0, //  50
-			0x1d2fc,0x149e0,0x1a4f8,0x1d27e,0x148f0,0x1a47c,0x14878,0x1a43e,0x1483c,0x1fa68, //  60
-			0x14df0,0x1a6fc,0x1fa64,0x14cf8,0x1a67e,0x1fa62,0x14c7c,0x14c3e,0x1f4e8,0x1fa76, //  70
-			0x14efc,0x1f4e4,0x14e7e,0x1f4e2,0x1e9e8,0x1f4f6,0x1e9e4,0x1e9e2,0x1d3e8,0x1e9f6, //  80
-			0x1d3e4,0x1d3e2,0x1a7e8,0x1d3f6,0x1a7e4,0x1a7e2,0x145e0,0x1a2f8,0x1d17e,0x144f0, //  90
-			0x1a27c,0x14478,0x1a23e,0x1443c,0x1441e,0x1fa34,0x146f8,0x1a37e,0x1fa32,0x1467c, // 100
-			0x1463e,0x1f474,0x1477e,0x1f472,0x1e8f4,0x1e8f2,0x1d1f4,0x1d1f2,0x1a3f4,0x1a3f2, // 110
-			0x142f0,0x1a17c,0x14278,0x1a13e,0x1423c,0x1421e,0x1fa1a,0x1437c,0x1433e,0x1f43a, // 120
-			0x1e87a,0x1d0fa,0x14178,0x1a0be,0x1413c,0x1411e,0x141be,0x140bc,0x1409e,0x12bc0, // 130
-			0x195f0,0x1cafc,0x129e0,0x194f8,0x1ca7e,0x128f0,0x1947c,0x12878,0x1943e,0x1283c, // 140
-			0x1f968,0x12df0,0x196fc,0x1f964,0x12cf8,0x1967e,0x1f962,0x12c7c,0x12c3e,0x1f2e8, // 150
-			0x1f976,0x12efc,0x1f2e4,0x12e7e,0x1f2e2,0x1e5e8,0x1f2f6,0x1e5e4,0x1e5e2,0x1cbe8, // 160
-			0x1e5f6,0x1cbe4,0x1cbe2,0x197e8,0x1cbf6,0x197e4,0x197e2,0x1b5e0,0x1daf8,0x1ed7e, // 170
-			0x169c0,0x1b4f0,0x1da7c,0x168e0,0x1b478,0x1da3e,0x16870,0x1b43c,0x16838,0x1b41e, // 180
-			0x1681c,0x125e0,0x192f8,0x1c97e,0x16de0,0x124f0,0x1927c,0x16cf0,0x1b67c,0x1923e, // 190
-			0x16c78,0x1243c,0x16c3c,0x1241e,0x16c1e,0x1f934,0x126f8,0x1937e,0x1fb74,0x1f932, // 200
-			0x16ef8,0x1267c,0x1fb72,0x16e7c,0x1263e,0x16e3e,0x1f274,0x1277e,0x1f6f4,0x1f272, // 210
-			0x16f7e,0x1f6f2,0x1e4f4,0x1edf4,0x1e4f2,0x1edf2,0x1c9f4,0x1dbf4,0x1c9f2,0x1dbf2, // 220
-			0x193f4,0x193f2,0x165c0,0x1b2f0,0x1d97c,0x164e0,0x1b278,0x1d93e,0x16470,0x1b23c, // 230
-			0x16438,0x1b21e,0x1641c,0x1640e,0x122f0,0x1917c,0x166f0,0x12278,0x1913e,0x16678, // 240
-			0x1b33e,0x1663c,0x1221e,0x1661e,0x1f91a,0x1237c,0x1fb3a,0x1677c,0x1233e,0x1673e, // 250
-			0x1f23a,0x1f67a,0x1e47a,0x1ecfa,0x1c8fa,0x1d9fa,0x191fa,0x162e0,0x1b178,0x1d8be, // 260
-			0x16270,0x1b13c,0x16238,0x1b11e,0x1621c,0x1620e,0x12178,0x190be,0x16378,0x1213c, // 270
-			0x1633c,0x1211e,0x1631e,0x121be,0x163be,0x16170,0x1b0bc,0x16138,0x1b09e,0x1611c, // 280
-			0x1610e,0x120bc,0x161bc,0x1209e,0x1619e,0x160b8,0x1b05e,0x1609c,0x1608e,0x1205e, // 290
-			0x160de,0x1605c,0x1604e,0x115e0,0x18af8,0x1c57e,0x114f0,0x18a7c,0x11478,0x18a3e, // 300
-			0x1143c,0x1141e,0x1f8b4,0x116f8,0x18b7e,0x1f8b2,0x1167c,0x1163e,0x1f174,0x1177e, // 310
-			0x1f172,0x1e2f4,0x1e2f2,0x1c5f4,0x1c5f2,0x18bf4,0x18bf2,0x135c0,0x19af0,0x1cd7c, // 320
-			0x134e0,0x19a78,0x1cd3e,0x13470,0x19a3c,0x13438,0x19a1e,0x1341c,0x1340e,0x112f0, // 330
-			0x1897c,0x136f0,0x11278,0x1893e,0x13678,0x19b3e,0x1363c,0x1121e,0x1361e,0x1f89a, // 340
-			0x1137c,0x1f9ba,0x1377c,0x1133e,0x1373e,0x1f13a,0x1f37a,0x1e27a,0x1e6fa,0x1c4fa, // 350
-			0x1cdfa,0x189fa,0x1bae0,0x1dd78,0x1eebe,0x174c0,0x1ba70,0x1dd3c,0x17460,0x1ba38, // 360
-			0x1dd1e,0x17430,0x1ba1c,0x17418,0x1ba0e,0x1740c,0x132e0,0x19978,0x1ccbe,0x176e0, // 370
-			0x13270,0x1993c,0x17670,0x1bb3c,0x1991e,0x17638,0x1321c,0x1761c,0x1320e,0x1760e, // 380
-			0x11178,0x188be,0x13378,0x1113c,0x17778,0x1333c,0x1111e,0x1773c,0x1331e,0x1771e, // 390
-			0x111be,0x133be,0x177be,0x172c0,0x1b970,0x1dcbc,0x17260,0x1b938,0x1dc9e,0x17230, // 400
-			0x1b91c,0x17218,0x1b90e,0x1720c,0x17206,0x13170,0x198bc,0x17370,0x13138,0x1989e, // 410
-			0x17338,0x1b99e,0x1731c,0x1310e,0x1730e,0x110bc,0x131bc,0x1109e,0x173bc,0x1319e, // 420
-			0x1739e,0x17160,0x1b8b8,0x1dc5e,0x17130,0x1b89c,0x17118,0x1b88e,0x1710c,0x17106, // 430
-			0x130b8,0x1985e,0x171b8,0x1309c,0x1719c,0x1308e,0x1718e,0x1105e,0x130de,0x171de, // 440
-			0x170b0,0x1b85c,0x17098,0x1b84e,0x1708c,0x17086,0x1305c,0x170dc,0x1304e,0x170ce, // 450
-			0x17058,0x1b82e,0x1704c,0x17046,0x1302e,0x1706e,0x1702c,0x17026,0x10af0,0x1857c, // 460
-			0x10a78,0x1853e,0x10a3c,0x10a1e,0x10b7c,0x10b3e,0x1f0ba,0x1e17a,0x1c2fa,0x185fa, // 470
-			0x11ae0,0x18d78,0x1c6be,0x11a70,0x18d3c,0x11a38,0x18d1e,0x11a1c,0x11a0e,0x10978, // 480
-			0x184be,0x11b78,0x1093c,0x11b3c,0x1091e,0x11b1e,0x109be,0x11bbe,0x13ac0,0x19d70, // 490
-			0x1cebc,0x13a60,0x19d38,0x1ce9e,0x13a30,0x19d1c,0x13a18,0x19d0e,0x13a0c,0x13a06, // 500
-			0x11970,0x18cbc,0x13b70,0x11938,0x18c9e,0x13b38,0x1191c,0x13b1c,0x1190e,0x13b0e, // 510
-			0x108bc,0x119bc,0x1089e,0x13bbc,0x1199e,0x13b9e,0x1bd60,0x1deb8,0x1ef5e,0x17a40, // 520
-			0x1bd30,0x1de9c,0x17a20,0x1bd18,0x1de8e,0x17a10,0x1bd0c,0x17a08,0x1bd06,0x17a04, // 530
-			0x13960,0x19cb8,0x1ce5e,0x17b60,0x13930,0x19c9c,0x17b30,0x1bd9c,0x19c8e,0x17b18, // 540
-			0x1390c,0x17b0c,0x13906,0x17b06,0x118b8,0x18c5e,0x139b8,0x1189c,0x17bb8,0x1399c, // 550
-			0x1188e,0x17b9c,0x1398e,0x17b8e,0x1085e,0x118de,0x139de,0x17bde,0x17940,0x1bcb0, // 560
-			0x1de5c,0x17920,0x1bc98,0x1de4e,0x17910,0x1bc8c,0x17908,0x1bc86,0x17904,0x17902, // 570
-			0x138b0,0x19c5c,0x179b0,0x13898,0x19c4e,0x17998,0x1bcce,0x1798c,0x13886,0x17986, // 580
-			0x1185c,0x138dc,0x1184e,0x179dc,0x138ce,0x179ce,0x178a0,0x1bc58,0x1de2e,0x17890, // 590
-			0x1bc4c,0x17888,0x1bc46,0x17884,0x17882,0x13858,0x19c2e,0x178d8,0x1384c,0x178cc, // 600
-			0x13846,0x178c6,0x1182e,0x1386e,0x178ee,0x17850,0x1bc2c,0x17848,0x1bc26,0x17844, // 610
-			0x17842,0x1382c,0x1786c,0x13826,0x17866,0x17828,0x1bc16,0x17824,0x17822,0x13816, // 620
-			0x17836,0x10578,0x182be,0x1053c,0x1051e,0x105be,0x10d70,0x186bc,0x10d38,0x1869e, // 630
-			0x10d1c,0x10d0e,0x104bc,0x10dbc,0x1049e,0x10d9e,0x11d60,0x18eb8,0x1c75e,0x11d30, // 640
-			0x18e9c,0x11d18,0x18e8e,0x11d0c,0x11d06,0x10cb8,0x1865e,0x11db8,0x10c9c,0x11d9c, // 650
-			0x10c8e,0x11d8e,0x1045e,0x10cde,0x11dde,0x13d40,0x19eb0,0x1cf5c,0x13d20,0x19e98, // 660
-			0x1cf4e,0x13d10,0x19e8c,0x13d08,0x19e86,0x13d04,0x13d02,0x11cb0,0x18e5c,0x13db0, // 670
-			0x11c98,0x18e4e,0x13d98,0x19ece,0x13d8c,0x11c86,0x13d86,0x10c5c,0x11cdc,0x10c4e, // 680
-			0x13ddc,0x11cce,0x13dce,0x1bea0,0x1df58,0x1efae,0x1be90,0x1df4c,0x1be88,0x1df46, // 690
-			0x1be84,0x1be82,0x13ca0,0x19e58,0x1cf2e,0x17da0,0x13c90,0x19e4c,0x17d90,0x1becc, // 700
-			0x19e46,0x17d88,0x13c84,0x17d84,0x13c82,0x17d82,0x11c58,0x18e2e,0x13cd8,0x11c4c, // 710
-			0x17dd8,0x13ccc,0x11c46,0x17dcc,0x13cc6,0x17dc6,0x10c2e,0x11c6e,0x13cee,0x17dee, // 720
-			0x1be50,0x1df2c,0x1be48,0x1df26,0x1be44,0x1be42,0x13c50,0x19e2c,0x17cd0,0x13c48, // 730
-			0x19e26,0x17cc8,0x1be66,0x17cc4,0x13c42,0x17cc2,0x11c2c,0x13c6c,0x11c26,0x17cec, // 740
-			0x13c66,0x17ce6,0x1be28,0x1df16,0x1be24,0x1be22,0x13c28,0x19e16,0x17c68,0x13c24, // 750
-			0x17c64,0x13c22,0x17c62,0x11c16,0x13c36,0x17c76,0x1be14,0x1be12,0x13c14,0x17c34, // 760
-			0x13c12,0x17c32,0x102bc,0x1029e,0x106b8,0x1835e,0x1069c,0x1068e,0x1025e,0x106de, // 770
-			0x10eb0,0x1875c,0x10e98,0x1874e,0x10e8c,0x10e86,0x1065c,0x10edc,0x1064e,0x10ece, // 780
-			0x11ea0,0x18f58,0x1c7ae,0x11e90,0x18f4c,0x11e88,0x18f46,0x11e84,0x11e82,0x10e58, // 790
-			0x1872e,0x11ed8,0x18f6e,0x11ecc,0x10e46,0x11ec6,0x1062e,0x10e6e,0x11eee,0x19f50, // 800
-			0x1cfac,0x19f48,0x1cfa6,0x19f44,0x19f42,0x11e50,0x18f2c,0x13ed0,0x19f6c,0x18f26, // 810
-			0x13ec8,0x11e44,0x13ec4,0x11e42,0x13ec2,0x10e2c,0x11e6c,0x10e26,0x13eec,0x11e66, // 820
-			0x13ee6,0x1dfa8,0x1efd6,0x1dfa4,0x1dfa2,0x19f28,0x1cf96,0x1bf68,0x19f24,0x1bf64, // 830
-			0x19f22,0x1bf62,0x11e28,0x18f16,0x13e68,0x11e24,0x17ee8,0x13e64,0x11e22,0x17ee4, // 840
-			0x13e62,0x17ee2,0x10e16,0x11e36,0x13e76,0x17ef6,0x1df94,0x1df92,0x19f14,0x1bf34, // 850
-			0x19f12,0x1bf32,0x11e14,0x13e34,0x11e12,0x17e74,0x13e32,0x17e72,0x1df8a,0x19f0a, // 860
-			0x1bf1a,0x11e0a,0x13e1a,0x17e3a,0x1035c,0x1034e,0x10758,0x183ae,0x1074c,0x10746, // 870
-			0x1032e,0x1076e,0x10f50,0x187ac,0x10f48,0x187a6,0x10f44,0x10f42,0x1072c,0x10f6c, // 880
-			0x10726,0x10f66,0x18fa8,0x1c7d6,0x18fa4,0x18fa2,0x10f28,0x18796,0x11f68,0x18fb6, // 890
-			0x11f64,0x10f22,0x11f62,0x10716,0x10f36,0x11f76,0x1cfd4,0x1cfd2,0x18f94,0x19fb4, // 900
-			0x18f92,0x19fb2,0x10f14,0x11f34,0x10f12,0x13f74,0x11f32,0x13f72,0x1cfca,0x18f8a, // 910
-			0x19f9a,0x10f0a,0x11f1a,0x13f3a,0x103ac,0x103a6,0x107a8,0x183d6,0x107a4,0x107a2, // 920
-			0x10396,0x107b6,0x187d4,0x187d2,0x10794,0x10fb4,0x10792,0x10fb2,0x1c7ea)         // 929
+			0x1abe0, 0x1d5f8, 0x153c0, 0x1a9f0, 0x1d4fc, 0x151e0, 0x1a8f8, 0x1d47e, 0x150f0, 0x1a87c, //  10
+			0x15078, 0x1fad0, 0x15be0, 0x1adf8, 0x1fac8, 0x159f0, 0x1acfc, 0x1fac4, 0x158f8, 0x1ac7e, //  20
+			0x1fac2, 0x1587c, 0x1f5d0, 0x1faec, 0x15df8, 0x1f5c8, 0x1fae6, 0x15cfc, 0x1f5c4, 0x15c7e, //  30
+			0x1f5c2, 0x1ebd0, 0x1f5ec, 0x1ebc8, 0x1f5e6, 0x1ebc4, 0x1ebc2, 0x1d7d0, 0x1ebec, 0x1d7c8, //  40
+			0x1ebe6, 0x1d7c4, 0x1d7c2, 0x1afd0, 0x1d7ec, 0x1afc8, 0x1d7e6, 0x1afc4, 0x14bc0, 0x1a5f0, //  50
+			0x1d2fc, 0x149e0, 0x1a4f8, 0x1d27e, 0x148f0, 0x1a47c, 0x14878, 0x1a43e, 0x1483c, 0x1fa68, //  60
+			0x14df0, 0x1a6fc, 0x1fa64, 0x14cf8, 0x1a67e, 0x1fa62, 0x14c7c, 0x14c3e, 0x1f4e8, 0x1fa76, //  70
+			0x14efc, 0x1f4e4, 0x14e7e, 0x1f4e2, 0x1e9e8, 0x1f4f6, 0x1e9e4, 0x1e9e2, 0x1d3e8, 0x1e9f6, //  80
+			0x1d3e4, 0x1d3e2, 0x1a7e8, 0x1d3f6, 0x1a7e4, 0x1a7e2, 0x145e0, 0x1a2f8, 0x1d17e, 0x144f0, //  90
+			0x1a27c, 0x14478, 0x1a23e, 0x1443c, 0x1441e, 0x1fa34, 0x146f8, 0x1a37e, 0x1fa32, 0x1467c, // 100
+			0x1463e, 0x1f474, 0x1477e, 0x1f472, 0x1e8f4, 0x1e8f2, 0x1d1f4, 0x1d1f2, 0x1a3f4, 0x1a3f2, // 110
+			0x142f0, 0x1a17c, 0x14278, 0x1a13e, 0x1423c, 0x1421e, 0x1fa1a, 0x1437c, 0x1433e, 0x1f43a, // 120
+			0x1e87a, 0x1d0fa, 0x14178, 0x1a0be, 0x1413c, 0x1411e, 0x141be, 0x140bc, 0x1409e, 0x12bc0, // 130
+			0x195f0, 0x1cafc, 0x129e0, 0x194f8, 0x1ca7e, 0x128f0, 0x1947c, 0x12878, 0x1943e, 0x1283c, // 140
+			0x1f968, 0x12df0, 0x196fc, 0x1f964, 0x12cf8, 0x1967e, 0x1f962, 0x12c7c, 0x12c3e, 0x1f2e8, // 150
+			0x1f976, 0x12efc, 0x1f2e4, 0x12e7e, 0x1f2e2, 0x1e5e8, 0x1f2f6, 0x1e5e4, 0x1e5e2, 0x1cbe8, // 160
+			0x1e5f6, 0x1cbe4, 0x1cbe2, 0x197e8, 0x1cbf6, 0x197e4, 0x197e2, 0x1b5e0, 0x1daf8, 0x1ed7e, // 170
+			0x169c0, 0x1b4f0, 0x1da7c, 0x168e0, 0x1b478, 0x1da3e, 0x16870, 0x1b43c, 0x16838, 0x1b41e, // 180
+			0x1681c, 0x125e0, 0x192f8, 0x1c97e, 0x16de0, 0x124f0, 0x1927c, 0x16cf0, 0x1b67c, 0x1923e, // 190
+			0x16c78, 0x1243c, 0x16c3c, 0x1241e, 0x16c1e, 0x1f934, 0x126f8, 0x1937e, 0x1fb74, 0x1f932, // 200
+			0x16ef8, 0x1267c, 0x1fb72, 0x16e7c, 0x1263e, 0x16e3e, 0x1f274, 0x1277e, 0x1f6f4, 0x1f272, // 210
+			0x16f7e, 0x1f6f2, 0x1e4f4, 0x1edf4, 0x1e4f2, 0x1edf2, 0x1c9f4, 0x1dbf4, 0x1c9f2, 0x1dbf2, // 220
+			0x193f4, 0x193f2, 0x165c0, 0x1b2f0, 0x1d97c, 0x164e0, 0x1b278, 0x1d93e, 0x16470, 0x1b23c, // 230
+			0x16438, 0x1b21e, 0x1641c, 0x1640e, 0x122f0, 0x1917c, 0x166f0, 0x12278, 0x1913e, 0x16678, // 240
+			0x1b33e, 0x1663c, 0x1221e, 0x1661e, 0x1f91a, 0x1237c, 0x1fb3a, 0x1677c, 0x1233e, 0x1673e, // 250
+			0x1f23a, 0x1f67a, 0x1e47a, 0x1ecfa, 0x1c8fa, 0x1d9fa, 0x191fa, 0x162e0, 0x1b178, 0x1d8be, // 260
+			0x16270, 0x1b13c, 0x16238, 0x1b11e, 0x1621c, 0x1620e, 0x12178, 0x190be, 0x16378, 0x1213c, // 270
+			0x1633c, 0x1211e, 0x1631e, 0x121be, 0x163be, 0x16170, 0x1b0bc, 0x16138, 0x1b09e, 0x1611c, // 280
+			0x1610e, 0x120bc, 0x161bc, 0x1209e, 0x1619e, 0x160b8, 0x1b05e, 0x1609c, 0x1608e, 0x1205e, // 290
+			0x160de, 0x1605c, 0x1604e, 0x115e0, 0x18af8, 0x1c57e, 0x114f0, 0x18a7c, 0x11478, 0x18a3e, // 300
+			0x1143c, 0x1141e, 0x1f8b4, 0x116f8, 0x18b7e, 0x1f8b2, 0x1167c, 0x1163e, 0x1f174, 0x1177e, // 310
+			0x1f172, 0x1e2f4, 0x1e2f2, 0x1c5f4, 0x1c5f2, 0x18bf4, 0x18bf2, 0x135c0, 0x19af0, 0x1cd7c, // 320
+			0x134e0, 0x19a78, 0x1cd3e, 0x13470, 0x19a3c, 0x13438, 0x19a1e, 0x1341c, 0x1340e, 0x112f0, // 330
+			0x1897c, 0x136f0, 0x11278, 0x1893e, 0x13678, 0x19b3e, 0x1363c, 0x1121e, 0x1361e, 0x1f89a, // 340
+			0x1137c, 0x1f9ba, 0x1377c, 0x1133e, 0x1373e, 0x1f13a, 0x1f37a, 0x1e27a, 0x1e6fa, 0x1c4fa, // 350
+			0x1cdfa, 0x189fa, 0x1bae0, 0x1dd78, 0x1eebe, 0x174c0, 0x1ba70, 0x1dd3c, 0x17460, 0x1ba38, // 360
+			0x1dd1e, 0x17430, 0x1ba1c, 0x17418, 0x1ba0e, 0x1740c, 0x132e0, 0x19978, 0x1ccbe, 0x176e0, // 370
+			0x13270, 0x1993c, 0x17670, 0x1bb3c, 0x1991e, 0x17638, 0x1321c, 0x1761c, 0x1320e, 0x1760e, // 380
+			0x11178, 0x188be, 0x13378, 0x1113c, 0x17778, 0x1333c, 0x1111e, 0x1773c, 0x1331e, 0x1771e, // 390
+			0x111be, 0x133be, 0x177be, 0x172c0, 0x1b970, 0x1dcbc, 0x17260, 0x1b938, 0x1dc9e, 0x17230, // 400
+			0x1b91c, 0x17218, 0x1b90e, 0x1720c, 0x17206, 0x13170, 0x198bc, 0x17370, 0x13138, 0x1989e, // 410
+			0x17338, 0x1b99e, 0x1731c, 0x1310e, 0x1730e, 0x110bc, 0x131bc, 0x1109e, 0x173bc, 0x1319e, // 420
+			0x1739e, 0x17160, 0x1b8b8, 0x1dc5e, 0x17130, 0x1b89c, 0x17118, 0x1b88e, 0x1710c, 0x17106, // 430
+			0x130b8, 0x1985e, 0x171b8, 0x1309c, 0x1719c, 0x1308e, 0x1718e, 0x1105e, 0x130de, 0x171de, // 440
+			0x170b0, 0x1b85c, 0x17098, 0x1b84e, 0x1708c, 0x17086, 0x1305c, 0x170dc, 0x1304e, 0x170ce, // 450
+			0x17058, 0x1b82e, 0x1704c, 0x17046, 0x1302e, 0x1706e, 0x1702c, 0x17026, 0x10af0, 0x1857c, // 460
+			0x10a78, 0x1853e, 0x10a3c, 0x10a1e, 0x10b7c, 0x10b3e, 0x1f0ba, 0x1e17a, 0x1c2fa, 0x185fa, // 470
+			0x11ae0, 0x18d78, 0x1c6be, 0x11a70, 0x18d3c, 0x11a38, 0x18d1e, 0x11a1c, 0x11a0e, 0x10978, // 480
+			0x184be, 0x11b78, 0x1093c, 0x11b3c, 0x1091e, 0x11b1e, 0x109be, 0x11bbe, 0x13ac0, 0x19d70, // 490
+			0x1cebc, 0x13a60, 0x19d38, 0x1ce9e, 0x13a30, 0x19d1c, 0x13a18, 0x19d0e, 0x13a0c, 0x13a06, // 500
+			0x11970, 0x18cbc, 0x13b70, 0x11938, 0x18c9e, 0x13b38, 0x1191c, 0x13b1c, 0x1190e, 0x13b0e, // 510
+			0x108bc, 0x119bc, 0x1089e, 0x13bbc, 0x1199e, 0x13b9e, 0x1bd60, 0x1deb8, 0x1ef5e, 0x17a40, // 520
+			0x1bd30, 0x1de9c, 0x17a20, 0x1bd18, 0x1de8e, 0x17a10, 0x1bd0c, 0x17a08, 0x1bd06, 0x17a04, // 530
+			0x13960, 0x19cb8, 0x1ce5e, 0x17b60, 0x13930, 0x19c9c, 0x17b30, 0x1bd9c, 0x19c8e, 0x17b18, // 540
+			0x1390c, 0x17b0c, 0x13906, 0x17b06, 0x118b8, 0x18c5e, 0x139b8, 0x1189c, 0x17bb8, 0x1399c, // 550
+			0x1188e, 0x17b9c, 0x1398e, 0x17b8e, 0x1085e, 0x118de, 0x139de, 0x17bde, 0x17940, 0x1bcb0, // 560
+			0x1de5c, 0x17920, 0x1bc98, 0x1de4e, 0x17910, 0x1bc8c, 0x17908, 0x1bc86, 0x17904, 0x17902, // 570
+			0x138b0, 0x19c5c, 0x179b0, 0x13898, 0x19c4e, 0x17998, 0x1bcce, 0x1798c, 0x13886, 0x17986, // 580
+			0x1185c, 0x138dc, 0x1184e, 0x179dc, 0x138ce, 0x179ce, 0x178a0, 0x1bc58, 0x1de2e, 0x17890, // 590
+			0x1bc4c, 0x17888, 0x1bc46, 0x17884, 0x17882, 0x13858, 0x19c2e, 0x178d8, 0x1384c, 0x178cc, // 600
+			0x13846, 0x178c6, 0x1182e, 0x1386e, 0x178ee, 0x17850, 0x1bc2c, 0x17848, 0x1bc26, 0x17844, // 610
+			0x17842, 0x1382c, 0x1786c, 0x13826, 0x17866, 0x17828, 0x1bc16, 0x17824, 0x17822, 0x13816, // 620
+			0x17836, 0x10578, 0x182be, 0x1053c, 0x1051e, 0x105be, 0x10d70, 0x186bc, 0x10d38, 0x1869e, // 630
+			0x10d1c, 0x10d0e, 0x104bc, 0x10dbc, 0x1049e, 0x10d9e, 0x11d60, 0x18eb8, 0x1c75e, 0x11d30, // 640
+			0x18e9c, 0x11d18, 0x18e8e, 0x11d0c, 0x11d06, 0x10cb8, 0x1865e, 0x11db8, 0x10c9c, 0x11d9c, // 650
+			0x10c8e, 0x11d8e, 0x1045e, 0x10cde, 0x11dde, 0x13d40, 0x19eb0, 0x1cf5c, 0x13d20, 0x19e98, // 660
+			0x1cf4e, 0x13d10, 0x19e8c, 0x13d08, 0x19e86, 0x13d04, 0x13d02, 0x11cb0, 0x18e5c, 0x13db0, // 670
+			0x11c98, 0x18e4e, 0x13d98, 0x19ece, 0x13d8c, 0x11c86, 0x13d86, 0x10c5c, 0x11cdc, 0x10c4e, // 680
+			0x13ddc, 0x11cce, 0x13dce, 0x1bea0, 0x1df58, 0x1efae, 0x1be90, 0x1df4c, 0x1be88, 0x1df46, // 690
+			0x1be84, 0x1be82, 0x13ca0, 0x19e58, 0x1cf2e, 0x17da0, 0x13c90, 0x19e4c, 0x17d90, 0x1becc, // 700
+			0x19e46, 0x17d88, 0x13c84, 0x17d84, 0x13c82, 0x17d82, 0x11c58, 0x18e2e, 0x13cd8, 0x11c4c, // 710
+			0x17dd8, 0x13ccc, 0x11c46, 0x17dcc, 0x13cc6, 0x17dc6, 0x10c2e, 0x11c6e, 0x13cee, 0x17dee, // 720
+			0x1be50, 0x1df2c, 0x1be48, 0x1df26, 0x1be44, 0x1be42, 0x13c50, 0x19e2c, 0x17cd0, 0x13c48, // 730
+			0x19e26, 0x17cc8, 0x1be66, 0x17cc4, 0x13c42, 0x17cc2, 0x11c2c, 0x13c6c, 0x11c26, 0x17cec, // 740
+			0x13c66, 0x17ce6, 0x1be28, 0x1df16, 0x1be24, 0x1be22, 0x13c28, 0x19e16, 0x17c68, 0x13c24, // 750
+			0x17c64, 0x13c22, 0x17c62, 0x11c16, 0x13c36, 0x17c76, 0x1be14, 0x1be12, 0x13c14, 0x17c34, // 760
+			0x13c12, 0x17c32, 0x102bc, 0x1029e, 0x106b8, 0x1835e, 0x1069c, 0x1068e, 0x1025e, 0x106de, // 770
+			0x10eb0, 0x1875c, 0x10e98, 0x1874e, 0x10e8c, 0x10e86, 0x1065c, 0x10edc, 0x1064e, 0x10ece, // 780
+			0x11ea0, 0x18f58, 0x1c7ae, 0x11e90, 0x18f4c, 0x11e88, 0x18f46, 0x11e84, 0x11e82, 0x10e58, // 790
+			0x1872e, 0x11ed8, 0x18f6e, 0x11ecc, 0x10e46, 0x11ec6, 0x1062e, 0x10e6e, 0x11eee, 0x19f50, // 800
+			0x1cfac, 0x19f48, 0x1cfa6, 0x19f44, 0x19f42, 0x11e50, 0x18f2c, 0x13ed0, 0x19f6c, 0x18f26, // 810
+			0x13ec8, 0x11e44, 0x13ec4, 0x11e42, 0x13ec2, 0x10e2c, 0x11e6c, 0x10e26, 0x13eec, 0x11e66, // 820
+			0x13ee6, 0x1dfa8, 0x1efd6, 0x1dfa4, 0x1dfa2, 0x19f28, 0x1cf96, 0x1bf68, 0x19f24, 0x1bf64, // 830
+			0x19f22, 0x1bf62, 0x11e28, 0x18f16, 0x13e68, 0x11e24, 0x17ee8, 0x13e64, 0x11e22, 0x17ee4, // 840
+			0x13e62, 0x17ee2, 0x10e16, 0x11e36, 0x13e76, 0x17ef6, 0x1df94, 0x1df92, 0x19f14, 0x1bf34, // 850
+			0x19f12, 0x1bf32, 0x11e14, 0x13e34, 0x11e12, 0x17e74, 0x13e32, 0x17e72, 0x1df8a, 0x19f0a, // 860
+			0x1bf1a, 0x11e0a, 0x13e1a, 0x17e3a, 0x1035c, 0x1034e, 0x10758, 0x183ae, 0x1074c, 0x10746, // 870
+			0x1032e, 0x1076e, 0x10f50, 0x187ac, 0x10f48, 0x187a6, 0x10f44, 0x10f42, 0x1072c, 0x10f6c, // 880
+			0x10726, 0x10f66, 0x18fa8, 0x1c7d6, 0x18fa4, 0x18fa2, 0x10f28, 0x18796, 0x11f68, 0x18fb6, // 890
+			0x11f64, 0x10f22, 0x11f62, 0x10716, 0x10f36, 0x11f76, 0x1cfd4, 0x1cfd2, 0x18f94, 0x19fb4, // 900
+			0x18f92, 0x19fb2, 0x10f14, 0x11f34, 0x10f12, 0x13f74, 0x11f32, 0x13f72, 0x1cfca, 0x18f8a, // 910
+			0x19f9a, 0x10f0a, 0x11f1a, 0x13f3a, 0x103ac, 0x103a6, 0x107a8, 0x183d6, 0x107a4, 0x107a2, // 920
+			0x10396, 0x107b6, 0x187d4, 0x187d2, 0x10794, 0x10fb4, 0x10792, 0x10fb2, 0x1c7ea)         // 929
 	); // end of $clusters array
 
 	/**
@@ -444,80 +444,80 @@ 
 	 */
 	protected $rsfactors = array(
 		array( // ECL 0 (2 factors) -------------------------------------------------------------------------------
-			0x01b,0x395),                                                                                    //   2
+			0x01b, 0x395), //   2
 		array( // ECL 1 (4 factors) -------------------------------------------------------------------------------
-			0x20a,0x238,0x2d3,0x329),                                                                        //   4
+			0x20a, 0x238, 0x2d3, 0x329), //   4
 		array( // ECL 2 (8 factors) -------------------------------------------------------------------------------
-			0x0ed,0x134,0x1b4,0x11c,0x286,0x28d,0x1ac,0x17b),                                                //   8
+			0x0ed, 0x134, 0x1b4, 0x11c, 0x286, 0x28d, 0x1ac, 0x17b), //   8
 		array( // ECL 3 (16 factors) ------------------------------------------------------------------------------
-			0x112,0x232,0x0e8,0x2f3,0x257,0x20c,0x321,0x084,0x127,0x074,0x1ba,0x1ac,0x127,0x02a,0x0b0,0x041),//  16
+			0x112, 0x232, 0x0e8, 0x2f3, 0x257, 0x20c, 0x321, 0x084, 0x127, 0x074, 0x1ba, 0x1ac, 0x127, 0x02a, 0x0b0, 0x041), //  16
 		array( // ECL 4 (32 factors) ------------------------------------------------------------------------------
-			0x169,0x23f,0x39a,0x20d,0x0b0,0x24a,0x280,0x141,0x218,0x2e6,0x2a5,0x2e6,0x2af,0x11c,0x0c1,0x205, //  16
-			0x111,0x1ee,0x107,0x093,0x251,0x320,0x23b,0x140,0x323,0x085,0x0e7,0x186,0x2ad,0x14a,0x03f,0x19a),//  32
+			0x169, 0x23f, 0x39a, 0x20d, 0x0b0, 0x24a, 0x280, 0x141, 0x218, 0x2e6, 0x2a5, 0x2e6, 0x2af, 0x11c, 0x0c1, 0x205, //  16
+			0x111, 0x1ee, 0x107, 0x093, 0x251, 0x320, 0x23b, 0x140, 0x323, 0x085, 0x0e7, 0x186, 0x2ad, 0x14a, 0x03f, 0x19a), //  32
 		array( // ECL 5 (64 factors) ------------------------------------------------------------------------------
-			0x21b,0x1a6,0x006,0x05d,0x35e,0x303,0x1c5,0x06a,0x262,0x11f,0x06b,0x1f9,0x2dd,0x36d,0x17d,0x264, //  16
-			0x2d3,0x1dc,0x1ce,0x0ac,0x1ae,0x261,0x35a,0x336,0x21f,0x178,0x1ff,0x190,0x2a0,0x2fa,0x11b,0x0b8, //  32
-			0x1b8,0x023,0x207,0x01f,0x1cc,0x252,0x0e1,0x217,0x205,0x160,0x25d,0x09e,0x28b,0x0c9,0x1e8,0x1f6, //  48
-			0x288,0x2dd,0x2cd,0x053,0x194,0x061,0x118,0x303,0x348,0x275,0x004,0x17d,0x34b,0x26f,0x108,0x21f),//  64
+			0x21b, 0x1a6, 0x006, 0x05d, 0x35e, 0x303, 0x1c5, 0x06a, 0x262, 0x11f, 0x06b, 0x1f9, 0x2dd, 0x36d, 0x17d, 0x264, //  16
+			0x2d3, 0x1dc, 0x1ce, 0x0ac, 0x1ae, 0x261, 0x35a, 0x336, 0x21f, 0x178, 0x1ff, 0x190, 0x2a0, 0x2fa, 0x11b, 0x0b8, //  32
+			0x1b8, 0x023, 0x207, 0x01f, 0x1cc, 0x252, 0x0e1, 0x217, 0x205, 0x160, 0x25d, 0x09e, 0x28b, 0x0c9, 0x1e8, 0x1f6, //  48
+			0x288, 0x2dd, 0x2cd, 0x053, 0x194, 0x061, 0x118, 0x303, 0x348, 0x275, 0x004, 0x17d, 0x34b, 0x26f, 0x108, 0x21f), //  64
 		array( // ECL 6 (128 factors) -----------------------------------------------------------------------------
-			0x209,0x136,0x360,0x223,0x35a,0x244,0x128,0x17b,0x035,0x30b,0x381,0x1bc,0x190,0x39d,0x2ed,0x19f, //  16
-			0x336,0x05d,0x0d9,0x0d0,0x3a0,0x0f4,0x247,0x26c,0x0f6,0x094,0x1bf,0x277,0x124,0x38c,0x1ea,0x2c0, //  32
-			0x204,0x102,0x1c9,0x38b,0x252,0x2d3,0x2a2,0x124,0x110,0x060,0x2ac,0x1b0,0x2ae,0x25e,0x35c,0x239, //  48
-			0x0c1,0x0db,0x081,0x0ba,0x0ec,0x11f,0x0c0,0x307,0x116,0x0ad,0x028,0x17b,0x2c8,0x1cf,0x286,0x308, //  64
-			0x0ab,0x1eb,0x129,0x2fb,0x09c,0x2dc,0x05f,0x10e,0x1bf,0x05a,0x1fb,0x030,0x0e4,0x335,0x328,0x382, //  80
-			0x310,0x297,0x273,0x17a,0x17e,0x106,0x17c,0x25a,0x2f2,0x150,0x059,0x266,0x057,0x1b0,0x29e,0x268, //  96
-			0x09d,0x176,0x0f2,0x2d6,0x258,0x10d,0x177,0x382,0x34d,0x1c6,0x162,0x082,0x32e,0x24b,0x324,0x022, // 112
-			0x0d3,0x14a,0x21b,0x129,0x33b,0x361,0x025,0x205,0x342,0x13b,0x226,0x056,0x321,0x004,0x06c,0x21b),// 128
+			0x209, 0x136, 0x360, 0x223, 0x35a, 0x244, 0x128, 0x17b, 0x035, 0x30b, 0x381, 0x1bc, 0x190, 0x39d, 0x2ed, 0x19f, //  16
+			0x336, 0x05d, 0x0d9, 0x0d0, 0x3a0, 0x0f4, 0x247, 0x26c, 0x0f6, 0x094, 0x1bf, 0x277, 0x124, 0x38c, 0x1ea, 0x2c0, //  32
+			0x204, 0x102, 0x1c9, 0x38b, 0x252, 0x2d3, 0x2a2, 0x124, 0x110, 0x060, 0x2ac, 0x1b0, 0x2ae, 0x25e, 0x35c, 0x239, //  48
+			0x0c1, 0x0db, 0x081, 0x0ba, 0x0ec, 0x11f, 0x0c0, 0x307, 0x116, 0x0ad, 0x028, 0x17b, 0x2c8, 0x1cf, 0x286, 0x308, //  64
+			0x0ab, 0x1eb, 0x129, 0x2fb, 0x09c, 0x2dc, 0x05f, 0x10e, 0x1bf, 0x05a, 0x1fb, 0x030, 0x0e4, 0x335, 0x328, 0x382, //  80
+			0x310, 0x297, 0x273, 0x17a, 0x17e, 0x106, 0x17c, 0x25a, 0x2f2, 0x150, 0x059, 0x266, 0x057, 0x1b0, 0x29e, 0x268, //  96
+			0x09d, 0x176, 0x0f2, 0x2d6, 0x258, 0x10d, 0x177, 0x382, 0x34d, 0x1c6, 0x162, 0x082, 0x32e, 0x24b, 0x324, 0x022, // 112
+			0x0d3, 0x14a, 0x21b, 0x129, 0x33b, 0x361, 0x025, 0x205, 0x342, 0x13b, 0x226, 0x056, 0x321, 0x004, 0x06c, 0x21b), // 128
 		array( // ECL 7 (256 factors) -----------------------------------------------------------------------------
-			0x20c,0x37e,0x04b,0x2fe,0x372,0x359,0x04a,0x0cc,0x052,0x24a,0x2c4,0x0fa,0x389,0x312,0x08a,0x2d0, //  16
-			0x35a,0x0c2,0x137,0x391,0x113,0x0be,0x177,0x352,0x1b6,0x2dd,0x0c2,0x118,0x0c9,0x118,0x33c,0x2f5, //  32
-			0x2c6,0x32e,0x397,0x059,0x044,0x239,0x00b,0x0cc,0x31c,0x25d,0x21c,0x391,0x321,0x2bc,0x31f,0x089, //  48
-			0x1b7,0x1a2,0x250,0x29c,0x161,0x35b,0x172,0x2b6,0x145,0x0f0,0x0d8,0x101,0x11c,0x225,0x0d1,0x374, //  64
-			0x13b,0x046,0x149,0x319,0x1ea,0x112,0x36d,0x0a2,0x2ed,0x32c,0x2ac,0x1cd,0x14e,0x178,0x351,0x209, //  80
-			0x133,0x123,0x323,0x2c8,0x013,0x166,0x18f,0x38c,0x067,0x1ff,0x033,0x008,0x205,0x0e1,0x121,0x1d6, //  96
-			0x27d,0x2db,0x042,0x0ff,0x395,0x10d,0x1cf,0x33e,0x2da,0x1b1,0x350,0x249,0x088,0x21a,0x38a,0x05a, // 112
-			0x002,0x122,0x2e7,0x0c7,0x28f,0x387,0x149,0x031,0x322,0x244,0x163,0x24c,0x0bc,0x1ce,0x00a,0x086, // 128
-			0x274,0x140,0x1df,0x082,0x2e3,0x047,0x107,0x13e,0x176,0x259,0x0c0,0x25d,0x08e,0x2a1,0x2af,0x0ea, // 144
-			0x2d2,0x180,0x0b1,0x2f0,0x25f,0x280,0x1c7,0x0c1,0x2b1,0x2c3,0x325,0x281,0x030,0x03c,0x2dc,0x26d, // 160
-			0x37f,0x220,0x105,0x354,0x28f,0x135,0x2b9,0x2f3,0x2f4,0x03c,0x0e7,0x305,0x1b2,0x1a5,0x2d6,0x210, // 176
-			0x1f7,0x076,0x031,0x31b,0x020,0x090,0x1f4,0x0ee,0x344,0x18a,0x118,0x236,0x13f,0x009,0x287,0x226, // 192
-			0x049,0x392,0x156,0x07e,0x020,0x2a9,0x14b,0x318,0x26c,0x03c,0x261,0x1b9,0x0b4,0x317,0x37d,0x2f2, // 208
-			0x25d,0x17f,0x0e4,0x2ed,0x2f8,0x0d5,0x036,0x129,0x086,0x036,0x342,0x12b,0x39a,0x0bf,0x38e,0x214, // 224
-			0x261,0x33d,0x0bd,0x014,0x0a7,0x01d,0x368,0x1c1,0x053,0x192,0x029,0x290,0x1f9,0x243,0x1e1,0x0ad, // 240
-			0x194,0x0fb,0x2b0,0x05f,0x1f1,0x22b,0x282,0x21f,0x133,0x09f,0x39c,0x22e,0x288,0x037,0x1f1,0x00a),// 256
+			0x20c, 0x37e, 0x04b, 0x2fe, 0x372, 0x359, 0x04a, 0x0cc, 0x052, 0x24a, 0x2c4, 0x0fa, 0x389, 0x312, 0x08a, 0x2d0, //  16
+			0x35a, 0x0c2, 0x137, 0x391, 0x113, 0x0be, 0x177, 0x352, 0x1b6, 0x2dd, 0x0c2, 0x118, 0x0c9, 0x118, 0x33c, 0x2f5, //  32
+			0x2c6, 0x32e, 0x397, 0x059, 0x044, 0x239, 0x00b, 0x0cc, 0x31c, 0x25d, 0x21c, 0x391, 0x321, 0x2bc, 0x31f, 0x089, //  48
+			0x1b7, 0x1a2, 0x250, 0x29c, 0x161, 0x35b, 0x172, 0x2b6, 0x145, 0x0f0, 0x0d8, 0x101, 0x11c, 0x225, 0x0d1, 0x374, //  64
+			0x13b, 0x046, 0x149, 0x319, 0x1ea, 0x112, 0x36d, 0x0a2, 0x2ed, 0x32c, 0x2ac, 0x1cd, 0x14e, 0x178, 0x351, 0x209, //  80
+			0x133, 0x123, 0x323, 0x2c8, 0x013, 0x166, 0x18f, 0x38c, 0x067, 0x1ff, 0x033, 0x008, 0x205, 0x0e1, 0x121, 0x1d6, //  96
+			0x27d, 0x2db, 0x042, 0x0ff, 0x395, 0x10d, 0x1cf, 0x33e, 0x2da, 0x1b1, 0x350, 0x249, 0x088, 0x21a, 0x38a, 0x05a, // 112
+			0x002, 0x122, 0x2e7, 0x0c7, 0x28f, 0x387, 0x149, 0x031, 0x322, 0x244, 0x163, 0x24c, 0x0bc, 0x1ce, 0x00a, 0x086, // 128
+			0x274, 0x140, 0x1df, 0x082, 0x2e3, 0x047, 0x107, 0x13e, 0x176, 0x259, 0x0c0, 0x25d, 0x08e, 0x2a1, 0x2af, 0x0ea, // 144
+			0x2d2, 0x180, 0x0b1, 0x2f0, 0x25f, 0x280, 0x1c7, 0x0c1, 0x2b1, 0x2c3, 0x325, 0x281, 0x030, 0x03c, 0x2dc, 0x26d, // 160
+			0x37f, 0x220, 0x105, 0x354, 0x28f, 0x135, 0x2b9, 0x2f3, 0x2f4, 0x03c, 0x0e7, 0x305, 0x1b2, 0x1a5, 0x2d6, 0x210, // 176
+			0x1f7, 0x076, 0x031, 0x31b, 0x020, 0x090, 0x1f4, 0x0ee, 0x344, 0x18a, 0x118, 0x236, 0x13f, 0x009, 0x287, 0x226, // 192
+			0x049, 0x392, 0x156, 0x07e, 0x020, 0x2a9, 0x14b, 0x318, 0x26c, 0x03c, 0x261, 0x1b9, 0x0b4, 0x317, 0x37d, 0x2f2, // 208
+			0x25d, 0x17f, 0x0e4, 0x2ed, 0x2f8, 0x0d5, 0x036, 0x129, 0x086, 0x036, 0x342, 0x12b, 0x39a, 0x0bf, 0x38e, 0x214, // 224
+			0x261, 0x33d, 0x0bd, 0x014, 0x0a7, 0x01d, 0x368, 0x1c1, 0x053, 0x192, 0x029, 0x290, 0x1f9, 0x243, 0x1e1, 0x0ad, // 240
+			0x194, 0x0fb, 0x2b0, 0x05f, 0x1f1, 0x22b, 0x282, 0x21f, 0x133, 0x09f, 0x39c, 0x22e, 0x288, 0x037, 0x1f1, 0x00a), // 256
 		array( // ECL 8 (512 factors) -----------------------------------------------------------------------------
-			0x160,0x04d,0x175,0x1f8,0x023,0x257,0x1ac,0x0cf,0x199,0x23e,0x076,0x1f2,0x11d,0x17c,0x15e,0x1ec, //  16
-			0x0c5,0x109,0x398,0x09b,0x392,0x12b,0x0e5,0x283,0x126,0x367,0x132,0x058,0x057,0x0c1,0x160,0x30d, //  32
-			0x34e,0x04b,0x147,0x208,0x1b3,0x21f,0x0cb,0x29a,0x0f9,0x15a,0x30d,0x26d,0x280,0x10c,0x31a,0x216, //  48
-			0x21b,0x30d,0x198,0x186,0x284,0x066,0x1dc,0x1f3,0x122,0x278,0x221,0x025,0x35a,0x394,0x228,0x029, //  64
-			0x21e,0x121,0x07a,0x110,0x17f,0x320,0x1e5,0x062,0x2f0,0x1d8,0x2f9,0x06b,0x310,0x35c,0x292,0x2e5, //  80
-			0x122,0x0cc,0x2a9,0x197,0x357,0x055,0x063,0x03e,0x1e2,0x0b4,0x014,0x129,0x1c3,0x251,0x391,0x08e, //  96
-			0x328,0x2ac,0x11f,0x218,0x231,0x04c,0x28d,0x383,0x2d9,0x237,0x2e8,0x186,0x201,0x0c0,0x204,0x102, // 112
-			0x0f0,0x206,0x31a,0x18b,0x300,0x350,0x033,0x262,0x180,0x0a8,0x0be,0x33a,0x148,0x254,0x312,0x12f, // 128
-			0x23a,0x17d,0x19f,0x281,0x09c,0x0ed,0x097,0x1ad,0x213,0x0cf,0x2a4,0x2c6,0x059,0x0a8,0x130,0x192, // 144
-			0x028,0x2c4,0x23f,0x0a2,0x360,0x0e5,0x041,0x35d,0x349,0x200,0x0a4,0x1dd,0x0dd,0x05c,0x166,0x311, // 160
-			0x120,0x165,0x352,0x344,0x33b,0x2e0,0x2c3,0x05e,0x008,0x1ee,0x072,0x209,0x002,0x1f3,0x353,0x21f, // 176
-			0x098,0x2d9,0x303,0x05f,0x0f8,0x169,0x242,0x143,0x358,0x31d,0x121,0x033,0x2ac,0x1d2,0x215,0x334, // 192
-			0x29d,0x02d,0x386,0x1c4,0x0a7,0x156,0x0f4,0x0ad,0x023,0x1cf,0x28b,0x033,0x2bb,0x24f,0x1c4,0x242, // 208
-			0x025,0x07c,0x12a,0x14c,0x228,0x02b,0x1ab,0x077,0x296,0x309,0x1db,0x352,0x2fc,0x16c,0x242,0x38f, // 224
-			0x11b,0x2c7,0x1d8,0x1a4,0x0f5,0x120,0x252,0x18a,0x1ff,0x147,0x24d,0x309,0x2bb,0x2b0,0x02b,0x198, // 240
-			0x34a,0x17f,0x2d1,0x209,0x230,0x284,0x2ca,0x22f,0x03e,0x091,0x369,0x297,0x2c9,0x09f,0x2a0,0x2d9, // 256
-			0x270,0x03b,0x0c1,0x1a1,0x09e,0x0d1,0x233,0x234,0x157,0x2b5,0x06d,0x260,0x233,0x16d,0x0b5,0x304, // 272
-			0x2a5,0x136,0x0f8,0x161,0x2c4,0x19a,0x243,0x366,0x269,0x349,0x278,0x35c,0x121,0x218,0x023,0x309, // 288
-			0x26a,0x24a,0x1a8,0x341,0x04d,0x255,0x15a,0x10d,0x2f5,0x278,0x2b7,0x2ef,0x14b,0x0f7,0x0b8,0x02d, // 304
-			0x313,0x2a8,0x012,0x042,0x197,0x171,0x036,0x1ec,0x0e4,0x265,0x33e,0x39a,0x1b5,0x207,0x284,0x389, // 320
-			0x315,0x1a4,0x131,0x1b9,0x0cf,0x12c,0x37c,0x33b,0x08d,0x219,0x17d,0x296,0x201,0x038,0x0fc,0x155, // 336
-			0x0f2,0x31d,0x346,0x345,0x2d0,0x0e0,0x133,0x277,0x03d,0x057,0x230,0x136,0x2f4,0x299,0x18d,0x328, // 352
-			0x353,0x135,0x1d9,0x31b,0x17a,0x01f,0x287,0x393,0x1cb,0x326,0x24e,0x2db,0x1a9,0x0d8,0x224,0x0f9, // 368
-			0x141,0x371,0x2bb,0x217,0x2a1,0x30e,0x0d2,0x32f,0x389,0x12f,0x34b,0x39a,0x119,0x049,0x1d5,0x317, // 384
-			0x294,0x0a2,0x1f2,0x134,0x09b,0x1a6,0x38b,0x331,0x0bb,0x03e,0x010,0x1a9,0x217,0x150,0x11e,0x1b5, // 400
-			0x177,0x111,0x262,0x128,0x0b7,0x39b,0x074,0x29b,0x2ef,0x161,0x03e,0x16e,0x2b3,0x17b,0x2af,0x34a, // 416
-			0x025,0x165,0x2d0,0x2e6,0x14a,0x005,0x027,0x39b,0x137,0x1a8,0x0f2,0x2ed,0x141,0x036,0x29d,0x13c, // 432
-			0x156,0x12b,0x216,0x069,0x29b,0x1e8,0x280,0x2a0,0x240,0x21c,0x13c,0x1e6,0x2d1,0x262,0x02e,0x290, // 448
-			0x1bf,0x0ab,0x268,0x1d0,0x0be,0x213,0x129,0x141,0x2fa,0x2f0,0x215,0x0af,0x086,0x00e,0x17d,0x1b1, // 464
-			0x2cd,0x02d,0x06f,0x014,0x254,0x11c,0x2e0,0x08a,0x286,0x19b,0x36d,0x29d,0x08d,0x397,0x02d,0x30c, // 480
-			0x197,0x0a4,0x14c,0x383,0x0a5,0x2d6,0x258,0x145,0x1f2,0x28f,0x165,0x2f0,0x300,0x0df,0x351,0x287, // 496
-			0x03f,0x136,0x35f,0x0fb,0x16e,0x130,0x11a,0x2e2,0x2a3,0x19a,0x185,0x0f4,0x01f,0x079,0x12f,0x107) // 512
+			0x160, 0x04d, 0x175, 0x1f8, 0x023, 0x257, 0x1ac, 0x0cf, 0x199, 0x23e, 0x076, 0x1f2, 0x11d, 0x17c, 0x15e, 0x1ec, //  16
+			0x0c5, 0x109, 0x398, 0x09b, 0x392, 0x12b, 0x0e5, 0x283, 0x126, 0x367, 0x132, 0x058, 0x057, 0x0c1, 0x160, 0x30d, //  32
+			0x34e, 0x04b, 0x147, 0x208, 0x1b3, 0x21f, 0x0cb, 0x29a, 0x0f9, 0x15a, 0x30d, 0x26d, 0x280, 0x10c, 0x31a, 0x216, //  48
+			0x21b, 0x30d, 0x198, 0x186, 0x284, 0x066, 0x1dc, 0x1f3, 0x122, 0x278, 0x221, 0x025, 0x35a, 0x394, 0x228, 0x029, //  64
+			0x21e, 0x121, 0x07a, 0x110, 0x17f, 0x320, 0x1e5, 0x062, 0x2f0, 0x1d8, 0x2f9, 0x06b, 0x310, 0x35c, 0x292, 0x2e5, //  80
+			0x122, 0x0cc, 0x2a9, 0x197, 0x357, 0x055, 0x063, 0x03e, 0x1e2, 0x0b4, 0x014, 0x129, 0x1c3, 0x251, 0x391, 0x08e, //  96
+			0x328, 0x2ac, 0x11f, 0x218, 0x231, 0x04c, 0x28d, 0x383, 0x2d9, 0x237, 0x2e8, 0x186, 0x201, 0x0c0, 0x204, 0x102, // 112
+			0x0f0, 0x206, 0x31a, 0x18b, 0x300, 0x350, 0x033, 0x262, 0x180, 0x0a8, 0x0be, 0x33a, 0x148, 0x254, 0x312, 0x12f, // 128
+			0x23a, 0x17d, 0x19f, 0x281, 0x09c, 0x0ed, 0x097, 0x1ad, 0x213, 0x0cf, 0x2a4, 0x2c6, 0x059, 0x0a8, 0x130, 0x192, // 144
+			0x028, 0x2c4, 0x23f, 0x0a2, 0x360, 0x0e5, 0x041, 0x35d, 0x349, 0x200, 0x0a4, 0x1dd, 0x0dd, 0x05c, 0x166, 0x311, // 160
+			0x120, 0x165, 0x352, 0x344, 0x33b, 0x2e0, 0x2c3, 0x05e, 0x008, 0x1ee, 0x072, 0x209, 0x002, 0x1f3, 0x353, 0x21f, // 176
+			0x098, 0x2d9, 0x303, 0x05f, 0x0f8, 0x169, 0x242, 0x143, 0x358, 0x31d, 0x121, 0x033, 0x2ac, 0x1d2, 0x215, 0x334, // 192
+			0x29d, 0x02d, 0x386, 0x1c4, 0x0a7, 0x156, 0x0f4, 0x0ad, 0x023, 0x1cf, 0x28b, 0x033, 0x2bb, 0x24f, 0x1c4, 0x242, // 208
+			0x025, 0x07c, 0x12a, 0x14c, 0x228, 0x02b, 0x1ab, 0x077, 0x296, 0x309, 0x1db, 0x352, 0x2fc, 0x16c, 0x242, 0x38f, // 224
+			0x11b, 0x2c7, 0x1d8, 0x1a4, 0x0f5, 0x120, 0x252, 0x18a, 0x1ff, 0x147, 0x24d, 0x309, 0x2bb, 0x2b0, 0x02b, 0x198, // 240
+			0x34a, 0x17f, 0x2d1, 0x209, 0x230, 0x284, 0x2ca, 0x22f, 0x03e, 0x091, 0x369, 0x297, 0x2c9, 0x09f, 0x2a0, 0x2d9, // 256
+			0x270, 0x03b, 0x0c1, 0x1a1, 0x09e, 0x0d1, 0x233, 0x234, 0x157, 0x2b5, 0x06d, 0x260, 0x233, 0x16d, 0x0b5, 0x304, // 272
+			0x2a5, 0x136, 0x0f8, 0x161, 0x2c4, 0x19a, 0x243, 0x366, 0x269, 0x349, 0x278, 0x35c, 0x121, 0x218, 0x023, 0x309, // 288
+			0x26a, 0x24a, 0x1a8, 0x341, 0x04d, 0x255, 0x15a, 0x10d, 0x2f5, 0x278, 0x2b7, 0x2ef, 0x14b, 0x0f7, 0x0b8, 0x02d, // 304
+			0x313, 0x2a8, 0x012, 0x042, 0x197, 0x171, 0x036, 0x1ec, 0x0e4, 0x265, 0x33e, 0x39a, 0x1b5, 0x207, 0x284, 0x389, // 320
+			0x315, 0x1a4, 0x131, 0x1b9, 0x0cf, 0x12c, 0x37c, 0x33b, 0x08d, 0x219, 0x17d, 0x296, 0x201, 0x038, 0x0fc, 0x155, // 336
+			0x0f2, 0x31d, 0x346, 0x345, 0x2d0, 0x0e0, 0x133, 0x277, 0x03d, 0x057, 0x230, 0x136, 0x2f4, 0x299, 0x18d, 0x328, // 352
+			0x353, 0x135, 0x1d9, 0x31b, 0x17a, 0x01f, 0x287, 0x393, 0x1cb, 0x326, 0x24e, 0x2db, 0x1a9, 0x0d8, 0x224, 0x0f9, // 368
+			0x141, 0x371, 0x2bb, 0x217, 0x2a1, 0x30e, 0x0d2, 0x32f, 0x389, 0x12f, 0x34b, 0x39a, 0x119, 0x049, 0x1d5, 0x317, // 384
+			0x294, 0x0a2, 0x1f2, 0x134, 0x09b, 0x1a6, 0x38b, 0x331, 0x0bb, 0x03e, 0x010, 0x1a9, 0x217, 0x150, 0x11e, 0x1b5, // 400
+			0x177, 0x111, 0x262, 0x128, 0x0b7, 0x39b, 0x074, 0x29b, 0x2ef, 0x161, 0x03e, 0x16e, 0x2b3, 0x17b, 0x2af, 0x34a, // 416
+			0x025, 0x165, 0x2d0, 0x2e6, 0x14a, 0x005, 0x027, 0x39b, 0x137, 0x1a8, 0x0f2, 0x2ed, 0x141, 0x036, 0x29d, 0x13c, // 432
+			0x156, 0x12b, 0x216, 0x069, 0x29b, 0x1e8, 0x280, 0x2a0, 0x240, 0x21c, 0x13c, 0x1e6, 0x2d1, 0x262, 0x02e, 0x290, // 448
+			0x1bf, 0x0ab, 0x268, 0x1d0, 0x0be, 0x213, 0x129, 0x141, 0x2fa, 0x2f0, 0x215, 0x0af, 0x086, 0x00e, 0x17d, 0x1b1, // 464
+			0x2cd, 0x02d, 0x06f, 0x014, 0x254, 0x11c, 0x2e0, 0x08a, 0x286, 0x19b, 0x36d, 0x29d, 0x08d, 0x397, 0x02d, 0x30c, // 480
+			0x197, 0x0a4, 0x14c, 0x383, 0x0a5, 0x2d6, 0x258, 0x145, 0x1f2, 0x28f, 0x165, 0x2f0, 0x300, 0x0df, 0x351, 0x287, // 496
+			0x03f, 0x136, 0x35f, 0x0fb, 0x16e, 0x130, 0x11a, 0x2e2, 0x2a3, 0x19a, 0x185, 0x0f4, 0x01f, 0x079, 0x12f, 0x107) // 512
 	);
 
 	/**
@@ -529,7 +529,7 @@ 
 	 * @param array $macro information for macro block
 	 * @public
 	 */
-	public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
+	public function __construct($code, $ecl = -1, $aspectratio = 2, $macro = array()) {
 		$barcode_array = array();
 		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
 			return false;
@@ -537,7 +537,7 @@ 
 		// get the input sequence array
 		$sequence = $this->getInputSequences($code);
 		$codewords = array(); // array of code-words
-		foreach($sequence as $seq) {
+		foreach ($sequence as $seq) {
 			$cw = $this->getCompaction($seq[0], $seq[1], true);
 			$codewords = array_merge($codewords, $cw);
 		}
@@ -563,8 +563,8 @@ 
 			$cw = $this->getCompaction(900, $macro['file_id'], false);
 			$macrocw = array_merge($macrocw, $cw);
 			// optional fields
-			$optmodes = array(900,902,902,900,900,902,902);
-			$optsize = array(-1,2,4,-1,-1,-1,2);
+			$optmodes = array(900, 902, 902, 900, 900, 902, 902);
+			$optsize = array(-1, 2, 4, -1, -1, -1, 2);
 			foreach ($optmodes as $k => $omode) {
 				if (isset($macro['option_'.$k])) {
 					$macrocw[] = 923;
@@ -787,7 +787,7 @@ 
 		// initialize array of error correction codewords
 		$ecw = array_fill(0, $eclsize, 0);
 		// for each data codeword
-		foreach($cw as $k => $d) {
+		foreach ($cw as $k => $d) {
 			$t1 = ($d + $ecw[$eclmaxid]) % 929;
 			for ($j = $eclmaxid; $j > 0; --$j) {
 				$t2 = ($t1 * $ecc[$j]) % 929;
@@ -798,7 +798,7 @@ 
 			$t3 = 929 - $t2;
 			$ecw[0] = $t3 % 929;
 		}
-		foreach($ecw as $j => $e) {
+		foreach ($ecw as $j => $e) {
 			if ($e != 0) {
 				$ecw[$j] = 929 - $e;
 			}
@@ -820,7 +820,7 @@ 
 		preg_match_all('/([0-9]{13,44})/', $code, $numseq, PREG_OFFSET_CAPTURE);
 		$numseq[1][] = array('', strlen($code));
 		$offset = 0;
-		foreach($numseq[1] as $seq) {
+		foreach ($numseq[1] as $seq) {
 			$seqlen = strlen($seq[0]);
 			if ($seq[1] > 0) {
 				// extract text sequence before the number sequence
@@ -830,7 +830,7 @@ 
 				preg_match_all('/([\x09\x0a\x0d\x20-\x7e]{5,})/', $prevseq, $textseq, PREG_OFFSET_CAPTURE);
 				$textseq[1][] = array('', strlen($prevseq));
 				$txtoffset = 0;
-				foreach($textseq[1] as $txtseq) {
+				foreach ($textseq[1] as $txtseq) {
 					$txtseqlen = strlen($txtseq[0]);
 					if ($txtseq[1] > 0) {
 						// extract byte sequence before the text sequence
@@ -870,9 +870,9 @@ 
 	 * @return array of codewords
 	 * @protected
 	 */
-	protected function getCompaction($mode, $code, $addmode=true) {
+	protected function getCompaction($mode, $code, $addmode = true) {
 		$cw = array(); // array of codewords to return
-		switch($mode) {
+		switch ($mode) {
 			case 900: { // Text Compaction mode latch
 				$submode = 0; // default Alpha sub-mode
 				$txtarr = array(); // array of characters and sub-mode switching characters
@@ -899,7 +899,7 @@ 
 									}
 								} else {
 									// latch
-									$txtarr	= array_merge($txtarr, $this->textlatch[''.$submode.$s]);
+									$txtarr = array_merge($txtarr, $this->textlatch[''.$submode.$s]);
 									// set new submode
 									$submode = $s;
 								}

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -531,7 +531,7 @@ 
 	 */
 	public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
 		$barcode_array = array();
-		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
+		if ((is_null($code)) or ($code == '\0') or ($code == '')) {
 			return false;
 		}
 		// get the input sequence array
@@ -601,7 +601,7 @@ 
 		$rows = ceil($nce / $cols);
 		$size = ($cols * $rows);
 		// adjust rows
-		if (($rows < 3) OR ($rows > 90)) {
+		if (($rows < 3) or ($rows > 90)) {
 			if ($rows < 3) {
 				$rows = 3;
 			} elseif ($rows > 90) {
@@ -742,7 +742,7 @@ 
 	protected function getErrorCorrectionLevel($ecl, $numcw) {
 		$maxecl = 8; // starting error level
 		// check for automatic levels
-		if (($ecl < 0) OR ($ecl > 8)) {
+		if (($ecl < 0) or ($ecl > 8)) {
 			if ($numcw < 41) {
 				$ecl = 2;
 			} elseif ($numcw < 161) {
@@ -837,7 +837,7 @@ 
 						$prevtxtseq = substr($prevseq, $txtoffset, ($txtseq[1] - $txtoffset));
 						if (strlen($prevtxtseq) > 0) {
 							// add BYTE sequence
-							if ((strlen($prevtxtseq) == 1) AND ((count($sequence_array) > 0) AND ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
+							if ((strlen($prevtxtseq) == 1) and ((count($sequence_array) > 0) and ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
 								$sequence_array[] = array(913, $prevtxtseq);
 							} elseif ((strlen($prevtxtseq) % 6) == 0) {
 								$sequence_array[] = array(924, $prevtxtseq);
@@ -886,9 +886,9 @@ 
 						// the sub-mode is changed
 						for ($s = 0; $s < 4; ++$s) {
 							// search new sub-mode
-							if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) {
+							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

htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php

Spacing +78 added lines, -78 removed lines

@@ -69,7 +69,7 @@ 
 	 * @since 5.9.123 (2010-09-30)
 	 * @public static
 	 */
-	public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1, $addcbbox=false, $link=false) {
+	public static function addTTFfont($fontfile, $fonttype = '', $enc = '', $flags = 32, $outpath = '', $platid = 3, $encid = 1, $addcbbox = false, $link = false) {
 		if (!TCPDF_STATIC::file_exists($fontfile)) {
 			// Could not find file
 			return false;
@@ -191,7 +191,7 @@ 
 			fclose($fp);
 			// get font info
 			$fmetric['Flags'] = $flags;
-			preg_match ('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
+			preg_match('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
 			$fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]);
 			preg_match('#/FontBBox[\s]*{([^}]*)#', $font, $matches);
 			$fmetric['bbox'] = trim($matches[1]);
@@ -720,7 +720,7 @@ 
 										// convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
 										//LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
 										//SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
-										$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
+										$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) - 56613888;
 									}
 									$ctg[$c] = 0;
 									++$startGlyphID;
@@ -791,7 +791,7 @@ 
 			// ceate widths array
 			$cw = array();
 			$offset = $table['hmtx']['offset'];
-			for ($i = 0 ; $i < $numberOfHMetrics; ++$i) {
+			for ($i = 0; $i < $numberOfHMetrics; ++$i) {
 				$cw[$i] = round(TCPDF_STATIC::_getUFWORD($font, $offset) * $urk);
 				$offset += 4; // skip lsb
 			}
@@ -1194,7 +1194,7 @@ 
 								// convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
 								//LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
 								//SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
-								$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
+								$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) - 56613888;
 							}
 							if (isset($subsetchars[$c])) {
 								$subsetglyphs[$startGlyphID] = true;
@@ -1313,7 +1313,7 @@ 
 		}
 		// array of table names to preserve (loca and glyf tables will be added later)
 		// the cmap table is not needed and shall not be present, since the mapping from character codes to glyph descriptions is provided separately
-		$table_names = array ('head', 'hhea', 'hmtx', 'maxp', 'cvt ', 'fpgm', 'prep'); // minimum required table names
+		$table_names = array('head', 'hhea', 'hmtx', 'maxp', 'cvt ', 'fpgm', 'prep'); // minimum required table names
 		// get the tables to preserve
 		$offset = 12;
 		foreach ($table as $tag => $val) {
@@ -1326,7 +1326,7 @@ 
 				$table[$tag]['offset'] = $offset;
 				$offset += $table[$tag]['length'];
 				$numPad = ($offset + 3 & ~3) - $offset;
-				if($numPad > 0) {
+				if ($numPad > 0) {
 					$table[$tag]['data'] .= str_repeat("\x0", $numPad);
 					$offset += $numPad;
 				}
@@ -1343,7 +1343,7 @@ 
 		$table['loca']['offset'] = $offset;
 		$offset += $table['loca']['length'];
 		$numPad = ($offset + 3 & ~3) - $offset;
-		if($numPad > 0) {
+		if ($numPad > 0) {
 			$table['loca']['data'] .= str_repeat("\x0", $numPad);
 			$offset += $numPad;
 		}
@@ -1355,7 +1355,7 @@ 
 		$table['glyf']['offset'] = $offset;
 		$offset += $table['glyf']['length'];
 		$numPad = ($offset + 3 & ~3) - $offset;
-		if($numPad > 0) {
+		if ($numPad > 0) {
 			$table['glyf']['data'] .= str_repeat("\x0", $numPad);
 			$offset += $numPad;
 		}
@@ -1396,7 +1396,7 @@ 
 	 * @since 4.4.000 (2008-12-07)
 	 * @public static
 	 */
-	public static function _putfontwidths($font, $cidoffset=0) {
+	public static function _putfontwidths($font, $cidoffset = 0) {
 		ksort($font['cw']);
 		$rangeid = 0;
 		$range = array();
@@ -1542,7 +1542,7 @@ 
 	 * @since 6.0.025
 	 * @public static
 	 */
-	public static function getFontFullPath($file, $fontdir=false) {
+	public static function getFontFullPath($file, $fontdir = false) {
 		$fontfile = '';
 		// search files on various directories
 		if (($fontdir !== false) AND @TCPDF_STATIC::file_exists($fontdir.$file)) {
@@ -1565,7 +1565,7 @@ 
 	 * @return float value in points
 	 * @public static
 	 */
-	public static function getFontRefSize($size, $refsize=12) {
+	public static function getFontRefSize($size, $refsize = 12) {
 		switch ($size) {
 			case 'xx-small': {
 				$size = ($refsize - 4);
@@ -1665,7 +1665,7 @@ 
 	 * @since 2.3.000 (2008-03-05)
 	 * @public static
 	 */
-	public static function unichr($c, $unicode=true) {
+	public static function unichr($c, $unicode = true) {
 		$c = intval($c);
 		if (!$unicode) {
 			return chr($c);
@@ -1744,7 +1744,7 @@ 
 	 * @since 2.1.000 (2008-01-08)
 	 * @public static
 	 */
-	public static function arrUTF8ToUTF16BE($unicode, $setbom=false) {
+	public static function arrUTF8ToUTF16BE($unicode, $setbom = false) {
 		$outstr = ''; // string to be returned
 		if ($setbom) {
 			$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
@@ -1778,7 +1778,7 @@ 
 	 * @since 4.5.037 (2009-04-07)
 	 * @public static
 	 */
-	public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
+	public static function UTF8ArrayToUniArray($ta, $isunicode = true) {
 		if ($isunicode) {
 			return array_map(get_called_class().'::unichrUnicode', $ta);
 		}
@@ -1794,7 +1794,7 @@ 
 	 * @return string Return part of a string
 	 * @public static
 	 */
-	public static function UTF8ArrSubString($strarr, $start='', $end='', $unicode=true) {
+	public static function UTF8ArrSubString($strarr, $start = '', $end = '', $unicode = true) {
 		if (strlen($start) == 0) {
 			$start = 0;
 		}
@@ -1817,7 +1817,7 @@ 
 	 * @since 4.5.037 (2009-04-07)
 	 * @public static
 	 */
-	public static function UniArrSubString($uniarr, $start='', $end='') {
+	public static function UniArrSubString($uniarr, $start = '', $end = '') {
 		if (strlen($start) == 0) {
 			$start = 0;
 		}
@@ -1825,7 +1825,7 @@ 
 			$end = count($uniarr);
 		}
 		$string = '';
-		for ($i=$start; $i < $end; ++$i) {
+		for ($i = $start; $i < $end; ++$i) {
 			$string .= $uniarr[$i];
 		}
 		return $string;
@@ -2001,7 +2001,7 @@ 
 		$str = is_null($str) ? '' : $str;
 		if ($isunicode) {
 			// requires PCRE unicode support turned on
-			$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
+			$chars = TCPDF_STATIC::pregSplit('//', 'u', $str, -1, PREG_SPLIT_NO_EMPTY);
 			$carr = array_map(get_called_class().'::uniord', $chars);
 		} else {
 			$chars = str_split($str);
@@ -2123,7 +2123,7 @@ 
 		} else {
 			// P2. In each paragraph, find the first character of type L, AL, or R.
 			// P3. If a character is found in P2 and it is of type AL or R, then set the paragraph embedding level to one; otherwise, set it to zero.
-			for ($i=0; $i < $numchars; ++$i) {
+			for ($i = 0; $i < $numchars; ++$i) {
 				$type = TCPDF_FONT_DATA::$uni_type[$ta[$i]];
 				if ($type == 'L') {
 					$pel = 0;
@@ -2149,7 +2149,7 @@ 
 
 		// X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
 		// In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if ($ta[$i] == TCPDF_FONT_DATA::$uni_RLE) {
 				// X2. With each RLE, compute the least greater odd embedding level.
 				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
@@ -2167,7 +2167,7 @@ 
 				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to neutral.
 				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
 				$next_level = $cel + 2 - ($cel % 2);
-				if ( $next_level < 62 ) {
+				if ($next_level < 62) {
 					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_LRE, 'cel' => $cel, 'dos' => $dos);
 					$cel = $next_level;
 					$dos = 'N';
@@ -2191,7 +2191,7 @@ 
 				//	a. If this new level would be valid, then this embedding code is valid. Remember (push) the current embedding level and override status. Reset the current level to this new level, and reset the override status to left-to-right.
 				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
 				$next_level = $cel + 2 - ($cel % 2);
-				if ( $next_level < 62 ) {
+				if ($next_level < 62) {
 					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_LRO, 'cel' => $cel, 'dos' => $dos);
 					$cel = $next_level;
 					$dos = 'L';
@@ -2201,7 +2201,7 @@ 
 			} elseif ($ta[$i] == TCPDF_FONT_DATA::$uni_PDF) {
 				// X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override.
 				if (count($remember)) {
-					$last = count($remember ) - 1;
+					$last = count($remember) - 1;
 					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) OR
 						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) OR
 						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) OR
@@ -2247,12 +2247,12 @@ 
 		// W1. Examine each nonspacing mark (NSM) in the level run, and change the type of the NSM to the type of the previous character. If the NSM is at the start of the level run, it will get the type of sor.
 		$prevlevel = -1; // track level changes
 		$levcount = 0; // counts consecutive chars at the same level
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if ($chardata[$i]['type'] == 'NSM') {
 				if ($levcount) {
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
 				} elseif ($i > 0) {
-					$chardata[$i]['type'] = $chardata[($i-1)]['type'];
+					$chardata[$i]['type'] = $chardata[($i - 1)]['type'];
 				}
 			}
 			if ($chardata[$i]['level'] != $prevlevel) {
@@ -2266,9 +2266,9 @@ 
 		// W2. Search backward from each instance of a European number until the first strong type (R, L, AL, or sor) is found. If an AL is found, change the type of the European number to Arabic number.
 		$prevlevel = -1;
 		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if ($chardata[$i]['char'] == 'EN') {
-				for ($j=$levcount; $j >= 0; $j--) {
+				for ($j = $levcount; $j >= 0; $j--) {
 					if ($chardata[$j]['type'] == 'AL') {
 						$chardata[$i]['type'] = 'AN';
 					} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
@@ -2285,7 +2285,7 @@ 
 		}
 
 		// W3. Change all ALs to R.
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if ($chardata[$i]['type'] == 'AL') {
 				$chardata[$i]['type'] = 'R';
 			}
@@ -2294,13 +2294,13 @@ 
 		// W4. A single European separator between two European numbers changes to a European number. A single common separator between two numbers of the same type changes to that type.
 		$prevlevel = -1;
 		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
+		for ($i = 0; $i < $numchars; ++$i) {
+			if (($levcount > 0) AND (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] == $prevlevel)) {
+				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i - 1)]['type'] == 'EN') AND ($chardata[($i + 1)]['type'] == 'EN')) {
 					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
+				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i - 1)]['type'] == 'EN') AND ($chardata[($i + 1)]['type'] == 'EN')) {
 					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
+				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i - 1)]['type'] == 'AN') AND ($chardata[($i + 1)]['type'] == 'AN')) {
 					$chardata[$i]['type'] = 'AN';
 				}
 			}
@@ -2315,12 +2315,12 @@ 
 		// W5. A sequence of European terminators adjacent to European numbers changes to all European numbers.
 		$prevlevel = -1;
 		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if ($chardata[$i]['type'] == 'ET') {
-				if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
+				if (($levcount > 0) AND ($chardata[($i - 1)]['type'] == 'EN')) {
 					$chardata[$i]['type'] = 'EN';
 				} else {
-					$j = $i+1;
+					$j = $i + 1;
 					while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
 						if ($chardata[$j]['type'] == 'EN') {
 							$chardata[$i]['type'] = 'EN';
@@ -2343,7 +2343,7 @@ 
 		// W6. Otherwise, separators and terminators change to Other Neutral.
 		$prevlevel = -1;
 		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
 				$chardata[$i]['type'] = 'ON';
 			}
@@ -2358,9 +2358,9 @@ 
 		//W7. Search backward from each instance of a European number until the first strong type (R, L, or sor) is found. If an L is found, then change the type of the European number to L.
 		$prevlevel = -1;
 		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if ($chardata[$i]['char'] == 'EN') {
-				for ($j=$levcount; $j >= 0; $j--) {
+				for ($j = $levcount; $j >= 0; $j--) {
 					if ($chardata[$j]['type'] == 'L') {
 						$chardata[$i]['type'] = 'L';
 					} elseif ($chardata[$j]['type'] == 'R') {
@@ -2379,36 +2379,36 @@ 
 		// N1. A sequence of neutrals takes the direction of the surrounding strong text if the text on both sides has the same direction. European and Arabic numbers act as if they were R in terms of their influence on neutrals. Start-of-level-run (sor) and end-of-level-run (eor) are used at level run boundaries.
 		$prevlevel = -1;
 		$levcount = 0;
-		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
+		for ($i = 0; $i < $numchars; ++$i) {
+			if (($levcount > 0) AND (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] == $prevlevel)) {
+				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i - 1)]['type'] == 'L') AND ($chardata[($i + 1)]['type'] == 'L')) {
 					$chardata[$i]['type'] = 'L';
 				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
+				 (($chardata[($i - 1)]['type'] == 'R') OR ($chardata[($i - 1)]['type'] == 'EN') OR ($chardata[($i - 1)]['type'] == 'AN')) AND
+				 (($chardata[($i + 1)]['type'] == 'R') OR ($chardata[($i + 1)]['type'] == 'EN') OR ($chardata[($i + 1)]['type'] == 'AN'))) {
 					$chardata[$i]['type'] = 'R';
 				} elseif ($chardata[$i]['type'] == 'N') {
 					// N2. Any remaining neutrals take the embedding direction
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
 				}
-			} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
+			} elseif (($levcount == 0) AND (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] == $prevlevel)) {
 				// first char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
+				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i + 1)]['type'] == 'L')) {
 					$chardata[$i]['type'] = 'L';
 				} elseif (($chardata[$i]['type'] == 'N') AND
 				 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
+				 (($chardata[($i + 1)]['type'] == 'R') OR ($chardata[($i + 1)]['type'] == 'EN') OR ($chardata[($i + 1)]['type'] == 'AN'))) {
 					$chardata[$i]['type'] = 'R';
 				} elseif ($chardata[$i]['type'] == 'N') {
 					// N2. Any remaining neutrals take the embedding direction
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
 				}
-			} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
+			} elseif (($levcount > 0) AND ((($i + 1) == $numchars) OR (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] != $prevlevel))) {
 				//last char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
+				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i - 1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
 					$chardata[$i]['type'] = 'L';
 				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
+				 (($chardata[($i - 1)]['type'] == 'R') OR ($chardata[($i - 1)]['type'] == 'EN') OR ($chardata[($i - 1)]['type'] == 'AN')) AND
 				 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
 					$chardata[$i]['type'] = 'R';
 				} elseif ($chardata[$i]['type'] == 'N') {
@@ -2429,7 +2429,7 @@ 
 
 		// I1. For all characters with an even (left-to-right) embedding direction, those of type R go up one level and those of type AN or EN go up two levels.
 		// I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level.
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			$odd = $chardata[$i]['level'] % 2;
 			if ($odd) {
 				if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
@@ -2442,7 +2442,7 @@ 
 					$chardata[$i]['level'] += 2;
 				}
 			}
-			$maxlevel = max($chardata[$i]['level'],$maxlevel);
+			$maxlevel = max($chardata[$i]['level'], $maxlevel);
 		}
 
 		// L1. On each line, reset the embedding level of the following characters to the paragraph embedding level:
@@ -2450,14 +2450,14 @@ 
 		//	2. Paragraph separators,
 		//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
 		//	4. Any sequence of white space characters at the end of the line.
-		for ($i=0; $i < $numchars; ++$i) {
+		for ($i = 0; $i < $numchars; ++$i) {
 			if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
 				$chardata[$i]['level'] = $pel;
 			} elseif ($chardata[$i]['type'] == 'WS') {
-				$j = $i+1;
+				$j = $i + 1;
 				while ($j < $numchars) {
 					if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
-						(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
+						(($j == ($numchars - 1)) AND ($chardata[$j]['type'] == 'WS'))) {
 						$chardata[$i]['level'] = $pel;
 						break;
 					} elseif ($chardata[$j]['type'] != 'WS') {
@@ -2471,13 +2471,13 @@ 
 		// Arabic Shaping
 		// Cursively connected scripts, such as Arabic or Syriac, require the selection of positional character shapes that depend on adjacent characters. Shaping is logically applied after the Bidirectional Algorithm is used and is limited to characters within the same directional run.
 		if ($arabic) {
-			$endedletter = array(1569,1570,1571,1572,1573,1575,1577,1583,1584,1585,1586,1608,1688);
-			$alfletter = array(1570,1571,1573,1575);
+			$endedletter = array(1569, 1570, 1571, 1572, 1573, 1575, 1577, 1583, 1584, 1585, 1586, 1608, 1688);
+			$alfletter = array(1570, 1571, 1573, 1575);
 			$chardata2 = $chardata;
 			$laaletter = false;
 			$charAL = array();
 			$x = 0;
-			for ($i=0; $i < $numchars; ++$i) {
+			for ($i = 0; $i < $numchars; ++$i) {
 				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
 					$charAL[$x] = $chardata[$i];
 					$charAL[$x]['i'] = $i;
@@ -2486,27 +2486,27 @@ 
 				}
 			}
 			$numAL = $x;
-			for ($i=0; $i < $numchars; ++$i) {
+			for ($i = 0; $i < $numchars; ++$i) {
 				$thischar = $chardata[$i];
 				if ($i > 0) {
-					$prevchar = $chardata[($i-1)];
+					$prevchar = $chardata[($i - 1)];
 				} else {
 					$prevchar = false;
 				}
-				if (($i+1) < $numchars) {
-					$nextchar = $chardata[($i+1)];
+				if (($i + 1) < $numchars) {
+					$nextchar = $chardata[($i + 1)];
 				} else {
 					$nextchar = false;
 				}
 				if (TCPDF_FONT_DATA::$uni_type[$thischar['char']] == 'AL') {
 					$x = $thischar['x'];
 					if ($x > 0) {
-						$prevchar = $charAL[($x-1)];
+						$prevchar = $charAL[($x - 1)];
 					} else {
 						$prevchar = false;
 					}
-					if (($x+1) < $numAL) {
-						$nextchar = $charAL[($x+1)];
+					if (($x + 1) < $numAL) {
+						$nextchar = $charAL[($x + 1)];
 					} else {
 						$nextchar = false;
 					}
@@ -2515,7 +2515,7 @@ 
 						$arabicarr = TCPDF_FONT_DATA::$uni_laa_array;
 						$laaletter = true;
 						if ($x > 1) {
-							$prevchar = $charAL[($x-2)];
+							$prevchar = $charAL[($x - 2)];
 						} else {
 							$prevchar = false;
 						}
@@ -2554,12 +2554,12 @@ 
 						(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
 						// final
 						if (($i > 1) AND ($thischar['char'] == 1607) AND
-							($chardata[$i-1]['char'] == 1604) AND
-							($chardata[$i-2]['char'] == 1604)) {
+							($chardata[$i - 1]['char'] == 1604) AND
+							($chardata[$i - 2]['char'] == 1604)) {
 							//Allah Word
 							// mark characters to delete with false
-							$chardata2[$i-2]['char'] = false;
-							$chardata2[$i-1]['char'] = false;
+							$chardata2[$i - 2]['char'] = false;
+							$chardata2[$i - 1]['char'] = false;
 							$chardata2[$i]['char'] = 65010;
 						} else {
 							if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
@@ -2581,7 +2581,7 @@ 
 					// if laa letter
 					if ($laaletter) {
 						// mark characters to delete with false
-						$chardata2[($charAL[($x-1)]['i'])]['char'] = false;
+						$chardata2[($charAL[($x - 1)]['i'])]['char'] = false;
 					}
 				} // end if AL (Arabic Letter)
 			} // end for each char
@@ -2589,12 +2589,12 @@ 
 			 * Combining characters that can occur with Arabic Shadda (0651 HEX, 1617 DEC) are replaced.
 			 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
 			 */
-			for ($i = 0; $i < ($numchars-1); ++$i) {
-				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
+			for ($i = 0; $i < ($numchars - 1); ++$i) {
+				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i + 1]['char'])]))) {
 					// check if the subtitution font is defined on current font
-					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])])])) {
+					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i + 1]['char'])])])) {
 						$chardata2[$i]['char'] = false;
-						$chardata2[$i+1]['char'] = TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])];
+						$chardata2[$i + 1]['char'] = TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i + 1]['char'])];
 					}
 				}
 			}
@@ -2613,11 +2613,11 @@ 
 		}
 
 		// L2. From the highest level found in the text to the lowest odd level on each line, including intermediate levels not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
-		for ($j=$maxlevel; $j > 0; $j--) {
+		for ($j = $maxlevel; $j > 0; $j--) {
 			$ordarray = Array();
 			$revarr = Array();
 			$onlevel = false;
-			for ($i=0; $i < $numchars; ++$i) {
+			for ($i = 0; $i < $numchars; ++$i) {
 				if ($chardata[$i]['level'] >= $j) {
 					$onlevel = true;
 					if (isset(TCPDF_FONT_DATA::$uni_mirror[$chardata[$i]['char']])) {

Upper-Lower-Casing +78 added lines, -78 removed lines

@@ -129,7 +129,7 @@ 
 			}
 			case 'Type1': {
 				$fmetric['type'] = 'Type1';
-				if (empty($enc) AND (($flags & 4) == 0)) {
+				if (empty($enc) and (($flags & 4) == 0)) {
 					$enc = 'cp1252';
 				}
 				break;
@@ -147,8 +147,8 @@ 
 		// set encoding maps (if any)
 		$fmetric['enc'] = preg_replace('/[^A-Za-z0-9_\-]/', '', $enc);
 		$fmetric['diff'] = '';
-		if (($fmetric['type'] == 'TrueType') OR ($fmetric['type'] == 'Type1')) {
-			if (!empty($enc) AND ($enc != 'cp1252') AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
+		if (($fmetric['type'] == 'TrueType') or ($fmetric['type'] == 'Type1')) {
+			if (!empty($enc) and ($enc != 'cp1252') and isset(TCPDF_FONT_DATA::$encmap[$enc])) {
 				// build differences from reference encoding
 				$enc_ref = TCPDF_FONT_DATA::$encmap['cp1252'];
 				$enc_target = TCPDF_FONT_DATA::$encmap[$enc];
@@ -274,7 +274,7 @@ 
 			// get charstring data
 			$eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1));
 			preg_match_all('#/([A-Za-z0-9\.]*)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
-			if (!empty($enc) AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
+			if (!empty($enc) and isset(TCPDF_FONT_DATA::$encmap[$enc])) {
 				$enc_map = TCPDF_FONT_DATA::$encmap[$enc];
 			} else {
 				$enc_map = false;
@@ -313,18 +313,18 @@ 
 				while ($i < $clen) {
 					if ($ccom[$i] < 32) {
 						$cdec[$ck] = $ccom[$i];
-						if (($ck > 0) AND ($cdec[$ck] == 13)) {
+						if (($ck > 0) and ($cdec[$ck] == 13)) {
 							// hsbw command: update width
 							$cwidths[$cid] = $cdec[($ck - 1)];
 						}
 						++$i;
-					} elseif (($ccom[$i] >= 32) AND ($ccom[$i] <= 246)) {
+					} elseif (($ccom[$i] >= 32) and ($ccom[$i] <= 246)) {
 						$cdec[$ck] = ($ccom[$i] - 139);
 						++$i;
-					} elseif (($ccom[$i] >= 247) AND ($ccom[$i] <= 250)) {
+					} elseif (($ccom[$i] >= 247) and ($ccom[$i] <= 250)) {
 						$cdec[$ck] = ((($ccom[$i] - 247) * 256) + $ccom[($i + 1)] + 108);
 						$i += 2;
-					} elseif (($ccom[$i] >= 251) AND ($ccom[$i] <= 254)) {
+					} elseif (($ccom[$i] >= 251) and ($ccom[$i] <= 254)) {
 						$cdec[$ck] = ((-($ccom[$i] - 251) * 256) - $ccom[($i + 1)] - 108);
 						$i += 2;
 					} elseif ($ccom[$i] == 255) {
@@ -560,7 +560,7 @@ 
 			$c = 0;
 			foreach ($encodingTables as $enctable) {
 				// get only specified Platform ID and Encoding ID
-				if (($enctable['platformID'] == $platid) AND ($enctable['encodingID'] == $encid)) {
+				if (($enctable['platformID'] == $platid) and ($enctable['encodingID'] == $encid)) {
 					$offset = $table['cmap']['offset'] + $enctable['offset'];
 					$format = TCPDF_STATIC::_getUSHORT($font, $offset);
 					$offset += 2;
@@ -713,7 +713,7 @@ 
 								$offset += 4;
 								for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
 									$is32idx = floor($c / 8);
-									if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
+									if ((isset($is32[$is32idx])) and (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
 										$c = $k;
 									} else {
 										// 32 bit format
@@ -807,7 +807,7 @@ 
 					if (isset($cw[$ctg[$cid]])) {
 						$fmetric['cw'] .= ','.$cid.'=>'.$cw[$ctg[$cid]];
 					}
-					if ($addcbbox AND isset($indexToLoc[$ctg[$cid]])) {
+					if ($addcbbox and isset($indexToLoc[$ctg[$cid]])) {
 						$offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[$cid]]);
 						$xMin = round(TCPDF_STATIC::_getFWORD($font, $offset + 2) * $urk);
 						$yMin = round(TCPDF_STATIC::_getFWORD($font, $offset + 4) * $urk);
@@ -818,7 +818,7 @@ 
 				}
 			}
 		} // end of true type
-		if (($fmetric['type'] == 'TrueTypeUnicode') AND (count($ctg) == 256)) {
+		if (($fmetric['type'] == 'TrueTypeUnicode') and (count($ctg) == 256)) {
 			$fmetric['type'] = 'TrueType';
 		}
 		// ---------- create php font file ----------
@@ -1187,7 +1187,7 @@ 
 						$offset += 4;
 						for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
 							$is32idx = floor($c / 8);
-							if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
+							if ((isset($is32[$is32idx])) and (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
 								$c = $k;
 							} else {
 								// 32 bit format
@@ -1406,7 +1406,7 @@ 
 		// for each character
 		foreach ($font['cw'] as $cid => $width) {
 			$cid -= $cidoffset;
-			if ($font['subset'] AND (!isset($font['subsetchars'][$cid]))) {
+			if ($font['subset'] and (!isset($font['subsetchars'][$cid]))) {
 				// ignore the unused characters (font subsetting)
 				continue;
 			}
@@ -1454,7 +1454,7 @@ 
 		$prevint = false;
 		foreach ($range as $k => $ws) {
 			$cws = count($ws);
-			if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
+			if (($k == $nextk) and (!$prevint) and ((!isset($ws['interval'])) or ($cws < 4))) {
 				if (isset($range[$k]['interval'])) {
 					unset($range[$k]['interval']);
 				}
@@ -1506,7 +1506,7 @@ 
 	 * @public static
 	 */
 	public static function updateCIDtoGIDmap($map, $cid, $gid) {
-		if (($cid >= 0) AND ($cid <= 0xFFFF) AND ($gid >= 0)) {
+		if (($cid >= 0) and ($cid <= 0xFFFF) and ($gid >= 0)) {
 			if ($gid > 0xFFFF) {
 				$gid -= 0x10000;
 			}
@@ -1522,7 +1522,7 @@ 
 	 * @public static
 	 */
 	public static function _getfontpath() {
-		if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
+		if (!defined('K_PATH_FONTS') and is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
 			if (substr($fdir, -1) != '/') {
 				$fdir .= '/';
 			}
@@ -1545,7 +1545,7 @@ 
 	public static function getFontFullPath($file, $fontdir=false) {
 		$fontfile = '';
 		// search files on various directories
-		if (($fontdir !== false) AND @TCPDF_STATIC::file_exists($fontdir.$file)) {
+		if (($fontdir !== false) and @TCPDF_STATIC::file_exists($fontdir.$file)) {
 			$fontfile = $fontdir.$file;
 		} elseif (@TCPDF_STATIC::file_exists(self::_getfontpath().$file)) {
 			$fontfile = self::_getfontpath().$file;
@@ -1969,7 +1969,7 @@ 
 					for ($j = 1; $j < $numbytes; ++$j) {
 						$char += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
 					}
-					if ((($char >= 0xD800) AND ($char <= 0xDFFF)) OR ($char >= 0x10FFFF)) {
+					if ((($char >= 0xD800) and ($char <= 0xDFFF)) or ($char >= 0x10FFFF)) {
 						// The definition of UTF-8 prohibits encoding character numbers between
 						// U+D800 and U+DFFF, which are reserved for use with the UTF-16
 						// encoding form (as surrogate pairs) and do not directly represent
@@ -2109,7 +2109,7 @@ 
 			$arabic = false;
 		}
 		// check if string contains RTL text
-		if (!($forcertl OR $arabic OR preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $str))) {
+		if (!($forcertl or $arabic or preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $str))) {
 			return $ta;
 		}
 
@@ -2128,7 +2128,7 @@ 
 				if ($type == 'L') {
 					$pel = 0;
 					break;
-				} elseif (($type == 'AL') OR ($type == 'R')) {
+				} elseif (($type == 'AL') or ($type == 'R')) {
 					$pel = 1;
 					break;
 				}
@@ -2145,7 +2145,7 @@ 
 		$eor = $sor;
 
 		// Array of characters data
-		$chardata = Array();
+		$chardata = array();
 
 		// X1. Begin by setting the current embedding level to the paragraph embedding level. Set the directional override status to neutral. Process each character iteratively, applying rules X2 through X9. Only embedding levels from 0 to 61 are valid in this phase.
 		// In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
@@ -2202,9 +2202,9 @@ 
 				// X7. With each PDF, determine the matching embedding or override code. If there was a valid matching code, restore (pop) the last remembered (pushed) embedding level and directional override.
 				if (count($remember)) {
 					$last = count($remember ) - 1;
-					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) OR
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) OR
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) OR
+					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) or
+						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) or
+						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) or
 						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRO)) {
 						$match = array_pop($remember);
 						$cel = $match['cel'];
@@ -2213,10 +2213,10 @@ 
 						$eor = ($cel > $match['cel'] ? $cel : $match['cel']) % 2 ? 'R' : 'L';
 					}
 				}
-			} elseif (($ta[$i] != TCPDF_FONT_DATA::$uni_RLE) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRE) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_RLO) AND
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRO) AND
+			} elseif (($ta[$i] != TCPDF_FONT_DATA::$uni_RLE) and
+							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRE) and
+							 ($ta[$i] != TCPDF_FONT_DATA::$uni_RLO) and
+							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRO) and
 							 ($ta[$i] != TCPDF_FONT_DATA::$uni_PDF)) {
 				// X6. For all types besides RLE, LRE, RLO, LRO, and PDF:
 				//	a. Set the level of the current character to the current embedding level.
@@ -2271,7 +2271,7 @@ 
 				for ($j=$levcount; $j >= 0; $j--) {
 					if ($chardata[$j]['type'] == 'AL') {
 						$chardata[$i]['type'] = 'AN';
-					} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
+					} elseif (($chardata[$j]['type'] == 'L') or ($chardata[$j]['type'] == 'R')) {
 						break;
 					}
 				}
@@ -2295,12 +2295,12 @@ 
 		$prevlevel = -1;
 		$levcount = 0;
 		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
+			if (($levcount > 0) and (($i+1) < $numchars) and ($chardata[($i+1)]['level'] == $prevlevel)) {
+				if (($chardata[$i]['type'] == 'ES') and ($chardata[($i-1)]['type'] == 'EN') and ($chardata[($i+1)]['type'] == 'EN')) {
 					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
+				} elseif (($chardata[$i]['type'] == 'CS') and ($chardata[($i-1)]['type'] == 'EN') and ($chardata[($i+1)]['type'] == 'EN')) {
 					$chardata[$i]['type'] = 'EN';
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
+				} elseif (($chardata[$i]['type'] == 'CS') and ($chardata[($i-1)]['type'] == 'AN') and ($chardata[($i+1)]['type'] == 'AN')) {
 					$chardata[$i]['type'] = 'AN';
 				}
 			}
@@ -2317,11 +2317,11 @@ 
 		$levcount = 0;
 		for ($i=0; $i < $numchars; ++$i) {
 			if ($chardata[$i]['type'] == 'ET') {
-				if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
+				if (($levcount > 0) and ($chardata[($i-1)]['type'] == 'EN')) {
 					$chardata[$i]['type'] = 'EN';
 				} else {
 					$j = $i+1;
-					while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
+					while (($j < $numchars) and ($chardata[$j]['level'] == $prevlevel)) {
 						if ($chardata[$j]['type'] == 'EN') {
 							$chardata[$i]['type'] = 'EN';
 							break;
@@ -2344,7 +2344,7 @@ 
 		$prevlevel = -1;
 		$levcount = 0;
 		for ($i=0; $i < $numchars; ++$i) {
-			if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
+			if (($chardata[$i]['type'] == 'ET') or ($chardata[$i]['type'] == 'ES') or ($chardata[$i]['type'] == 'CS')) {
 				$chardata[$i]['type'] = 'ON';
 			}
 			if ($chardata[$i]['level'] != $prevlevel) {
@@ -2380,36 +2380,36 @@ 
 		$prevlevel = -1;
 		$levcount = 0;
 		for ($i=0; $i < $numchars; ++$i) {
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
+			if (($levcount > 0) and (($i+1) < $numchars) and ($chardata[($i+1)]['level'] == $prevlevel)) {
+				if (($chardata[$i]['type'] == 'N') and ($chardata[($i-1)]['type'] == 'L') and ($chardata[($i+1)]['type'] == 'L')) {
 					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
+				} elseif (($chardata[$i]['type'] == 'N') and
+				 (($chardata[($i-1)]['type'] == 'R') or ($chardata[($i-1)]['type'] == 'EN') or ($chardata[($i-1)]['type'] == 'AN')) and
+				 (($chardata[($i+1)]['type'] == 'R') or ($chardata[($i+1)]['type'] == 'EN') or ($chardata[($i+1)]['type'] == 'AN'))) {
 					$chardata[$i]['type'] = 'R';
 				} elseif ($chardata[$i]['type'] == 'N') {
 					// N2. Any remaining neutrals take the embedding direction
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
 				}
-			} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
+			} elseif (($levcount == 0) and (($i+1) < $numchars) and ($chardata[($i+1)]['level'] == $prevlevel)) {
 				// first char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
+				if (($chardata[$i]['type'] == 'N') and ($chardata[$i]['sor'] == 'L') and ($chardata[($i+1)]['type'] == 'L')) {
 					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
+				} elseif (($chardata[$i]['type'] == 'N') and
+				 (($chardata[$i]['sor'] == 'R') or ($chardata[$i]['sor'] == 'EN') or ($chardata[$i]['sor'] == 'AN')) and
+				 (($chardata[($i+1)]['type'] == 'R') or ($chardata[($i+1)]['type'] == 'EN') or ($chardata[($i+1)]['type'] == 'AN'))) {
 					$chardata[$i]['type'] = 'R';
 				} elseif ($chardata[$i]['type'] == 'N') {
 					// N2. Any remaining neutrals take the embedding direction
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
 				}
-			} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
+			} elseif (($levcount > 0) and ((($i+1) == $numchars) or (($i+1) < $numchars) and ($chardata[($i+1)]['level'] != $prevlevel))) {
 				//last char
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
+				if (($chardata[$i]['type'] == 'N') and ($chardata[($i-1)]['type'] == 'L') and ($chardata[$i]['eor'] == 'L')) {
 					$chardata[$i]['type'] = 'L';
-				} elseif (($chardata[$i]['type'] == 'N') AND
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
-				 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
+				} elseif (($chardata[$i]['type'] == 'N') and
+				 (($chardata[($i-1)]['type'] == 'R') or ($chardata[($i-1)]['type'] == 'EN') or ($chardata[($i-1)]['type'] == 'AN')) and
+				 (($chardata[$i]['eor'] == 'R') or ($chardata[$i]['eor'] == 'EN') or ($chardata[$i]['eor'] == 'AN'))) {
 					$chardata[$i]['type'] = 'R';
 				} elseif ($chardata[$i]['type'] == 'N') {
 					// N2. Any remaining neutrals take the embedding direction
@@ -2432,13 +2432,13 @@ 
 		for ($i=0; $i < $numchars; ++$i) {
 			$odd = $chardata[$i]['level'] % 2;
 			if ($odd) {
-				if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
+				if (($chardata[$i]['type'] == 'L') or ($chardata[$i]['type'] == 'AN') or ($chardata[$i]['type'] == 'EN')) {
 					$chardata[$i]['level'] += 1;
 				}
 			} else {
 				if ($chardata[$i]['type'] == 'R') {
 					$chardata[$i]['level'] += 1;
-				} elseif (($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
+				} elseif (($chardata[$i]['type'] == 'AN') or ($chardata[$i]['type'] == 'EN')) {
 					$chardata[$i]['level'] += 2;
 				}
 			}
@@ -2451,13 +2451,13 @@ 
 		//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
 		//	4. Any sequence of white space characters at the end of the line.
 		for ($i=0; $i < $numchars; ++$i) {
-			if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
+			if (($chardata[$i]['type'] == 'B') or ($chardata[$i]['type'] == 'S')) {
 				$chardata[$i]['level'] = $pel;
 			} elseif ($chardata[$i]['type'] == 'WS') {
 				$j = $i+1;
 				while ($j < $numchars) {
-					if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
-						(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
+					if ((($chardata[$j]['type'] == 'B') or ($chardata[$j]['type'] == 'S')) or
+						(($j == ($numchars-1)) and ($chardata[$j]['type'] == 'WS'))) {
 						$chardata[$i]['level'] = $pel;
 						break;
 					} elseif ($chardata[$j]['type'] != 'WS') {
@@ -2478,7 +2478,7 @@ 
 			$charAL = array();
 			$x = 0;
 			for ($i=0; $i < $numchars; ++$i) {
-				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
+				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') or ($chardata[$i]['char'] == 32) or ($chardata[$i]['char'] == 8204)) {
 					$charAL[$x] = $chardata[$i];
 					$charAL[$x]['i'] = $i;
 					$chardata[$i]['x'] = $x;
@@ -2511,7 +2511,7 @@ 
 						$nextchar = false;
 					}
 					// if laa letter
-					if (($prevchar !== false) AND ($prevchar['char'] == 1604) AND (in_array($thischar['char'], $alfletter))) {
+					if (($prevchar !== false) and ($prevchar['char'] == 1604) and (in_array($thischar['char'], $alfletter))) {
 						$arabicarr = TCPDF_FONT_DATA::$uni_laa_array;
 						$laaletter = true;
 						if ($x > 1) {
@@ -2523,11 +2523,11 @@ 
 						$arabicarr = TCPDF_FONT_DATA::$uni_arabicsubst;
 						$laaletter = false;
 					}
-					if (($prevchar !== false) AND ($nextchar !== false) AND
-						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) AND
-						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) AND
-						($prevchar['type'] == $thischar['type']) AND
-						($nextchar['type'] == $thischar['type']) AND
+					if (($prevchar !== false) and ($nextchar !== false) and
+						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) and
+						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) and
+						($prevchar['type'] == $thischar['type']) and
+						($nextchar['type'] == $thischar['type']) and
 						($nextchar['char'] != 1567)) {
 						if (in_array($prevchar['char'], $endedletter)) {
 							if (isset($arabicarr[$thischar['char']][2])) {
@@ -2540,21 +2540,21 @@ 
 								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][3];
 							}
 						}
-					} elseif (($nextchar !== false) AND
-						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) AND
-						($nextchar['type'] == $thischar['type']) AND
+					} elseif (($nextchar !== false) and
+						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) and
+						($nextchar['type'] == $thischar['type']) and
 						($nextchar['char'] != 1567)) {
 						if (isset($arabicarr[$chardata[$i]['char']][2])) {
 							// initial
 							$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
 						}
-					} elseif ((($prevchar !== false) AND
-						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) AND
-						($prevchar['type'] == $thischar['type'])) OR
-						(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
+					} elseif ((($prevchar !== false) and
+						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) and
+						($prevchar['type'] == $thischar['type'])) or
+						(($nextchar !== false) and ($nextchar['char'] == 1567))) {
 						// final
-						if (($i > 1) AND ($thischar['char'] == 1607) AND
-							($chardata[$i-1]['char'] == 1604) AND
+						if (($i > 1) and ($thischar['char'] == 1607) and
+							($chardata[$i-1]['char'] == 1604) and
 							($chardata[$i-2]['char'] == 1604)) {
 							//Allah Word
 							// mark characters to delete with false
@@ -2562,7 +2562,7 @@ 
 							$chardata2[$i-1]['char'] = false;
 							$chardata2[$i]['char'] = 65010;
 						} else {
-							if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
+							if (($prevchar !== false) and in_array($prevchar['char'], $endedletter)) {
 								if (isset($arabicarr[$thischar['char']][0])) {
 									// isolated
 									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
@@ -2590,7 +2590,7 @@ 
 			 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
 			 */
 			for ($i = 0; $i < ($numchars-1); ++$i) {
-				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
+				if (($chardata2[$i]['char'] == 1617) and (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
 					// check if the subtitution font is defined on current font
 					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])])])) {
 						$chardata2[$i]['char'] = false;
@@ -2614,8 +2614,8 @@ 
 
 		// L2. From the highest level found in the text to the lowest odd level on each line, including intermediate levels not actually present in the text, reverse any contiguous sequence of characters that are at that level or higher.
 		for ($j=$maxlevel; $j > 0; $j--) {
-			$ordarray = Array();
-			$revarr = Array();
+			$ordarray = array();
+			$revarr = array();
 			$onlevel = false;
 			for ($i=0; $i < $numchars; ++$i) {
 				if ($chardata[$i]['level'] >= $j) {
@@ -2629,7 +2629,7 @@ 
 					if ($onlevel) {
 						$revarr = array_reverse($revarr);
 						$ordarray = array_merge($ordarray, $revarr);
-						$revarr = Array();
+						$revarr = array();
 						$onlevel = false;
 					}
 					$ordarray[] = $chardata[$i];

htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php

Spacing +14 added lines, -14 removed lines

@@ -51,7 +51,7 @@ 
 	 * Array of WEB safe colors
 	 * @public static
 	 */
-	public static $webcolor = array (
+	public static $webcolor = array(
 		'aliceblue' => 'f0f8ff',
 		'antiquewhite' => 'faebd7',
 		'aqua' => '00ffff',
@@ -207,7 +207,7 @@ 
 	 * Array of valid JavaScript color names
 	 * @public static
 	 */
-	public static $jscolor = array ('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
+	public static $jscolor = array('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
 
 	/**
 	 * Array of Spot colors (C,M,Y,K,name)
@@ -216,22 +216,22 @@ 
 	 * Common industry standard spot colors are: ANPA-COLOR, DIC, FOCOLTONE, GCMI, HKS, PANTONE, TOYO, TRUMATCH.
 	 * @public static
 	 */
-	public static $spotcolor = array (
+	public static $spotcolor = array(
 		// special registration colors
-		'none'    => array(  0,   0,   0,   0, 'None'),
+		'none'    => array(0, 0, 0, 0, 'None'),
 		'all'     => array(100, 100, 100, 100, 'All'),
 		// standard CMYK colors
-		'cyan'    => array(100,   0,   0,   0, 'Cyan'),
-		'magenta' => array(  0, 100,   0,   0, 'Magenta'),
-		'yellow'  => array(  0,   0, 100,   0, 'Yellow'),
-		'key'     => array(  0,   0,   0, 100, 'Key'),
+		'cyan'    => array(100, 0, 0, 0, 'Cyan'),
+		'magenta' => array(0, 100, 0, 0, 'Magenta'),
+		'yellow'  => array(0, 0, 100, 0, 'Yellow'),
+		'key'     => array(0, 0, 0, 100, 'Key'),
 		// alias
-		'white'   => array(  0,   0,   0,   0, 'White'),
-		'black'   => array(  0,   0,   0, 100, 'Black'),
+		'white'   => array(0, 0, 0, 0, 'White'),
+		'black'   => array(0, 0, 0, 100, 'Black'),
 		// standard RGB colors
-		'red'     => array(  0, 100, 100,   0, 'Red'),
-		'green'   => array(100,   0, 100,   0, 'Green'),
-		'blue'    => array(100, 100,   0,   0, 'Blue'),
+		'red'     => array(0, 100, 100, 0, 'Red'),
+		'green'   => array(100, 0, 100, 0, 'Green'),
+		'blue'    => array(100, 100, 0, 0, 'Blue'),
 		// Add here standard spot colors or dynamically define them with AddSpotColor()
 		// ...
 	); // end of spot colors
@@ -270,7 +270,7 @@ 
 	 * @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)) {
+	public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol = array('R'=>128, 'G'=>128, 'B'=>128)) {
 		$color = preg_replace('/[\s]*/', '', $hcolor); // remove extra spaces
 		$color = strtolower($color);
 		// check for javascript color array syntax

htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php

Indentation +27 added lines, -27 removed lines

@@ -140,7 +140,7 @@ 
 		if ($headers === false) {
 			return false;
 		}
-    	return (strpos($headers[0], '200') !== false);
+		return (strpos($headers[0], '200') !== false);
 	}
 
 	/**
@@ -278,10 +278,10 @@ 
 	}
 
 	/**
-	* Escape some special characters (< > &) for XML output.
-	* @param string $str Input string to convert.
-	* @return string converted string
-	* @since 5.9.121 (2011-09-28)
+	 * Escape some special characters (< > &) for XML output.
+	 * @param string $str Input string to convert.
+	 * @return string converted string
+	 * @since 5.9.121 (2011-09-28)
 	 * @public static
 	 */
 	public static function _escapeXML($str) {
@@ -1841,7 +1841,7 @@ 
 		curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
 		curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
 		if (defined('CURLOPT_PROTOCOLS')) {
-		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
+			curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
 		}
 		curl_exec($crs);
 		$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
@@ -1901,20 +1901,20 @@ 
 		$alt = array($file);
 		//
 		if ((strlen($file) > 1)
-		    && ($file[0] === '/')
-		    && ($file[1] !== '/')
-		    && !empty($_SERVER['DOCUMENT_ROOT'])
-		    && ($_SERVER['DOCUMENT_ROOT'] !== '/')
+			&& ($file[0] === '/')
+			&& ($file[1] !== '/')
+			&& !empty($_SERVER['DOCUMENT_ROOT'])
+			&& ($_SERVER['DOCUMENT_ROOT'] !== '/')
 		) {
-		    $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
-		    if (($findroot === false) || ($findroot > 1)) {
+			$findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
+			if (($findroot === false) || ($findroot > 1)) {
 			$alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
-		    }
+			}
 		}
 		//
 		$protocol = 'http';
 		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off')) {
-		    $protocol .= 's';
+			$protocol .= 's';
 		}
 		//
 		$url = $file;
@@ -1925,26 +1925,26 @@ 
 		$alt[] = $url;
 		//
 		if (preg_match('%^(https?)://%', $url)
-		    && empty($_SERVER['HTTP_HOST'])
-		    && empty($_SERVER['DOCUMENT_ROOT'])
+			&& empty($_SERVER['HTTP_HOST'])
+			&& empty($_SERVER['DOCUMENT_ROOT'])
 		) {
 			$urldata = parse_url($url);
 			if (empty($urldata['query'])) {
 				$host = $protocol.'://'.$_SERVER['HTTP_HOST'];
 				if (strpos($url, $host) === 0) {
-				    // convert URL to full server path
-				    $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
-				    $alt[] = htmlspecialchars_decode(urldecode($tmp));
+					// convert URL to full server path
+					$tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
+					$alt[] = htmlspecialchars_decode(urldecode($tmp));
 				}
 			}
 		}
 		//
 		if (isset($_SERVER['SCRIPT_URI'])
-		    && !preg_match('%^(https?|ftp)://%', $file)
-		    && !preg_match('%^//%', $file)
+			&& !preg_match('%^(https?|ftp)://%', $file)
+			&& !preg_match('%^//%', $file)
 		) {
-		    $urldata = @parse_url($_SERVER['SCRIPT_URI']);
-		    $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
+			$urldata = @parse_url($_SERVER['SCRIPT_URI']);
+			$alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
 		}
 		//
 		$alt = array_unique($alt);
@@ -1954,7 +1954,7 @@ 
 			}
 			$ret = @file_get_contents($path);
 			if ( $ret != false ) {
-			    return $ret;
+				return $ret;
 			}
 			// try to use CURL for URLs
 			if (!ini_get('allow_url_fopen')
@@ -1968,7 +1968,7 @@ 
 				curl_setopt($crs, CURLOPT_FAILONERROR, true);
 				curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
 				if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
-				    curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
+					curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
 				}
 				curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
 				curl_setopt($crs, CURLOPT_TIMEOUT, 30);
@@ -1977,7 +1977,7 @@ 
 				curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
 				curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
 				if (defined('CURLOPT_PROTOCOLS')) {
-				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
+					curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
 				}
 				$ret = curl_exec($crs);
 				curl_close($crs);
@@ -2131,7 +2131,7 @@ 
 	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
 	 * @public static
 	 *
-     * @var array<string,float[]>
+	 * @var array<string,float[]>
 	 */
 	public static $page_formats = array(
 		// ISO 216 A Series + 2 SIS 014711 extensions

Spacing +346 added lines, -346 removed lines

@@ -160,7 +160,7 @@ 
 	 * @since (4.5.019) 2009-02-28
 	 * @public static
 	 */
-	public static function removeSHY($txt='', $unicode=true) {
+	public static function removeSHY($txt = '', $unicode = true) {
 		$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
 		if (!$unicode) {
 			$txt = preg_replace('/([\\xad]{1})/', '', $txt);
@@ -178,7 +178,7 @@ 
 	 * @since 4.4.002 (2008-12-09)
 	 * @public static
 	 */
-	public static function getBorderMode($brd, $position='start', $opencell=true) {
+	public static function getBorderMode($brd, $position = 'start', $opencell = true) {
 		if ((!$opencell) OR empty($brd)) {
 			return $brd;
 		}
@@ -262,7 +262,7 @@ 
 	 * @since 4.5.000 (2008-12-31)
 	 * @public static
 	 */
-	public static function getObjFilename($type='tmp', $file_id='') {
+	public static function getObjFilename($type = 'tmp', $file_id = '') {
 		return tempnam(K_PATH_CACHE, '__tcpdf_'.$file_id.'_'.$type.'_'.md5(TCPDF_STATIC::getRandomSeed()).'_');
 	}
 
@@ -328,7 +328,7 @@ 
 	 * @return array replaced page content and updated $diff parameter as array.
 	 * @public static
 	 */
-	public static function replacePageNumAliases($page, $replace, $diff=0) {
+	public static function replacePageNumAliases($page, $replace, $diff = 0) {
 		foreach ($replace as $rep) {
 			foreach ($rep[3] as $a) {
 				if (strpos($page, $a) !== false) {
@@ -374,7 +374,7 @@ 
 	 * @since 5.9.006 (2010-10-19)
 	 * @public static
 	 */
-	public static function getRandomSeed($seed='') {
+	public static function getRandomSeed($seed = '') {
 		$rnd = uniqid(rand().microtime(true), true);
 		if (function_exists('posix_getpid')) {
 			$rnd .= posix_getpid();
@@ -511,7 +511,7 @@ 
 	 * @author Nicola Asuni
 	 * @public static
 	 */
-	public static function getUserPermissionCode($permissions, $mode=0) {
+	public static function getUserPermissionCode($permissions, $mode = 0) {
 		$options = array(
 			'owner' => 2, // bit 2 -- inverted logic: cleared by default
 			'print' => 4, // bit 3
@@ -520,7 +520,7 @@ 
 			'annot-forms' => 32, // bit 6
 			'fill-forms' => 256, // bit 9
 			'extract' => 512, // bit 10
-			'assemble' => 1024,// bit 11
+			'assemble' => 1024, // bit 11
 			'print-high' => 2048 // bit 12
 			);
 		$protection = 2147422012; // 32 bit: (01111111 11111111 00001111 00111100)
@@ -628,7 +628,7 @@ 
 	 * @since 4.8.000 (2009-09-06)
 	 * @public static
 	 */
-	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
+	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl = false) {
 		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
 			// the annotation options are already defined
 			return $prop['aopt'];
@@ -650,7 +650,7 @@ 
 					break;
 				}
 				default: {
-					$opt['q'] = ($rtl)?2:0;
+					$opt['q'] = ($rtl) ? 2 : 0;
 					break;
 				}
 			}
@@ -994,7 +994,7 @@ 
 	 * @public static
 	 */
 	public static function formatPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
+		return number_format((float) $num, 0, '', '.');
 	}
 
 	/**
@@ -1007,7 +1007,7 @@ 
 	 * @public static
 	 */
 	public static function formatTOCPageNumber($num) {
-		return number_format((float)$num, 0, '', '.');
+		return number_format((float) $num, 0, '', '.');
 	}
 
 	/**
@@ -1117,7 +1117,7 @@ 
 	public static function fixHTMLCode($html, $default_css, $tagvs, $tidy_options, &$tagvspaces) {
 		// configure parameters for HTML Tidy
 		if (TCPDF_STATIC::empty_string($tidy_options)) {
-			$tidy_options = array (
+			$tidy_options = array(
 				'clean' => 1,
 				'drop-empty-paras' => 0,
 				'drop-proprietary-attributes' => 1,
@@ -1348,7 +1348,7 @@ 
 			$selectors = $dom[($dom[$key]['parent'])]['csssel'];
 		}
 		// get all styles that apply
-		foreach($css as $selector => $style) {
+		foreach ($css as $selector => $style) {
 			$pos = strpos($selector, ' ');
 			// get specificity
 			$specificity = substr($selector, 0, $pos);
@@ -1488,9 +1488,9 @@ 
 	 */
 	public static function revstrpos($haystack, $needle, $offset = 0) {
 		$length = strlen($haystack);
-		$offset = ($offset > 0)?($length - $offset):abs($offset);
+		$offset = ($offset > 0) ? ($length - $offset) : abs($offset);
 		$pos = strpos(strrev($haystack), strrev($needle), $offset);
-		return ($pos === false)?false:($length - $pos - strlen($needle));
+		return ($pos === false) ?false:($length - $pos - strlen($needle));
 	}
 
 	/**
@@ -1515,7 +1515,7 @@ 
 		$patterns_array = preg_split('/[\s]+/', $data);
 		// create new language array of patterns
 		$patterns = array();
-		foreach($patterns_array as $val) {
+		foreach ($patterns_array as $val) {
 			if (!TCPDF_STATIC::empty_string($val)) {
 				$val = trim($val);
 				$val = str_replace('\'', '\\\'', $val);
@@ -1548,9 +1548,9 @@ 
 	 * @since 5.0.000 (2010-04-30)
 	 * @public static
 	 */
-	public static function getPathPaintOperator($style, $default='S') {
+	public static function getPathPaintOperator($style, $default = 'S') {
 		$op = '';
-		switch($style) {
+		switch ($style) {
 			case 'S':
 			case 'D': {
 				$op = 'S';
@@ -1770,7 +1770,7 @@ 
 	 * @since 6.0.023
 	 * @public static
 	 */
-	public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
+	public static function pregSplit($pattern, $modifiers, $subject, $limit = NULL, $flags = NULL) {
 		// PHP 8.1 deprecates nulls for $limit and $flags
 		$limit = $limit === null ? -1 : $limit;
 		$flags = $flags === null ? 0 : $flags;
@@ -1841,7 +1841,7 @@ 
 		curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
 		curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
 		if (defined('CURLOPT_PROTOCOLS')) {
-		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
+		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS);
 		}
 		curl_exec($crs);
 		$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
@@ -1953,7 +1953,7 @@ 
 				continue;
 			}
 			$ret = @file_get_contents($path);
-			if ( $ret != false ) {
+			if ($ret != false) {
 			    return $ret;
 			}
 			// try to use CURL for URLs
@@ -1977,7 +1977,7 @@ 
 				curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
 				curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
 				if (defined('CURLOPT_PROTOCOLS')) {
-				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
+				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS);
 				}
 				$ret = curl_exec($crs);
 				curl_close($crs);
@@ -2135,353 +2135,353 @@ 
 	 */
 	public static $page_formats = array(
 		// ISO 216 A Series + 2 SIS 014711 extensions
-		'A0'                     => array( 2383.937,  3370.394), // = (  841 x 1189 ) mm  = ( 33.11 x 46.81 ) in
-		'A1'                     => array( 1683.780,  2383.937), // = (  594 x 841  ) mm  = ( 23.39 x 33.11 ) in
-		'A2'                     => array( 1190.551,  1683.780), // = (  420 x 594  ) mm  = ( 16.54 x 23.39 ) in
-		'A3'                     => array(  841.890,  1190.551), // = (  297 x 420  ) mm  = ( 11.69 x 16.54 ) in
-		'A4'                     => array(  595.276,   841.890), // = (  210 x 297  ) mm  = (  8.27 x 11.69 ) in
-		'A5'                     => array(  419.528,   595.276), // = (  148 x 210  ) mm  = (  5.83 x 8.27  ) in
-		'A6'                     => array(  297.638,   419.528), // = (  105 x 148  ) mm  = (  4.13 x 5.83  ) in
-		'A7'                     => array(  209.764,   297.638), // = (   74 x 105  ) mm  = (  2.91 x 4.13  ) in
-		'A8'                     => array(  147.402,   209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
-		'A9'                     => array(  104.882,   147.402), // = (   37 x 52   ) mm  = (  1.46 x 2.05  ) in
-		'A10'                    => array(   73.701,   104.882), // = (   26 x 37   ) mm  = (  1.02 x 1.46  ) in
-		'A11'                    => array(   51.024,    73.701), // = (   18 x 26   ) mm  = (  0.71 x 1.02  ) in
-		'A12'                    => array(   36.850,    51.024), // = (   13 x 18   ) mm  = (  0.51 x 0.71  ) in
+		'A0'                     => array(2383.937, 3370.394), // = (  841 x 1189 ) mm  = ( 33.11 x 46.81 ) in
+		'A1'                     => array(1683.780, 2383.937), // = (  594 x 841  ) mm  = ( 23.39 x 33.11 ) in
+		'A2'                     => array(1190.551, 1683.780), // = (  420 x 594  ) mm  = ( 16.54 x 23.39 ) in
+		'A3'                     => array(841.890, 1190.551), // = (  297 x 420  ) mm  = ( 11.69 x 16.54 ) in
+		'A4'                     => array(595.276, 841.890), // = (  210 x 297  ) mm  = (  8.27 x 11.69 ) in
+		'A5'                     => array(419.528, 595.276), // = (  148 x 210  ) mm  = (  5.83 x 8.27  ) in
+		'A6'                     => array(297.638, 419.528), // = (  105 x 148  ) mm  = (  4.13 x 5.83  ) in
+		'A7'                     => array(209.764, 297.638), // = (   74 x 105  ) mm  = (  2.91 x 4.13  ) in
+		'A8'                     => array(147.402, 209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
+		'A9'                     => array(104.882, 147.402), // = (   37 x 52   ) mm  = (  1.46 x 2.05  ) in
+		'A10'                    => array(73.701, 104.882), // = (   26 x 37   ) mm  = (  1.02 x 1.46  ) in
+		'A11'                    => array(51.024, 73.701), // = (   18 x 26   ) mm  = (  0.71 x 1.02  ) in
+		'A12'                    => array(36.850, 51.024), // = (   13 x 18   ) mm  = (  0.51 x 0.71  ) in
 		// ISO 216 B Series + 2 SIS 014711 extensions
-		'B0'                     => array( 2834.646,  4008.189), // = ( 1000 x 1414 ) mm  = ( 39.37 x 55.67 ) in
-		'B1'                     => array( 2004.094,  2834.646), // = (  707 x 1000 ) mm  = ( 27.83 x 39.37 ) in
-		'B2'                     => array( 1417.323,  2004.094), // = (  500 x 707  ) mm  = ( 19.69 x 27.83 ) in
-		'B3'                     => array( 1000.630,  1417.323), // = (  353 x 500  ) mm  = ( 13.90 x 19.69 ) in
-		'B4'                     => array(  708.661,  1000.630), // = (  250 x 353  ) mm  = (  9.84 x 13.90 ) in
-		'B5'                     => array(  498.898,   708.661), // = (  176 x 250  ) mm  = (  6.93 x 9.84  ) in
-		'B6'                     => array(  354.331,   498.898), // = (  125 x 176  ) mm  = (  4.92 x 6.93  ) in
-		'B7'                     => array(  249.449,   354.331), // = (   88 x 125  ) mm  = (  3.46 x 4.92  ) in
-		'B8'                     => array(  175.748,   249.449), // = (   62 x 88   ) mm  = (  2.44 x 3.46  ) in
-		'B9'                     => array(  124.724,   175.748), // = (   44 x 62   ) mm  = (  1.73 x 2.44  ) in
-		'B10'                    => array(   87.874,   124.724), // = (   31 x 44   ) mm  = (  1.22 x 1.73  ) in
-		'B11'                    => array(   62.362,    87.874), // = (   22 x 31   ) mm  = (  0.87 x 1.22  ) in
-		'B12'                    => array(   42.520,    62.362), // = (   15 x 22   ) mm  = (  0.59 x 0.87  ) in
+		'B0'                     => array(2834.646, 4008.189), // = ( 1000 x 1414 ) mm  = ( 39.37 x 55.67 ) in
+		'B1'                     => array(2004.094, 2834.646), // = (  707 x 1000 ) mm  = ( 27.83 x 39.37 ) in
+		'B2'                     => array(1417.323, 2004.094), // = (  500 x 707  ) mm  = ( 19.69 x 27.83 ) in
+		'B3'                     => array(1000.630, 1417.323), // = (  353 x 500  ) mm  = ( 13.90 x 19.69 ) in
+		'B4'                     => array(708.661, 1000.630), // = (  250 x 353  ) mm  = (  9.84 x 13.90 ) in
+		'B5'                     => array(498.898, 708.661), // = (  176 x 250  ) mm  = (  6.93 x 9.84  ) in
+		'B6'                     => array(354.331, 498.898), // = (  125 x 176  ) mm  = (  4.92 x 6.93  ) in
+		'B7'                     => array(249.449, 354.331), // = (   88 x 125  ) mm  = (  3.46 x 4.92  ) in
+		'B8'                     => array(175.748, 249.449), // = (   62 x 88   ) mm  = (  2.44 x 3.46  ) in
+		'B9'                     => array(124.724, 175.748), // = (   44 x 62   ) mm  = (  1.73 x 2.44  ) in
+		'B10'                    => array(87.874, 124.724), // = (   31 x 44   ) mm  = (  1.22 x 1.73  ) in
+		'B11'                    => array(62.362, 87.874), // = (   22 x 31   ) mm  = (  0.87 x 1.22  ) in
+		'B12'                    => array(42.520, 62.362), // = (   15 x 22   ) mm  = (  0.59 x 0.87  ) in
 		// ISO 216 C Series + 2 SIS 014711 extensions + 5 EXTENSION
-		'C0'                     => array( 2599.370,  3676.535), // = (  917 x 1297 ) mm  = ( 36.10 x 51.06 ) in
-		'C1'                     => array( 1836.850,  2599.370), // = (  648 x 917  ) mm  = ( 25.51 x 36.10 ) in
-		'C2'                     => array( 1298.268,  1836.850), // = (  458 x 648  ) mm  = ( 18.03 x 25.51 ) in
-		'C3'                     => array(  918.425,  1298.268), // = (  324 x 458  ) mm  = ( 12.76 x 18.03 ) in
-		'C4'                     => array(  649.134,   918.425), // = (  229 x 324  ) mm  = (  9.02 x 12.76 ) in
-		'C5'                     => array(  459.213,   649.134), // = (  162 x 229  ) mm  = (  6.38 x 9.02  ) in
-		'C6'                     => array(  323.150,   459.213), // = (  114 x 162  ) mm  = (  4.49 x 6.38  ) in
-		'C7'                     => array(  229.606,   323.150), // = (   81 x 114  ) mm  = (  3.19 x 4.49  ) in
-		'C8'                     => array(  161.575,   229.606), // = (   57 x 81   ) mm  = (  2.24 x 3.19  ) in
-		'C9'                     => array(  113.386,   161.575), // = (   40 x 57   ) mm  = (  1.57 x 2.24  ) in
-		'C10'                    => array(   79.370,   113.386), // = (   28 x 40   ) mm  = (  1.10 x 1.57  ) in
-		'C11'                    => array(   56.693,    79.370), // = (   20 x 28   ) mm  = (  0.79 x 1.10  ) in
-		'C12'                    => array(   39.685,    56.693), // = (   14 x 20   ) mm  = (  0.55 x 0.79  ) in
-		'C76'                    => array(  229.606,   459.213), // = (   81 x 162  ) mm  = (  3.19 x 6.38  ) in
-		'DL'                     => array(  311.811,   623.622), // = (  110 x 220  ) mm  = (  4.33 x 8.66  ) in
-		'DLE'                    => array(  323.150,   637.795), // = (  114 x 225  ) mm  = (  4.49 x 8.86  ) in
-		'DLX'                    => array(  340.158,   666.142), // = (  120 x 235  ) mm  = (  4.72 x 9.25  ) in
-		'DLP'                    => array(  280.630,   595.276), // = (   99 x 210  ) mm  = (  3.90 x 8.27  ) in (1/3 A4)
+		'C0'                     => array(2599.370, 3676.535), // = (  917 x 1297 ) mm  = ( 36.10 x 51.06 ) in
+		'C1'                     => array(1836.850, 2599.370), // = (  648 x 917  ) mm  = ( 25.51 x 36.10 ) in
+		'C2'                     => array(1298.268, 1836.850), // = (  458 x 648  ) mm  = ( 18.03 x 25.51 ) in
+		'C3'                     => array(918.425, 1298.268), // = (  324 x 458  ) mm  = ( 12.76 x 18.03 ) in
+		'C4'                     => array(649.134, 918.425), // = (  229 x 324  ) mm  = (  9.02 x 12.76 ) in
+		'C5'                     => array(459.213, 649.134), // = (  162 x 229  ) mm  = (  6.38 x 9.02  ) in
+		'C6'                     => array(323.150, 459.213), // = (  114 x 162  ) mm  = (  4.49 x 6.38  ) in
+		'C7'                     => array(229.606, 323.150), // = (   81 x 114  ) mm  = (  3.19 x 4.49  ) in
+		'C8'                     => array(161.575, 229.606), // = (   57 x 81   ) mm  = (  2.24 x 3.19  ) in
+		'C9'                     => array(113.386, 161.575), // = (   40 x 57   ) mm  = (  1.57 x 2.24  ) in
+		'C10'                    => array(79.370, 113.386), // = (   28 x 40   ) mm  = (  1.10 x 1.57  ) in
+		'C11'                    => array(56.693, 79.370), // = (   20 x 28   ) mm  = (  0.79 x 1.10  ) in
+		'C12'                    => array(39.685, 56.693), // = (   14 x 20   ) mm  = (  0.55 x 0.79  ) in
+		'C76'                    => array(229.606, 459.213), // = (   81 x 162  ) mm  = (  3.19 x 6.38  ) in
+		'DL'                     => array(311.811, 623.622), // = (  110 x 220  ) mm  = (  4.33 x 8.66  ) in
+		'DLE'                    => array(323.150, 637.795), // = (  114 x 225  ) mm  = (  4.49 x 8.86  ) in
+		'DLX'                    => array(340.158, 666.142), // = (  120 x 235  ) mm  = (  4.72 x 9.25  ) in
+		'DLP'                    => array(280.630, 595.276), // = (   99 x 210  ) mm  = (  3.90 x 8.27  ) in (1/3 A4)
 		// SIS 014711 E Series
-		'E0'                     => array( 2491.654,  3517.795), // = (  879 x 1241 ) mm  = ( 34.61 x 48.86 ) in
-		'E1'                     => array( 1757.480,  2491.654), // = (  620 x 879  ) mm  = ( 24.41 x 34.61 ) in
-		'E2'                     => array( 1247.244,  1757.480), // = (  440 x 620  ) mm  = ( 17.32 x 24.41 ) in
-		'E3'                     => array(  878.740,  1247.244), // = (  310 x 440  ) mm  = ( 12.20 x 17.32 ) in
-		'E4'                     => array(  623.622,   878.740), // = (  220 x 310  ) mm  = (  8.66 x 12.20 ) in
-		'E5'                     => array(  439.370,   623.622), // = (  155 x 220  ) mm  = (  6.10 x 8.66  ) in
-		'E6'                     => array(  311.811,   439.370), // = (  110 x 155  ) mm  = (  4.33 x 6.10  ) in
-		'E7'                     => array(  221.102,   311.811), // = (   78 x 110  ) mm  = (  3.07 x 4.33  ) in
-		'E8'                     => array(  155.906,   221.102), // = (   55 x 78   ) mm  = (  2.17 x 3.07  ) in
-		'E9'                     => array(  110.551,   155.906), // = (   39 x 55   ) mm  = (  1.54 x 2.17  ) in
-		'E10'                    => array(   76.535,   110.551), // = (   27 x 39   ) mm  = (  1.06 x 1.54  ) in
-		'E11'                    => array(   53.858,    76.535), // = (   19 x 27   ) mm  = (  0.75 x 1.06  ) in
-		'E12'                    => array(   36.850,    53.858), // = (   13 x 19   ) mm  = (  0.51 x 0.75  ) in
+		'E0'                     => array(2491.654, 3517.795), // = (  879 x 1241 ) mm  = ( 34.61 x 48.86 ) in
+		'E1'                     => array(1757.480, 2491.654), // = (  620 x 879  ) mm  = ( 24.41 x 34.61 ) in
+		'E2'                     => array(1247.244, 1757.480), // = (  440 x 620  ) mm  = ( 17.32 x 24.41 ) in
+		'E3'                     => array(878.740, 1247.244), // = (  310 x 440  ) mm  = ( 12.20 x 17.32 ) in
+		'E4'                     => array(623.622, 878.740), // = (  220 x 310  ) mm  = (  8.66 x 12.20 ) in
+		'E5'                     => array(439.370, 623.622), // = (  155 x 220  ) mm  = (  6.10 x 8.66  ) in
+		'E6'                     => array(311.811, 439.370), // = (  110 x 155  ) mm  = (  4.33 x 6.10  ) in
+		'E7'                     => array(221.102, 311.811), // = (   78 x 110  ) mm  = (  3.07 x 4.33  ) in
+		'E8'                     => array(155.906, 221.102), // = (   55 x 78   ) mm  = (  2.17 x 3.07  ) in
+		'E9'                     => array(110.551, 155.906), // = (   39 x 55   ) mm  = (  1.54 x 2.17  ) in
+		'E10'                    => array(76.535, 110.551), // = (   27 x 39   ) mm  = (  1.06 x 1.54  ) in
+		'E11'                    => array(53.858, 76.535), // = (   19 x 27   ) mm  = (  0.75 x 1.06  ) in
+		'E12'                    => array(36.850, 53.858), // = (   13 x 19   ) mm  = (  0.51 x 0.75  ) in
 		// SIS 014711 G Series
-		'G0'                     => array( 2715.591,  3838.110), // = (  958 x 1354 ) mm  = ( 37.72 x 53.31 ) in
-		'G1'                     => array( 1919.055,  2715.591), // = (  677 x 958  ) mm  = ( 26.65 x 37.72 ) in
-		'G2'                     => array( 1357.795,  1919.055), // = (  479 x 677  ) mm  = ( 18.86 x 26.65 ) in
-		'G3'                     => array(  958.110,  1357.795), // = (  338 x 479  ) mm  = ( 13.31 x 18.86 ) in
-		'G4'                     => array(  677.480,   958.110), // = (  239 x 338  ) mm  = (  9.41 x 13.31 ) in
-		'G5'                     => array(  479.055,   677.480), // = (  169 x 239  ) mm  = (  6.65 x 9.41  ) in
-		'G6'                     => array(  337.323,   479.055), // = (  119 x 169  ) mm  = (  4.69 x 6.65  ) in
-		'G7'                     => array(  238.110,   337.323), // = (   84 x 119  ) mm  = (  3.31 x 4.69  ) in
-		'G8'                     => array(  167.244,   238.110), // = (   59 x 84   ) mm  = (  2.32 x 3.31  ) in
-		'G9'                     => array(  119.055,   167.244), // = (   42 x 59   ) mm  = (  1.65 x 2.32  ) in
-		'G10'                    => array(   82.205,   119.055), // = (   29 x 42   ) mm  = (  1.14 x 1.65  ) in
-		'G11'                    => array(   59.528,    82.205), // = (   21 x 29   ) mm  = (  0.83 x 1.14  ) in
-		'G12'                    => array(   39.685,    59.528), // = (   14 x 21   ) mm  = (  0.55 x 0.83  ) in
+		'G0'                     => array(2715.591, 3838.110), // = (  958 x 1354 ) mm  = ( 37.72 x 53.31 ) in
+		'G1'                     => array(1919.055, 2715.591), // = (  677 x 958  ) mm  = ( 26.65 x 37.72 ) in
+		'G2'                     => array(1357.795, 1919.055), // = (  479 x 677  ) mm  = ( 18.86 x 26.65 ) in
+		'G3'                     => array(958.110, 1357.795), // = (  338 x 479  ) mm  = ( 13.31 x 18.86 ) in
+		'G4'                     => array(677.480, 958.110), // = (  239 x 338  ) mm  = (  9.41 x 13.31 ) in
+		'G5'                     => array(479.055, 677.480), // = (  169 x 239  ) mm  = (  6.65 x 9.41  ) in
+		'G6'                     => array(337.323, 479.055), // = (  119 x 169  ) mm  = (  4.69 x 6.65  ) in
+		'G7'                     => array(238.110, 337.323), // = (   84 x 119  ) mm  = (  3.31 x 4.69  ) in
+		'G8'                     => array(167.244, 238.110), // = (   59 x 84   ) mm  = (  2.32 x 3.31  ) in
+		'G9'                     => array(119.055, 167.244), // = (   42 x 59   ) mm  = (  1.65 x 2.32  ) in
+		'G10'                    => array(82.205, 119.055), // = (   29 x 42   ) mm  = (  1.14 x 1.65  ) in
+		'G11'                    => array(59.528, 82.205), // = (   21 x 29   ) mm  = (  0.83 x 1.14  ) in
+		'G12'                    => array(39.685, 59.528), // = (   14 x 21   ) mm  = (  0.55 x 0.83  ) in
 		// ISO Press
-		'RA0'                    => array( 2437.795,  3458.268), // = (  860 x 1220 ) mm  = ( 33.86 x 48.03 ) in
-		'RA1'                    => array( 1729.134,  2437.795), // = (  610 x 860  ) mm  = ( 24.02 x 33.86 ) in
-		'RA2'                    => array( 1218.898,  1729.134), // = (  430 x 610  ) mm  = ( 16.93 x 24.02 ) in
-		'RA3'                    => array(  864.567,  1218.898), // = (  305 x 430  ) mm  = ( 12.01 x 16.93 ) in
-		'RA4'                    => array(  609.449,   864.567), // = (  215 x 305  ) mm  = (  8.46 x 12.01 ) in
-		'SRA0'                   => array( 2551.181,  3628.346), // = (  900 x 1280 ) mm  = ( 35.43 x 50.39 ) in
-		'SRA1'                   => array( 1814.173,  2551.181), // = (  640 x 900  ) mm  = ( 25.20 x 35.43 ) in
-		'SRA2'                   => array( 1275.591,  1814.173), // = (  450 x 640  ) mm  = ( 17.72 x 25.20 ) in
-		'SRA3'                   => array(  907.087,  1275.591), // = (  320 x 450  ) mm  = ( 12.60 x 17.72 ) in
-		'SRA4'                   => array(  637.795,   907.087), // = (  225 x 320  ) mm  = (  8.86 x 12.60 ) in
+		'RA0'                    => array(2437.795, 3458.268), // = (  860 x 1220 ) mm  = ( 33.86 x 48.03 ) in
+		'RA1'                    => array(1729.134, 2437.795), // = (  610 x 860  ) mm  = ( 24.02 x 33.86 ) in
+		'RA2'                    => array(1218.898, 1729.134), // = (  430 x 610  ) mm  = ( 16.93 x 24.02 ) in
+		'RA3'                    => array(864.567, 1218.898), // = (  305 x 430  ) mm  = ( 12.01 x 16.93 ) in
+		'RA4'                    => array(609.449, 864.567), // = (  215 x 305  ) mm  = (  8.46 x 12.01 ) in
+		'SRA0'                   => array(2551.181, 3628.346), // = (  900 x 1280 ) mm  = ( 35.43 x 50.39 ) in
+		'SRA1'                   => array(1814.173, 2551.181), // = (  640 x 900  ) mm  = ( 25.20 x 35.43 ) in
+		'SRA2'                   => array(1275.591, 1814.173), // = (  450 x 640  ) mm  = ( 17.72 x 25.20 ) in
+		'SRA3'                   => array(907.087, 1275.591), // = (  320 x 450  ) mm  = ( 12.60 x 17.72 ) in
+		'SRA4'                   => array(637.795, 907.087), // = (  225 x 320  ) mm  = (  8.86 x 12.60 ) in
 		// German DIN 476
-		'4A0'                    => array( 4767.874,  6740.787), // = ( 1682 x 2378 ) mm  = ( 66.22 x 93.62 ) in
-		'2A0'                    => array( 3370.394,  4767.874), // = ( 1189 x 1682 ) mm  = ( 46.81 x 66.22 ) in
+		'4A0'                    => array(4767.874, 6740.787), // = ( 1682 x 2378 ) mm  = ( 66.22 x 93.62 ) in
+		'2A0'                    => array(3370.394, 4767.874), // = ( 1189 x 1682 ) mm  = ( 46.81 x 66.22 ) in
 		// Variations on the ISO Standard
-		'A2_EXTRA'               => array( 1261.417,  1754.646), // = (  445 x 619  ) mm  = ( 17.52 x 24.37 ) in
-		'A3+'                    => array(  932.598,  1369.134), // = (  329 x 483  ) mm  = ( 12.95 x 19.02 ) in
-		'A3_EXTRA'               => array(  912.756,  1261.417), // = (  322 x 445  ) mm  = ( 12.68 x 17.52 ) in
-		'A3_SUPER'               => array(  864.567,  1440.000), // = (  305 x 508  ) mm  = ( 12.01 x 20.00 ) in
-		'SUPER_A3'               => array(  864.567,  1380.472), // = (  305 x 487  ) mm  = ( 12.01 x 19.17 ) in
-		'A4_EXTRA'               => array(  666.142,   912.756), // = (  235 x 322  ) mm  = (  9.25 x 12.68 ) in
-		'A4_SUPER'               => array(  649.134,   912.756), // = (  229 x 322  ) mm  = (  9.02 x 12.68 ) in
-		'SUPER_A4'               => array(  643.465,  1009.134), // = (  227 x 356  ) mm  = (  8.94 x 14.02 ) in
-		'A4_LONG'                => array(  595.276,   986.457), // = (  210 x 348  ) mm  = (  8.27 x 13.70 ) in
-		'F4'                     => array(  595.276,   935.433), // = (  210 x 330  ) mm  = (  8.27 x 12.99 ) in
-		'SO_B5_EXTRA'            => array(  572.598,   782.362), // = (  202 x 276  ) mm  = (  7.95 x 10.87 ) in
-		'A5_EXTRA'               => array(  490.394,   666.142), // = (  173 x 235  ) mm  = (  6.81 x 9.25  ) in
+		'A2_EXTRA'               => array(1261.417, 1754.646), // = (  445 x 619  ) mm  = ( 17.52 x 24.37 ) in
+		'A3+'                    => array(932.598, 1369.134), // = (  329 x 483  ) mm  = ( 12.95 x 19.02 ) in
+		'A3_EXTRA'               => array(912.756, 1261.417), // = (  322 x 445  ) mm  = ( 12.68 x 17.52 ) in
+		'A3_SUPER'               => array(864.567, 1440.000), // = (  305 x 508  ) mm  = ( 12.01 x 20.00 ) in
+		'SUPER_A3'               => array(864.567, 1380.472), // = (  305 x 487  ) mm  = ( 12.01 x 19.17 ) in
+		'A4_EXTRA'               => array(666.142, 912.756), // = (  235 x 322  ) mm  = (  9.25 x 12.68 ) in
+		'A4_SUPER'               => array(649.134, 912.756), // = (  229 x 322  ) mm  = (  9.02 x 12.68 ) in
+		'SUPER_A4'               => array(643.465, 1009.134), // = (  227 x 356  ) mm  = (  8.94 x 14.02 ) in
+		'A4_LONG'                => array(595.276, 986.457), // = (  210 x 348  ) mm  = (  8.27 x 13.70 ) in
+		'F4'                     => array(595.276, 935.433), // = (  210 x 330  ) mm  = (  8.27 x 12.99 ) in
+		'SO_B5_EXTRA'            => array(572.598, 782.362), // = (  202 x 276  ) mm  = (  7.95 x 10.87 ) in
+		'A5_EXTRA'               => array(490.394, 666.142), // = (  173 x 235  ) mm  = (  6.81 x 9.25  ) in
 		// ANSI Series
-		'ANSI_E'                 => array( 2448.000,  3168.000), // = (  864 x 1118 ) mm  = ( 34.00 x 44.00 ) in
-		'ANSI_D'                 => array( 1584.000,  2448.000), // = (  559 x 864  ) mm  = ( 22.00 x 34.00 ) in
-		'ANSI_C'                 => array( 1224.000,  1584.000), // = (  432 x 559  ) mm  = ( 17.00 x 22.00 ) in
-		'ANSI_B'                 => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'ANSI_A'                 => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
+		'ANSI_E'                 => array(2448.000, 3168.000), // = (  864 x 1118 ) mm  = ( 34.00 x 44.00 ) in
+		'ANSI_D'                 => array(1584.000, 2448.000), // = (  559 x 864  ) mm  = ( 22.00 x 34.00 ) in
+		'ANSI_C'                 => array(1224.000, 1584.000), // = (  432 x 559  ) mm  = ( 17.00 x 22.00 ) in
+		'ANSI_B'                 => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
+		'ANSI_A'                 => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
 		// Traditional 'Loose' North American Paper Sizes
-		'USLEDGER'               => array( 1224.000,   792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
-		'LEDGER'                 => array( 1224.000,   792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
-		'ORGANIZERK'             => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'BIBLE'                  => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'USTABLOID'              => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'TABLOID'                => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
-		'ORGANIZERM'             => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		'USLETTER'               => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		'LETTER'                 => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
-		'USLEGAL'                => array(  612.000,  1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
-		'LEGAL'                  => array(  612.000,  1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
-		'GOVERNMENTLETTER'       => array(  576.000,   756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
-		'GLETTER'                => array(  576.000,   756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
-		'JUNIORLEGAL'            => array(  576.000,   360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
-		'JLEGAL'                 => array(  576.000,   360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
+		'USLEDGER'               => array(1224.000, 792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
+		'LEDGER'                 => array(1224.000, 792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
+		'ORGANIZERK'             => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
+		'BIBLE'                  => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
+		'USTABLOID'              => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
+		'TABLOID'                => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
+		'ORGANIZERM'             => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
+		'USLETTER'               => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
+		'LETTER'                 => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
+		'USLEGAL'                => array(612.000, 1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
+		'LEGAL'                  => array(612.000, 1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
+		'GOVERNMENTLETTER'       => array(576.000, 756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
+		'GLETTER'                => array(576.000, 756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
+		'JUNIORLEGAL'            => array(576.000, 360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
+		'JLEGAL'                 => array(576.000, 360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
 		// Other North American Paper Sizes
-		'QUADDEMY'               => array( 2520.000,  3240.000), // = (  889 x 1143 ) mm  = ( 35.00 x 45.00 ) in
-		'SUPER_B'                => array(  936.000,  1368.000), // = (  330 x 483  ) mm  = ( 13.00 x 19.00 ) in
-		'QUARTO'                 => array(  648.000,   792.000), // = (  229 x 279  ) mm  = (  9.00 x 11.00 ) in
-		'GOVERNMENTLEGAL'        => array(  612.000,   936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
-		'FOLIO'                  => array(  612.000,   936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
-		'MONARCH'                => array(  522.000,   756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
-		'EXECUTIVE'              => array(  522.000,   756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
-		'ORGANIZERL'             => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
-		'STATEMENT'              => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
-		'MEMO'                   => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
-		'FOOLSCAP'               => array(  595.440,   936.000), // = (  210 x 330  ) mm  = (  8.27 x 13.00 ) in
-		'COMPACT'                => array(  306.000,   486.000), // = (  108 x 171  ) mm  = (  4.25 x 6.75  ) in
-		'ORGANIZERJ'             => array(  198.000,   360.000), // = (   70 x 127  ) mm  = (  2.75 x 5.00  ) in
+		'QUADDEMY'               => array(2520.000, 3240.000), // = (  889 x 1143 ) mm  = ( 35.00 x 45.00 ) in
+		'SUPER_B'                => array(936.000, 1368.000), // = (  330 x 483  ) mm  = ( 13.00 x 19.00 ) in
+		'QUARTO'                 => array(648.000, 792.000), // = (  229 x 279  ) mm  = (  9.00 x 11.00 ) in
+		'GOVERNMENTLEGAL'        => array(612.000, 936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
+		'FOLIO'                  => array(612.000, 936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
+		'MONARCH'                => array(522.000, 756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
+		'EXECUTIVE'              => array(522.000, 756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
+		'ORGANIZERL'             => array(396.000, 612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
+		'STATEMENT'              => array(396.000, 612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
+		'MEMO'                   => array(396.000, 612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
+		'FOOLSCAP'               => array(595.440, 936.000), // = (  210 x 330  ) mm  = (  8.27 x 13.00 ) in
+		'COMPACT'                => array(306.000, 486.000), // = (  108 x 171  ) mm  = (  4.25 x 6.75  ) in
+		'ORGANIZERJ'             => array(198.000, 360.000), // = (   70 x 127  ) mm  = (  2.75 x 5.00  ) in
 		// Canadian standard CAN 2-9.60M
-		'P1'                     => array( 1587.402,  2437.795), // = (  560 x 860  ) mm  = ( 22.05 x 33.86 ) in
-		'P2'                     => array( 1218.898,  1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
-		'P3'                     => array(  793.701,  1218.898), // = (  280 x 430  ) mm  = ( 11.02 x 16.93 ) in
-		'P4'                     => array(  609.449,   793.701), // = (  215 x 280  ) mm  = (  8.46 x 11.02 ) in
-		'P5'                     => array(  396.850,   609.449), // = (  140 x 215  ) mm  = (  5.51 x 8.46  ) in
-		'P6'                     => array(  303.307,   396.850), // = (  107 x 140  ) mm  = (  4.21 x 5.51  ) in
+		'P1'                     => array(1587.402, 2437.795), // = (  560 x 860  ) mm  = ( 22.05 x 33.86 ) in
+		'P2'                     => array(1218.898, 1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
+		'P3'                     => array(793.701, 1218.898), // = (  280 x 430  ) mm  = ( 11.02 x 16.93 ) in
+		'P4'                     => array(609.449, 793.701), // = (  215 x 280  ) mm  = (  8.46 x 11.02 ) in
+		'P5'                     => array(396.850, 609.449), // = (  140 x 215  ) mm  = (  5.51 x 8.46  ) in
+		'P6'                     => array(303.307, 396.850), // = (  107 x 140  ) mm  = (  4.21 x 5.51  ) in
 		// North American Architectural Sizes
-		'ARCH_E'                 => array( 2592.000,  3456.000), // = (  914 x 1219 ) mm  = ( 36.00 x 48.00 ) in
-		'ARCH_E1'                => array( 2160.000,  3024.000), // = (  762 x 1067 ) mm  = ( 30.00 x 42.00 ) in
-		'ARCH_D'                 => array( 1728.000,  2592.000), // = (  610 x 914  ) mm  = ( 24.00 x 36.00 ) in
-		'BROADSHEET'             => array( 1296.000,  1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
-		'ARCH_C'                 => array( 1296.000,  1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
-		'ARCH_B'                 => array(  864.000,  1296.000), // = (  305 x 457  ) mm  = ( 12.00 x 18.00 ) in
-		'ARCH_A'                 => array(  648.000,   864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
+		'ARCH_E'                 => array(2592.000, 3456.000), // = (  914 x 1219 ) mm  = ( 36.00 x 48.00 ) in
+		'ARCH_E1'                => array(2160.000, 3024.000), // = (  762 x 1067 ) mm  = ( 30.00 x 42.00 ) in
+		'ARCH_D'                 => array(1728.000, 2592.000), // = (  610 x 914  ) mm  = ( 24.00 x 36.00 ) in
+		'BROADSHEET'             => array(1296.000, 1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
+		'ARCH_C'                 => array(1296.000, 1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
+		'ARCH_B'                 => array(864.000, 1296.000), // = (  305 x 457  ) mm  = ( 12.00 x 18.00 ) in
+		'ARCH_A'                 => array(648.000, 864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
 		// -- North American Envelope Sizes
 		// - Announcement Envelopes
-		'ANNENV_A2'              => array(  314.640,   414.000), // = (  111 x 146  ) mm  = (  4.37 x 5.75  ) in
-		'ANNENV_A6'              => array(  342.000,   468.000), // = (  121 x 165  ) mm  = (  4.75 x 6.50  ) in
-		'ANNENV_A7'              => array(  378.000,   522.000), // = (  133 x 184  ) mm  = (  5.25 x 7.25  ) in
-		'ANNENV_A8'              => array(  396.000,   584.640), // = (  140 x 206  ) mm  = (  5.50 x 8.12  ) in
-		'ANNENV_A10'             => array(  450.000,   692.640), // = (  159 x 244  ) mm  = (  6.25 x 9.62  ) in
-		'ANNENV_SLIM'            => array(  278.640,   638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
+		'ANNENV_A2'              => array(314.640, 414.000), // = (  111 x 146  ) mm  = (  4.37 x 5.75  ) in
+		'ANNENV_A6'              => array(342.000, 468.000), // = (  121 x 165  ) mm  = (  4.75 x 6.50  ) in
+		'ANNENV_A7'              => array(378.000, 522.000), // = (  133 x 184  ) mm  = (  5.25 x 7.25  ) in
+		'ANNENV_A8'              => array(396.000, 584.640), // = (  140 x 206  ) mm  = (  5.50 x 8.12  ) in
+		'ANNENV_A10'             => array(450.000, 692.640), // = (  159 x 244  ) mm  = (  6.25 x 9.62  ) in
+		'ANNENV_SLIM'            => array(278.640, 638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
 		// - Commercial Envelopes
-		'COMMENV_N6_1/4'         => array(  252.000,   432.000), // = (   89 x 152  ) mm  = (  3.50 x 6.00  ) in
-		'COMMENV_N6_3/4'         => array(  260.640,   468.000), // = (   92 x 165  ) mm  = (  3.62 x 6.50  ) in
-		'COMMENV_N8'             => array(  278.640,   540.000), // = (   98 x 191  ) mm  = (  3.87 x 7.50  ) in
-		'COMMENV_N9'             => array(  278.640,   638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
-		'COMMENV_N10'            => array(  296.640,   684.000), // = (  105 x 241  ) mm  = (  4.12 x 9.50  ) in
-		'COMMENV_N11'            => array(  324.000,   746.640), // = (  114 x 263  ) mm  = (  4.50 x 10.37 ) in
-		'COMMENV_N12'            => array(  342.000,   792.000), // = (  121 x 279  ) mm  = (  4.75 x 11.00 ) in
-		'COMMENV_N14'            => array(  360.000,   828.000), // = (  127 x 292  ) mm  = (  5.00 x 11.50 ) in
+		'COMMENV_N6_1/4'         => array(252.000, 432.000), // = (   89 x 152  ) mm  = (  3.50 x 6.00  ) in
+		'COMMENV_N6_3/4'         => array(260.640, 468.000), // = (   92 x 165  ) mm  = (  3.62 x 6.50  ) in
+		'COMMENV_N8'             => array(278.640, 540.000), // = (   98 x 191  ) mm  = (  3.87 x 7.50  ) in
+		'COMMENV_N9'             => array(278.640, 638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
+		'COMMENV_N10'            => array(296.640, 684.000), // = (  105 x 241  ) mm  = (  4.12 x 9.50  ) in
+		'COMMENV_N11'            => array(324.000, 746.640), // = (  114 x 263  ) mm  = (  4.50 x 10.37 ) in
+		'COMMENV_N12'            => array(342.000, 792.000), // = (  121 x 279  ) mm  = (  4.75 x 11.00 ) in
+		'COMMENV_N14'            => array(360.000, 828.000), // = (  127 x 292  ) mm  = (  5.00 x 11.50 ) in
 		// - Catalogue Envelopes
-		'CATENV_N1'              => array(  432.000,   648.000), // = (  152 x 229  ) mm  = (  6.00 x 9.00  ) in
-		'CATENV_N1_3/4'          => array(  468.000,   684.000), // = (  165 x 241  ) mm  = (  6.50 x 9.50  ) in
-		'CATENV_N2'              => array(  468.000,   720.000), // = (  165 x 254  ) mm  = (  6.50 x 10.00 ) in
-		'CATENV_N3'              => array(  504.000,   720.000), // = (  178 x 254  ) mm  = (  7.00 x 10.00 ) in
-		'CATENV_N6'              => array(  540.000,   756.000), // = (  191 x 267  ) mm  = (  7.50 x 10.50 ) in
-		'CATENV_N7'              => array(  576.000,   792.000), // = (  203 x 279  ) mm  = (  8.00 x 11.00 ) in
-		'CATENV_N8'              => array(  594.000,   810.000), // = (  210 x 286  ) mm  = (  8.25 x 11.25 ) in
-		'CATENV_N9_1/2'          => array(  612.000,   756.000), // = (  216 x 267  ) mm  = (  8.50 x 10.50 ) in
-		'CATENV_N9_3/4'          => array(  630.000,   810.000), // = (  222 x 286  ) mm  = (  8.75 x 11.25 ) in
-		'CATENV_N10_1/2'         => array(  648.000,   864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
-		'CATENV_N12_1/2'         => array(  684.000,   900.000), // = (  241 x 318  ) mm  = (  9.50 x 12.50 ) in
-		'CATENV_N13_1/2'         => array(  720.000,   936.000), // = (  254 x 330  ) mm  = ( 10.00 x 13.00 ) in
-		'CATENV_N14_1/4'         => array(  810.000,   882.000), // = (  286 x 311  ) mm  = ( 11.25 x 12.25 ) in
-		'CATENV_N14_1/2'         => array(  828.000,  1044.000), // = (  292 x 368  ) mm  = ( 11.50 x 14.50 ) in
+		'CATENV_N1'              => array(432.000, 648.000), // = (  152 x 229  ) mm  = (  6.00 x 9.00  ) in
+		'CATENV_N1_3/4'          => array(468.000, 684.000), // = (  165 x 241  ) mm  = (  6.50 x 9.50  ) in
+		'CATENV_N2'              => array(468.000, 720.000), // = (  165 x 254  ) mm  = (  6.50 x 10.00 ) in
+		'CATENV_N3'              => array(504.000, 720.000), // = (  178 x 254  ) mm  = (  7.00 x 10.00 ) in
+		'CATENV_N6'              => array(540.000, 756.000), // = (  191 x 267  ) mm  = (  7.50 x 10.50 ) in
+		'CATENV_N7'              => array(576.000, 792.000), // = (  203 x 279  ) mm  = (  8.00 x 11.00 ) in
+		'CATENV_N8'              => array(594.000, 810.000), // = (  210 x 286  ) mm  = (  8.25 x 11.25 ) in
+		'CATENV_N9_1/2'          => array(612.000, 756.000), // = (  216 x 267  ) mm  = (  8.50 x 10.50 ) in
+		'CATENV_N9_3/4'          => array(630.000, 810.000), // = (  222 x 286  ) mm  = (  8.75 x 11.25 ) in
+		'CATENV_N10_1/2'         => array(648.000, 864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
+		'CATENV_N12_1/2'         => array(684.000, 900.000), // = (  241 x 318  ) mm  = (  9.50 x 12.50 ) in
+		'CATENV_N13_1/2'         => array(720.000, 936.000), // = (  254 x 330  ) mm  = ( 10.00 x 13.00 ) in
+		'CATENV_N14_1/4'         => array(810.000, 882.000), // = (  286 x 311  ) mm  = ( 11.25 x 12.25 ) in
+		'CATENV_N14_1/2'         => array(828.000, 1044.000), // = (  292 x 368  ) mm  = ( 11.50 x 14.50 ) in
 		// Japanese (JIS P 0138-61) Standard B-Series
-		'JIS_B0'                 => array( 2919.685,  4127.244), // = ( 1030 x 1456 ) mm  = ( 40.55 x 57.32 ) in
-		'JIS_B1'                 => array( 2063.622,  2919.685), // = (  728 x 1030 ) mm  = ( 28.66 x 40.55 ) in
-		'JIS_B2'                 => array( 1459.843,  2063.622), // = (  515 x 728  ) mm  = ( 20.28 x 28.66 ) in
-		'JIS_B3'                 => array( 1031.811,  1459.843), // = (  364 x 515  ) mm  = ( 14.33 x 20.28 ) in
-		'JIS_B4'                 => array(  728.504,  1031.811), // = (  257 x 364  ) mm  = ( 10.12 x 14.33 ) in
-		'JIS_B5'                 => array(  515.906,   728.504), // = (  182 x 257  ) mm  = (  7.17 x 10.12 ) in
-		'JIS_B6'                 => array(  362.835,   515.906), // = (  128 x 182  ) mm  = (  5.04 x 7.17  ) in
-		'JIS_B7'                 => array(  257.953,   362.835), // = (   91 x 128  ) mm  = (  3.58 x 5.04  ) in
-		'JIS_B8'                 => array(  181.417,   257.953), // = (   64 x 91   ) mm  = (  2.52 x 3.58  ) in
-		'JIS_B9'                 => array(  127.559,   181.417), // = (   45 x 64   ) mm  = (  1.77 x 2.52  ) in
-		'JIS_B10'                => array(   90.709,   127.559), // = (   32 x 45   ) mm  = (  1.26 x 1.77  ) in
-		'JIS_B11'                => array(   62.362,    90.709), // = (   22 x 32   ) mm  = (  0.87 x 1.26  ) in
-		'JIS_B12'                => array(   45.354,    62.362), // = (   16 x 22   ) mm  = (  0.63 x 0.87  ) in
+		'JIS_B0'                 => array(2919.685, 4127.244), // = ( 1030 x 1456 ) mm  = ( 40.55 x 57.32 ) in
+		'JIS_B1'                 => array(2063.622, 2919.685), // = (  728 x 1030 ) mm  = ( 28.66 x 40.55 ) in
+		'JIS_B2'                 => array(1459.843, 2063.622), // = (  515 x 728  ) mm  = ( 20.28 x 28.66 ) in
+		'JIS_B3'                 => array(1031.811, 1459.843), // = (  364 x 515  ) mm  = ( 14.33 x 20.28 ) in
+		'JIS_B4'                 => array(728.504, 1031.811), // = (  257 x 364  ) mm  = ( 10.12 x 14.33 ) in
+		'JIS_B5'                 => array(515.906, 728.504), // = (  182 x 257  ) mm  = (  7.17 x 10.12 ) in
+		'JIS_B6'                 => array(362.835, 515.906), // = (  128 x 182  ) mm  = (  5.04 x 7.17  ) in
+		'JIS_B7'                 => array(257.953, 362.835), // = (   91 x 128  ) mm  = (  3.58 x 5.04  ) in
+		'JIS_B8'                 => array(181.417, 257.953), // = (   64 x 91   ) mm  = (  2.52 x 3.58  ) in
+		'JIS_B9'                 => array(127.559, 181.417), // = (   45 x 64   ) mm  = (  1.77 x 2.52  ) in
+		'JIS_B10'                => array(90.709, 127.559), // = (   32 x 45   ) mm  = (  1.26 x 1.77  ) in
+		'JIS_B11'                => array(62.362, 90.709), // = (   22 x 32   ) mm  = (  0.87 x 1.26  ) in
+		'JIS_B12'                => array(45.354, 62.362), // = (   16 x 22   ) mm  = (  0.63 x 0.87  ) in
 		// PA Series
-		'PA0'                    => array( 2381.102,  3174.803), // = (  840 x 1120 ) mm  = ( 33.07 x 44.09 ) in
-		'PA1'                    => array( 1587.402,  2381.102), // = (  560 x 840  ) mm  = ( 22.05 x 33.07 ) in
-		'PA2'                    => array( 1190.551,  1587.402), // = (  420 x 560  ) mm  = ( 16.54 x 22.05 ) in
-		'PA3'                    => array(  793.701,  1190.551), // = (  280 x 420  ) mm  = ( 11.02 x 16.54 ) in
-		'PA4'                    => array(  595.276,   793.701), // = (  210 x 280  ) mm  = (  8.27 x 11.02 ) in
-		'PA5'                    => array(  396.850,   595.276), // = (  140 x 210  ) mm  = (  5.51 x 8.27  ) in
-		'PA6'                    => array(  297.638,   396.850), // = (  105 x 140  ) mm  = (  4.13 x 5.51  ) in
-		'PA7'                    => array(  198.425,   297.638), // = (   70 x 105  ) mm  = (  2.76 x 4.13  ) in
-		'PA8'                    => array(  147.402,   198.425), // = (   52 x 70   ) mm  = (  2.05 x 2.76  ) in
-		'PA9'                    => array(   99.213,   147.402), // = (   35 x 52   ) mm  = (  1.38 x 2.05  ) in
-		'PA10'                   => array(   73.701,    99.213), // = (   26 x 35   ) mm  = (  1.02 x 1.38  ) in
+		'PA0'                    => array(2381.102, 3174.803), // = (  840 x 1120 ) mm  = ( 33.07 x 44.09 ) in
+		'PA1'                    => array(1587.402, 2381.102), // = (  560 x 840  ) mm  = ( 22.05 x 33.07 ) in
+		'PA2'                    => array(1190.551, 1587.402), // = (  420 x 560  ) mm  = ( 16.54 x 22.05 ) in
+		'PA3'                    => array(793.701, 1190.551), // = (  280 x 420  ) mm  = ( 11.02 x 16.54 ) in
+		'PA4'                    => array(595.276, 793.701), // = (  210 x 280  ) mm  = (  8.27 x 11.02 ) in
+		'PA5'                    => array(396.850, 595.276), // = (  140 x 210  ) mm  = (  5.51 x 8.27  ) in
+		'PA6'                    => array(297.638, 396.850), // = (  105 x 140  ) mm  = (  4.13 x 5.51  ) in
+		'PA7'                    => array(198.425, 297.638), // = (   70 x 105  ) mm  = (  2.76 x 4.13  ) in
+		'PA8'                    => array(147.402, 198.425), // = (   52 x 70   ) mm  = (  2.05 x 2.76  ) in
+		'PA9'                    => array(99.213, 147.402), // = (   35 x 52   ) mm  = (  1.38 x 2.05  ) in
+		'PA10'                   => array(73.701, 99.213), // = (   26 x 35   ) mm  = (  1.02 x 1.38  ) in
 		// Standard Photographic Print Sizes
-		'PASSPORT_PHOTO'         => array(   99.213,   127.559), // = (   35 x 45   ) mm  = (  1.38 x 1.77  ) in
-		'E'                      => array(  233.858,   340.157), // = (   82 x 120  ) mm  = (  3.25 x 4.72  ) in
-		'L'                      => array(  252.283,   360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
-		'3R'                     => array(  252.283,   360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
-		'KG'                     => array(  289.134,   430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
-		'4R'                     => array(  289.134,   430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
-		'4D'                     => array(  340.157,   430.866), // = (  120 x 152  ) mm  = (  4.72 x 5.98  ) in
-		'2L'                     => array(  360.000,   504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
-		'5R'                     => array(  360.000,   504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
-		'8P'                     => array(  430.866,   575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
-		'6R'                     => array(  430.866,   575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
-		'6P'                     => array(  575.433,   720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
-		'8R'                     => array(  575.433,   720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
-		'6PW'                    => array(  575.433,   864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
-		'S8R'                    => array(  575.433,   864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
-		'4P'                     => array(  720.000,   864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
-		'10R'                    => array(  720.000,   864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
-		'4PW'                    => array(  720.000,  1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
-		'S10R'                   => array(  720.000,  1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
-		'11R'                    => array(  790.866,  1009.134), // = (  279 x 356  ) mm  = ( 10.98 x 14.02 ) in
-		'S11R'                   => array(  790.866,  1224.567), // = (  279 x 432  ) mm  = ( 10.98 x 17.01 ) in
-		'12R'                    => array(  864.567,  1080.000), // = (  305 x 381  ) mm  = ( 12.01 x 15.00 ) in
-		'S12R'                   => array(  864.567,  1292.598), // = (  305 x 456  ) mm  = ( 12.01 x 17.95 ) in
+		'PASSPORT_PHOTO'         => array(99.213, 127.559), // = (   35 x 45   ) mm  = (  1.38 x 1.77  ) in
+		'E'                      => array(233.858, 340.157), // = (   82 x 120  ) mm  = (  3.25 x 4.72  ) in
+		'L'                      => array(252.283, 360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
+		'3R'                     => array(252.283, 360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
+		'KG'                     => array(289.134, 430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
+		'4R'                     => array(289.134, 430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
+		'4D'                     => array(340.157, 430.866), // = (  120 x 152  ) mm  = (  4.72 x 5.98  ) in
+		'2L'                     => array(360.000, 504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
+		'5R'                     => array(360.000, 504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
+		'8P'                     => array(430.866, 575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
+		'6R'                     => array(430.866, 575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
+		'6P'                     => array(575.433, 720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
+		'8R'                     => array(575.433, 720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
+		'6PW'                    => array(575.433, 864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
+		'S8R'                    => array(575.433, 864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
+		'4P'                     => array(720.000, 864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
+		'10R'                    => array(720.000, 864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
+		'4PW'                    => array(720.000, 1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
+		'S10R'                   => array(720.000, 1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
+		'11R'                    => array(790.866, 1009.134), // = (  279 x 356  ) mm  = ( 10.98 x 14.02 ) in
+		'S11R'                   => array(790.866, 1224.567), // = (  279 x 432  ) mm  = ( 10.98 x 17.01 ) in
+		'12R'                    => array(864.567, 1080.000), // = (  305 x 381  ) mm  = ( 12.01 x 15.00 ) in
+		'S12R'                   => array(864.567, 1292.598), // = (  305 x 456  ) mm  = ( 12.01 x 17.95 ) in
 		// Common Newspaper Sizes
-		'NEWSPAPER_BROADSHEET'   => array( 2125.984,  1700.787), // = (  750 x 600  ) mm  = ( 29.53 x 23.62 ) in
-		'NEWSPAPER_BERLINER'     => array( 1332.283,   892.913), // = (  470 x 315  ) mm  = ( 18.50 x 12.40 ) in
-		'NEWSPAPER_TABLOID'      => array( 1218.898,   793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
-		'NEWSPAPER_COMPACT'      => array( 1218.898,   793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
+		'NEWSPAPER_BROADSHEET'   => array(2125.984, 1700.787), // = (  750 x 600  ) mm  = ( 29.53 x 23.62 ) in
+		'NEWSPAPER_BERLINER'     => array(1332.283, 892.913), // = (  470 x 315  ) mm  = ( 18.50 x 12.40 ) in
+		'NEWSPAPER_TABLOID'      => array(1218.898, 793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
+		'NEWSPAPER_COMPACT'      => array(1218.898, 793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
 		// Business Cards
-		'CREDIT_CARD'            => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
-		'BUSINESS_CARD'          => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
-		'BUSINESS_CARD_ISO7810'  => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
-		'BUSINESS_CARD_ISO216'   => array(  147.402,   209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
-		'BUSINESS_CARD_IT'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_UK'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_FR'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_DE'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_ES'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
-		'BUSINESS_CARD_CA'       => array(  144.567,   252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
-		'BUSINESS_CARD_US'       => array(  144.567,   252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
-		'BUSINESS_CARD_JP'       => array(  155.906,   257.953), // = (   55 x 91   ) mm  = (  2.17 x 3.58  ) in
-		'BUSINESS_CARD_HK'       => array(  153.071,   255.118), // = (   54 x 90   ) mm  = (  2.13 x 3.54  ) in
-		'BUSINESS_CARD_AU'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
-		'BUSINESS_CARD_DK'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
-		'BUSINESS_CARD_SE'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
-		'BUSINESS_CARD_RU'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_CZ'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_FI'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_HU'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
-		'BUSINESS_CARD_IL'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
+		'CREDIT_CARD'            => array(153.014, 242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
+		'BUSINESS_CARD'          => array(153.014, 242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
+		'BUSINESS_CARD_ISO7810'  => array(153.014, 242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
+		'BUSINESS_CARD_ISO216'   => array(147.402, 209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
+		'BUSINESS_CARD_IT'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
+		'BUSINESS_CARD_UK'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
+		'BUSINESS_CARD_FR'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
+		'BUSINESS_CARD_DE'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
+		'BUSINESS_CARD_ES'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
+		'BUSINESS_CARD_CA'       => array(144.567, 252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
+		'BUSINESS_CARD_US'       => array(144.567, 252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
+		'BUSINESS_CARD_JP'       => array(155.906, 257.953), // = (   55 x 91   ) mm  = (  2.17 x 3.58  ) in
+		'BUSINESS_CARD_HK'       => array(153.071, 255.118), // = (   54 x 90   ) mm  = (  2.13 x 3.54  ) in
+		'BUSINESS_CARD_AU'       => array(155.906, 255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
+		'BUSINESS_CARD_DK'       => array(155.906, 255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
+		'BUSINESS_CARD_SE'       => array(155.906, 255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
+		'BUSINESS_CARD_RU'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
+		'BUSINESS_CARD_CZ'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
+		'BUSINESS_CARD_FI'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
+		'BUSINESS_CARD_HU'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
+		'BUSINESS_CARD_IL'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
 		// Billboards
-		'4SHEET'                 => array( 2880.000,  4320.000), // = ( 1016 x 1524 ) mm  = ( 40.00 x 60.00 ) in
-		'6SHEET'                 => array( 3401.575,  5102.362), // = ( 1200 x 1800 ) mm  = ( 47.24 x 70.87 ) in
-		'12SHEET'                => array( 8640.000,  4320.000), // = ( 3048 x 1524 ) mm  = (120.00 x 60.00 ) in
-		'16SHEET'                => array( 5760.000,  8640.000), // = ( 2032 x 3048 ) mm  = ( 80.00 x 120.00) in
-		'32SHEET'                => array(11520.000,  8640.000), // = ( 4064 x 3048 ) mm  = (160.00 x 120.00) in
-		'48SHEET'                => array(17280.000,  8640.000), // = ( 6096 x 3048 ) mm  = (240.00 x 120.00) in
-		'64SHEET'                => array(23040.000,  8640.000), // = ( 8128 x 3048 ) mm  = (320.00 x 120.00) in
-		'96SHEET'                => array(34560.000,  8640.000), // = (12192 x 3048 ) mm  = (480.00 x 120.00) in
+		'4SHEET'                 => array(2880.000, 4320.000), // = ( 1016 x 1524 ) mm  = ( 40.00 x 60.00 ) in
+		'6SHEET'                 => array(3401.575, 5102.362), // = ( 1200 x 1800 ) mm  = ( 47.24 x 70.87 ) in
+		'12SHEET'                => array(8640.000, 4320.000), // = ( 3048 x 1524 ) mm  = (120.00 x 60.00 ) in
+		'16SHEET'                => array(5760.000, 8640.000), // = ( 2032 x 3048 ) mm  = ( 80.00 x 120.00) in
+		'32SHEET'                => array(11520.000, 8640.000), // = ( 4064 x 3048 ) mm  = (160.00 x 120.00) in
+		'48SHEET'                => array(17280.000, 8640.000), // = ( 6096 x 3048 ) mm  = (240.00 x 120.00) in
+		'64SHEET'                => array(23040.000, 8640.000), // = ( 8128 x 3048 ) mm  = (320.00 x 120.00) in
+		'96SHEET'                => array(34560.000, 8640.000), // = (12192 x 3048 ) mm  = (480.00 x 120.00) in
 		// -- Old European Sizes
 		// - Old Imperial English Sizes
-		'EN_EMPEROR'             => array( 3456.000,  5184.000), // = ( 1219 x 1829 ) mm  = ( 48.00 x 72.00 ) in
-		'EN_ANTIQUARIAN'         => array( 2232.000,  3816.000), // = (  787 x 1346 ) mm  = ( 31.00 x 53.00 ) in
-		'EN_GRAND_EAGLE'         => array( 2070.000,  3024.000), // = (  730 x 1067 ) mm  = ( 28.75 x 42.00 ) in
-		'EN_DOUBLE_ELEPHANT'     => array( 1926.000,  2880.000), // = (  679 x 1016 ) mm  = ( 26.75 x 40.00 ) in
-		'EN_ATLAS'               => array( 1872.000,  2448.000), // = (  660 x 864  ) mm  = ( 26.00 x 34.00 ) in
-		'EN_COLOMBIER'           => array( 1692.000,  2484.000), // = (  597 x 876  ) mm  = ( 23.50 x 34.50 ) in
-		'EN_ELEPHANT'            => array( 1656.000,  2016.000), // = (  584 x 711  ) mm  = ( 23.00 x 28.00 ) in
-		'EN_DOUBLE_DEMY'         => array( 1620.000,  2556.000), // = (  572 x 902  ) mm  = ( 22.50 x 35.50 ) in
-		'EN_IMPERIAL'            => array( 1584.000,  2160.000), // = (  559 x 762  ) mm  = ( 22.00 x 30.00 ) in
-		'EN_PRINCESS'            => array( 1548.000,  2016.000), // = (  546 x 711  ) mm  = ( 21.50 x 28.00 ) in
-		'EN_CARTRIDGE'           => array( 1512.000,  1872.000), // = (  533 x 660  ) mm  = ( 21.00 x 26.00 ) in
-		'EN_DOUBLE_LARGE_POST'   => array( 1512.000,  2376.000), // = (  533 x 838  ) mm  = ( 21.00 x 33.00 ) in
-		'EN_ROYAL'               => array( 1440.000,  1800.000), // = (  508 x 635  ) mm  = ( 20.00 x 25.00 ) in
-		'EN_SHEET'               => array( 1404.000,  1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
-		'EN_HALF_POST'           => array( 1404.000,  1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
-		'EN_SUPER_ROYAL'         => array( 1368.000,  1944.000), // = (  483 x 686  ) mm  = ( 19.00 x 27.00 ) in
-		'EN_DOUBLE_POST'         => array( 1368.000,  2196.000), // = (  483 x 775  ) mm  = ( 19.00 x 30.50 ) in
-		'EN_MEDIUM'              => array( 1260.000,  1656.000), // = (  445 x 584  ) mm  = ( 17.50 x 23.00 ) in
-		'EN_DEMY'                => array( 1260.000,  1620.000), // = (  445 x 572  ) mm  = ( 17.50 x 22.50 ) in
-		'EN_LARGE_POST'          => array( 1188.000,  1512.000), // = (  419 x 533  ) mm  = ( 16.50 x 21.00 ) in
-		'EN_COPY_DRAUGHT'        => array( 1152.000,  1440.000), // = (  406 x 508  ) mm  = ( 16.00 x 20.00 ) in
-		'EN_POST'                => array( 1116.000,  1386.000), // = (  394 x 489  ) mm  = ( 15.50 x 19.25 ) in
-		'EN_CROWN'               => array( 1080.000,  1440.000), // = (  381 x 508  ) mm  = ( 15.00 x 20.00 ) in
-		'EN_PINCHED_POST'        => array( 1062.000,  1332.000), // = (  375 x 470  ) mm  = ( 14.75 x 18.50 ) in
-		'EN_BRIEF'               => array(  972.000,  1152.000), // = (  343 x 406  ) mm  = ( 13.50 x 16.00 ) in
-		'EN_FOOLSCAP'            => array(  972.000,  1224.000), // = (  343 x 432  ) mm  = ( 13.50 x 17.00 ) in
-		'EN_SMALL_FOOLSCAP'      => array(  954.000,  1188.000), // = (  337 x 419  ) mm  = ( 13.25 x 16.50 ) in
-		'EN_POTT'                => array(  900.000,  1080.000), // = (  318 x 381  ) mm  = ( 12.50 x 15.00 ) in
+		'EN_EMPEROR'             => array(3456.000, 5184.000), // = ( 1219 x 1829 ) mm  = ( 48.00 x 72.00 ) in
+		'EN_ANTIQUARIAN'         => array(2232.000, 3816.000), // = (  787 x 1346 ) mm  = ( 31.00 x 53.00 ) in
+		'EN_GRAND_EAGLE'         => array(2070.000, 3024.000), // = (  730 x 1067 ) mm  = ( 28.75 x 42.00 ) in
+		'EN_DOUBLE_ELEPHANT'     => array(1926.000, 2880.000), // = (  679 x 1016 ) mm  = ( 26.75 x 40.00 ) in
+		'EN_ATLAS'               => array(1872.000, 2448.000), // = (  660 x 864  ) mm  = ( 26.00 x 34.00 ) in
+		'EN_COLOMBIER'           => array(1692.000, 2484.000), // = (  597 x 876  ) mm  = ( 23.50 x 34.50 ) in
+		'EN_ELEPHANT'            => array(1656.000, 2016.000), // = (  584 x 711  ) mm  = ( 23.00 x 28.00 ) in
+		'EN_DOUBLE_DEMY'         => array(1620.000, 2556.000), // = (  572 x 902  ) mm  = ( 22.50 x 35.50 ) in
+		'EN_IMPERIAL'            => array(1584.000, 2160.000), // = (  559 x 762  ) mm  = ( 22.00 x 30.00 ) in
+		'EN_PRINCESS'            => array(1548.000, 2016.000), // = (  546 x 711  ) mm  = ( 21.50 x 28.00 ) in
+		'EN_CARTRIDGE'           => array(1512.000, 1872.000), // = (  533 x 660  ) mm  = ( 21.00 x 26.00 ) in
+		'EN_DOUBLE_LARGE_POST'   => array(1512.000, 2376.000), // = (  533 x 838  ) mm  = ( 21.00 x 33.00 ) in
+		'EN_ROYAL'               => array(1440.000, 1800.000), // = (  508 x 635  ) mm  = ( 20.00 x 25.00 ) in
+		'EN_SHEET'               => array(1404.000, 1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
+		'EN_HALF_POST'           => array(1404.000, 1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
+		'EN_SUPER_ROYAL'         => array(1368.000, 1944.000), // = (  483 x 686  ) mm  = ( 19.00 x 27.00 ) in
+		'EN_DOUBLE_POST'         => array(1368.000, 2196.000), // = (  483 x 775  ) mm  = ( 19.00 x 30.50 ) in
+		'EN_MEDIUM'              => array(1260.000, 1656.000), // = (  445 x 584  ) mm  = ( 17.50 x 23.00 ) in
+		'EN_DEMY'                => array(1260.000, 1620.000), // = (  445 x 572  ) mm  = ( 17.50 x 22.50 ) in
+		'EN_LARGE_POST'          => array(1188.000, 1512.000), // = (  419 x 533  ) mm  = ( 16.50 x 21.00 ) in
+		'EN_COPY_DRAUGHT'        => array(1152.000, 1440.000), // = (  406 x 508  ) mm  = ( 16.00 x 20.00 ) in
+		'EN_POST'                => array(1116.000, 1386.000), // = (  394 x 489  ) mm  = ( 15.50 x 19.25 ) in
+		'EN_CROWN'               => array(1080.000, 1440.000), // = (  381 x 508  ) mm  = ( 15.00 x 20.00 ) in
+		'EN_PINCHED_POST'        => array(1062.000, 1332.000), // = (  375 x 470  ) mm  = ( 14.75 x 18.50 ) in
+		'EN_BRIEF'               => array(972.000, 1152.000), // = (  343 x 406  ) mm  = ( 13.50 x 16.00 ) in
+		'EN_FOOLSCAP'            => array(972.000, 1224.000), // = (  343 x 432  ) mm  = ( 13.50 x 17.00 ) in
+		'EN_SMALL_FOOLSCAP'      => array(954.000, 1188.000), // = (  337 x 419  ) mm  = ( 13.25 x 16.50 ) in
+		'EN_POTT'                => array(900.000, 1080.000), // = (  318 x 381  ) mm  = ( 12.50 x 15.00 ) in
 		// - Old Imperial Belgian Sizes
-		'BE_GRAND_AIGLE'         => array( 1984.252,  2948.031), // = (  700 x 1040 ) mm  = ( 27.56 x 40.94 ) in
-		'BE_COLOMBIER'           => array( 1757.480,  2409.449), // = (  620 x 850  ) mm  = ( 24.41 x 33.46 ) in
-		'BE_DOUBLE_CARRE'        => array( 1757.480,  2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
-		'BE_ELEPHANT'            => array( 1746.142,  2182.677), // = (  616 x 770  ) mm  = ( 24.25 x 30.31 ) in
-		'BE_PETIT_AIGLE'         => array( 1700.787,  2381.102), // = (  600 x 840  ) mm  = ( 23.62 x 33.07 ) in
-		'BE_GRAND_JESUS'         => array( 1559.055,  2069.291), // = (  550 x 730  ) mm  = ( 21.65 x 28.74 ) in
-		'BE_JESUS'               => array( 1530.709,  2069.291), // = (  540 x 730  ) mm  = ( 21.26 x 28.74 ) in
-		'BE_RAISIN'              => array( 1417.323,  1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
-		'BE_GRAND_MEDIAN'        => array( 1303.937,  1714.961), // = (  460 x 605  ) mm  = ( 18.11 x 23.82 ) in
-		'BE_DOUBLE_POSTE'        => array( 1233.071,  1601.575), // = (  435 x 565  ) mm  = ( 17.13 x 22.24 ) in
-		'BE_COQUILLE'            => array( 1218.898,  1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
-		'BE_PETIT_MEDIAN'        => array( 1176.378,  1502.362), // = (  415 x 530  ) mm  = ( 16.34 x 20.87 ) in
-		'BE_RUCHE'               => array( 1020.472,  1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
-		'BE_PROPATRIA'           => array(  977.953,  1218.898), // = (  345 x 430  ) mm  = ( 13.58 x 16.93 ) in
-		'BE_LYS'                 => array(  898.583,  1125.354), // = (  317 x 397  ) mm  = ( 12.48 x 15.63 ) in
-		'BE_POT'                 => array(  870.236,  1088.504), // = (  307 x 384  ) mm  = ( 12.09 x 15.12 ) in
-		'BE_ROSETTE'             => array(  765.354,   983.622), // = (  270 x 347  ) mm  = ( 10.63 x 13.66 ) in
+		'BE_GRAND_AIGLE'         => array(1984.252, 2948.031), // = (  700 x 1040 ) mm  = ( 27.56 x 40.94 ) in
+		'BE_COLOMBIER'           => array(1757.480, 2409.449), // = (  620 x 850  ) mm  = ( 24.41 x 33.46 ) in
+		'BE_DOUBLE_CARRE'        => array(1757.480, 2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
+		'BE_ELEPHANT'            => array(1746.142, 2182.677), // = (  616 x 770  ) mm  = ( 24.25 x 30.31 ) in
+		'BE_PETIT_AIGLE'         => array(1700.787, 2381.102), // = (  600 x 840  ) mm  = ( 23.62 x 33.07 ) in
+		'BE_GRAND_JESUS'         => array(1559.055, 2069.291), // = (  550 x 730  ) mm  = ( 21.65 x 28.74 ) in
+		'BE_JESUS'               => array(1530.709, 2069.291), // = (  540 x 730  ) mm  = ( 21.26 x 28.74 ) in
+		'BE_RAISIN'              => array(1417.323, 1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
+		'BE_GRAND_MEDIAN'        => array(1303.937, 1714.961), // = (  460 x 605  ) mm  = ( 18.11 x 23.82 ) in
+		'BE_DOUBLE_POSTE'        => array(1233.071, 1601.575), // = (  435 x 565  ) mm  = ( 17.13 x 22.24 ) in
+		'BE_COQUILLE'            => array(1218.898, 1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
+		'BE_PETIT_MEDIAN'        => array(1176.378, 1502.362), // = (  415 x 530  ) mm  = ( 16.34 x 20.87 ) in
+		'BE_RUCHE'               => array(1020.472, 1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
+		'BE_PROPATRIA'           => array(977.953, 1218.898), // = (  345 x 430  ) mm  = ( 13.58 x 16.93 ) in
+		'BE_LYS'                 => array(898.583, 1125.354), // = (  317 x 397  ) mm  = ( 12.48 x 15.63 ) in
+		'BE_POT'                 => array(870.236, 1088.504), // = (  307 x 384  ) mm  = ( 12.09 x 15.12 ) in
+		'BE_ROSETTE'             => array(765.354, 983.622), // = (  270 x 347  ) mm  = ( 10.63 x 13.66 ) in
 		// - Old Imperial French Sizes
-		'FR_UNIVERS'             => array( 2834.646,  3685.039), // = ( 1000 x 1300 ) mm  = ( 39.37 x 51.18 ) in
-		'FR_DOUBLE_COLOMBIER'    => array( 2551.181,  3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
-		'FR_GRANDE_MONDE'        => array( 2551.181,  3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
-		'FR_DOUBLE_SOLEIL'       => array( 2267.717,  3401.575), // = (  800 x 1200 ) mm  = ( 31.50 x 47.24 ) in
-		'FR_DOUBLE_JESUS'        => array( 2154.331,  3174.803), // = (  760 x 1120 ) mm  = ( 29.92 x 44.09 ) in
-		'FR_GRAND_AIGLE'         => array( 2125.984,  3004.724), // = (  750 x 1060 ) mm  = ( 29.53 x 41.73 ) in
-		'FR_PETIT_AIGLE'         => array( 1984.252,  2664.567), // = (  700 x 940  ) mm  = ( 27.56 x 37.01 ) in
-		'FR_DOUBLE_RAISIN'       => array( 1842.520,  2834.646), // = (  650 x 1000 ) mm  = ( 25.59 x 39.37 ) in
-		'FR_JOURNAL'             => array( 1842.520,  2664.567), // = (  650 x 940  ) mm  = ( 25.59 x 37.01 ) in
-		'FR_COLOMBIER_AFFICHE'   => array( 1785.827,  2551.181), // = (  630 x 900  ) mm  = ( 24.80 x 35.43 ) in
-		'FR_DOUBLE_CAVALIER'     => array( 1757.480,  2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
-		'FR_CLOCHE'              => array( 1700.787,  2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
-		'FR_SOLEIL'              => array( 1700.787,  2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
-		'FR_DOUBLE_CARRE'        => array( 1587.402,  2551.181), // = (  560 x 900  ) mm  = ( 22.05 x 35.43 ) in
-		'FR_DOUBLE_COQUILLE'     => array( 1587.402,  2494.488), // = (  560 x 880  ) mm  = ( 22.05 x 34.65 ) in
-		'FR_JESUS'               => array( 1587.402,  2154.331), // = (  560 x 760  ) mm  = ( 22.05 x 29.92 ) in
-		'FR_RAISIN'              => array( 1417.323,  1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
-		'FR_CAVALIER'            => array( 1303.937,  1757.480), // = (  460 x 620  ) mm  = ( 18.11 x 24.41 ) in
-		'FR_DOUBLE_COURONNE'     => array( 1303.937,  2040.945), // = (  460 x 720  ) mm  = ( 18.11 x 28.35 ) in
-		'FR_CARRE'               => array( 1275.591,  1587.402), // = (  450 x 560  ) mm  = ( 17.72 x 22.05 ) in
-		'FR_COQUILLE'            => array( 1247.244,  1587.402), // = (  440 x 560  ) mm  = ( 17.32 x 22.05 ) in
-		'FR_DOUBLE_TELLIERE'     => array( 1247.244,  1927.559), // = (  440 x 680  ) mm  = ( 17.32 x 26.77 ) in
-		'FR_DOUBLE_CLOCHE'       => array( 1133.858,  1700.787), // = (  400 x 600  ) mm  = ( 15.75 x 23.62 ) in
-		'FR_DOUBLE_POT'          => array( 1133.858,  1757.480), // = (  400 x 620  ) mm  = ( 15.75 x 24.41 ) in
-		'FR_ECU'                 => array( 1133.858,  1474.016), // = (  400 x 520  ) mm  = ( 15.75 x 20.47 ) in
-		'FR_COURONNE'            => array( 1020.472,  1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
-		'FR_TELLIERE'            => array(  963.780,  1247.244), // = (  340 x 440  ) mm  = ( 13.39 x 17.32 ) in
-		'FR_POT'                 => array(  878.740,  1133.858), // = (  310 x 400  ) mm  = ( 12.20 x 15.75 ) in
+		'FR_UNIVERS'             => array(2834.646, 3685.039), // = ( 1000 x 1300 ) mm  = ( 39.37 x 51.18 ) in
+		'FR_DOUBLE_COLOMBIER'    => array(2551.181, 3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
+		'FR_GRANDE_MONDE'        => array(2551.181, 3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
+		'FR_DOUBLE_SOLEIL'       => array(2267.717, 3401.575), // = (  800 x 1200 ) mm  = ( 31.50 x 47.24 ) in
+		'FR_DOUBLE_JESUS'        => array(2154.331, 3174.803), // = (  760 x 1120 ) mm  = ( 29.92 x 44.09 ) in
+		'FR_GRAND_AIGLE'         => array(2125.984, 3004.724), // = (  750 x 1060 ) mm  = ( 29.53 x 41.73 ) in
+		'FR_PETIT_AIGLE'         => array(1984.252, 2664.567), // = (  700 x 940  ) mm  = ( 27.56 x 37.01 ) in
+		'FR_DOUBLE_RAISIN'       => array(1842.520, 2834.646), // = (  650 x 1000 ) mm  = ( 25.59 x 39.37 ) in
+		'FR_JOURNAL'             => array(1842.520, 2664.567), // = (  650 x 940  ) mm  = ( 25.59 x 37.01 ) in
+		'FR_COLOMBIER_AFFICHE'   => array(1785.827, 2551.181), // = (  630 x 900  ) mm  = ( 24.80 x 35.43 ) in
+		'FR_DOUBLE_CAVALIER'     => array(1757.480, 2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
+		'FR_CLOCHE'              => array(1700.787, 2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
+		'FR_SOLEIL'              => array(1700.787, 2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
+		'FR_DOUBLE_CARRE'        => array(1587.402, 2551.181), // = (  560 x 900  ) mm  = ( 22.05 x 35.43 ) in
+		'FR_DOUBLE_COQUILLE'     => array(1587.402, 2494.488), // = (  560 x 880  ) mm  = ( 22.05 x 34.65 ) in
+		'FR_JESUS'               => array(1587.402, 2154.331), // = (  560 x 760  ) mm  = ( 22.05 x 29.92 ) in
+		'FR_RAISIN'              => array(1417.323, 1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
+		'FR_CAVALIER'            => array(1303.937, 1757.480), // = (  460 x 620  ) mm  = ( 18.11 x 24.41 ) in
+		'FR_DOUBLE_COURONNE'     => array(1303.937, 2040.945), // = (  460 x 720  ) mm  = ( 18.11 x 28.35 ) in
+		'FR_CARRE'               => array(1275.591, 1587.402), // = (  450 x 560  ) mm  = ( 17.72 x 22.05 ) in
+		'FR_COQUILLE'            => array(1247.244, 1587.402), // = (  440 x 560  ) mm  = ( 17.32 x 22.05 ) in
+		'FR_DOUBLE_TELLIERE'     => array(1247.244, 1927.559), // = (  440 x 680  ) mm  = ( 17.32 x 26.77 ) in
+		'FR_DOUBLE_CLOCHE'       => array(1133.858, 1700.787), // = (  400 x 600  ) mm  = ( 15.75 x 23.62 ) in
+		'FR_DOUBLE_POT'          => array(1133.858, 1757.480), // = (  400 x 620  ) mm  = ( 15.75 x 24.41 ) in
+		'FR_ECU'                 => array(1133.858, 1474.016), // = (  400 x 520  ) mm  = ( 15.75 x 20.47 ) in
+		'FR_COURONNE'            => array(1020.472, 1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
+		'FR_TELLIERE'            => array(963.780, 1247.244), // = (  340 x 440  ) mm  = ( 13.39 x 17.32 ) in
+		'FR_POT'                 => array(878.740, 1133.858), // = (  310 x 400  ) mm  = ( 12.20 x 15.75 ) in
 	);
 
 
@@ -2514,7 +2514,7 @@ 
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
 	 */
-	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points, $k, $pagedim=array()) {
+	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points, $k, $pagedim = array()) {
 		if (!isset($pagedim[$page])) {
 			// initialize array
 			$pagedim[$page] = array();
@@ -2561,7 +2561,7 @@ 
 	 * @return string Canonical page layout name.
 	 * @public static
 	 */
-	public static function getPageLayoutMode($layout='SinglePage') {
+	public static function getPageLayoutMode($layout = 'SinglePage') {
 		switch ($layout) {
 			case 'default':
 			case 'single':
@@ -2604,7 +2604,7 @@ 
 	 * @return string Canonical page mode name.
 	 * @public static
 	 */
-	public static function getPageMode($mode='UseNone') {
+	public static function getPageMode($mode = 'UseNone') {
 		switch ($mode) {
 			case 'UseNone': {
 				$page_mode = 'UseNone';

Upper-Lower-Casing +41 added lines, -41 removed lines

@@ -179,7 +179,7 @@ 
 	 * @public static
 	 */
 	public static function getBorderMode($brd, $position='start', $opencell=true) {
-		if ((!$opencell) OR empty($brd)) {
+		if ((!$opencell) or empty($brd)) {
 			return $brd;
 		}
 		if ($brd == 1) {
@@ -251,7 +251,7 @@ 
 	 * @public static
 	 */
 	public static function empty_string($str) {
-		return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
+		return (is_null($str) or (is_string($str) and (strlen($str) == 0)));
 	}
 
 	/**
@@ -298,7 +298,7 @@ 
 	 * @public static
 	 */
 	public static function objclone($object) {
-		if (($object instanceof Imagick) AND (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
+		if (($object instanceof Imagick) and (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
 			// on the versions after 3.0.1 the clone() method was deprecated in favour of clone keyword
 			return @$object->clone();
 		}
@@ -313,7 +313,7 @@ 
 	 * @public static
 	 */
 	public static function sendOutputData($data, $length) {
-		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) OR empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
+		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) or empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 			// the content length may vary if the server is using compression
 			header('Content-Length: '.$length);
 		}
@@ -348,7 +348,7 @@ 
 	 * @public static
 	 */
 	public static function getTimestamp($date) {
-		if (($date[0] == 'D') AND ($date[1] == ':')) {
+		if (($date[0] == 'D') and ($date[1] == ':')) {
 			// remove date prefix if present
 			$date = substr($date, 2);
 		}
@@ -379,7 +379,7 @@ 
 		if (function_exists('posix_getpid')) {
 			$rnd .= posix_getpid();
 		}
-		if (function_exists('openssl_random_pseudo_bytes') AND (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
+		if (function_exists('openssl_random_pseudo_bytes') and (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
 			// this is not used on windows systems because it is very slow for a know bug
 			$rnd .= openssl_random_pseudo_bytes(512);
 		} else {
@@ -468,7 +468,7 @@ 
 	 * @public static
 	 */
 	public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c) {
-		if (function_exists('mcrypt_encrypt') AND ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
+		if (function_exists('mcrypt_encrypt') and ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
 			// try to use mcrypt function if exist
 			return $out;
 		}
@@ -526,7 +526,7 @@ 
 		$protection = 2147422012; // 32 bit: (01111111 11111111 00001111 00111100)
 		foreach ($permissions as $permission) {
 			if (isset($options[$permission])) {
-				if (($mode > 0) OR ($options[$permission] <= 32)) {
+				if (($mode > 0) or ($options[$permission] <= 32)) {
 					// set only valid permissions
 					if ($options[$permission] == 2) {
 						// the logic for bit 2 is inverted (cleared by default)
@@ -629,7 +629,7 @@ 
 	 * @public static
 	 */
 	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
-		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
+		if (isset($prop['aopt']) and is_array($prop['aopt'])) {
 			// the annotation options are already defined
 			return $prop['aopt'];
 		}
@@ -699,7 +699,7 @@ 
 				}
 			}
 		}
-		if (isset($prop['border']) AND is_array($prop['border'])) {
+		if (isset($prop['border']) and is_array($prop['border'])) {
 			$opt['border'] = $prop['border'];
 		}
 		if (!isset($opt['mk'])) {
@@ -718,7 +718,7 @@ 
 			$opt['mk']['if']['a'][1] = $prop['buttonAlignY'];
 		}
 		// buttonFitBounds: If true, the extent to which the icon may be scaled is set to the bounds of the button field.
-		if (isset($prop['buttonFitBounds']) AND ($prop['buttonFitBounds'] == 'true')) {
+		if (isset($prop['buttonFitBounds']) and ($prop['buttonFitBounds'] == 'true')) {
 			$opt['mk']['if']['fb'] = true;
 		}
 		// buttonScaleHow: Controls how the icon is scaled (if necessary) to fit inside the button face.
@@ -821,75 +821,75 @@ 
 		}
 		$ff = 0;
 		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
+		if (isset($prop['readonly']) and ($prop['readonly'] == 'true')) {
 			$ff += 1 << 0;
 		}
 		// required: Specifies whether a field requires a value.
-		if (isset($prop['required']) AND ($prop['required'] == 'true')) {
+		if (isset($prop['required']) and ($prop['required'] == 'true')) {
 			$ff += 1 << 1;
 		}
 		// multiline: Controls how text is wrapped within the field.
-		if (isset($prop['multiline']) AND ($prop['multiline'] == 'true')) {
+		if (isset($prop['multiline']) and ($prop['multiline'] == 'true')) {
 			$ff += 1 << 12;
 		}
 		// password: Specifies whether the field should display asterisks when data is entered in the field.
-		if (isset($prop['password']) AND ($prop['password'] == 'true')) {
+		if (isset($prop['password']) and ($prop['password'] == 'true')) {
 			$ff += 1 << 13;
 		}
 		// NoToggleToOff: If set, exactly one radio button shall be selected at all times; selecting the currently selected button has no effect.
-		if (isset($prop['NoToggleToOff']) AND ($prop['NoToggleToOff'] == 'true')) {
+		if (isset($prop['NoToggleToOff']) and ($prop['NoToggleToOff'] == 'true')) {
 			$ff += 1 << 14;
 		}
 		// Radio: If set, the field is a set of radio buttons.
-		if (isset($prop['Radio']) AND ($prop['Radio'] == 'true')) {
+		if (isset($prop['Radio']) and ($prop['Radio'] == 'true')) {
 			$ff += 1 << 15;
 		}
 		// Pushbutton: If set, the field is a pushbutton that does not retain a permanent value.
-		if (isset($prop['Pushbutton']) AND ($prop['Pushbutton'] == 'true')) {
+		if (isset($prop['Pushbutton']) and ($prop['Pushbutton'] == 'true')) {
 			$ff += 1 << 16;
 		}
 		// Combo: If set, the field is a combo box; if clear, the field is a list box.
-		if (isset($prop['Combo']) AND ($prop['Combo'] == 'true')) {
+		if (isset($prop['Combo']) and ($prop['Combo'] == 'true')) {
 			$ff += 1 << 17;
 		}
 		// editable: Controls whether a combo box is editable.
-		if (isset($prop['editable']) AND ($prop['editable'] == 'true')) {
+		if (isset($prop['editable']) and ($prop['editable'] == 'true')) {
 			$ff += 1 << 18;
 		}
 		// Sort: If set, the field's option items shall be sorted alphabetically.
-		if (isset($prop['Sort']) AND ($prop['Sort'] == 'true')) {
+		if (isset($prop['Sort']) and ($prop['Sort'] == 'true')) {
 			$ff += 1 << 19;
 		}
 		// fileSelect: If true, sets the file-select flag in the Options tab of the text field (Field is Used for File Selection).
-		if (isset($prop['fileSelect']) AND ($prop['fileSelect'] == 'true')) {
+		if (isset($prop['fileSelect']) and ($prop['fileSelect'] == 'true')) {
 			$ff += 1 << 20;
 		}
 		// multipleSelection: If true, indicates that a list box allows a multiple selection of items.
-		if (isset($prop['multipleSelection']) AND ($prop['multipleSelection'] == 'true')) {
+		if (isset($prop['multipleSelection']) and ($prop['multipleSelection'] == 'true')) {
 			$ff += 1 << 21;
 		}
 		// doNotSpellCheck: If true, spell checking is not performed on this editable text field.
-		if (isset($prop['doNotSpellCheck']) AND ($prop['doNotSpellCheck'] == 'true')) {
+		if (isset($prop['doNotSpellCheck']) and ($prop['doNotSpellCheck'] == 'true')) {
 			$ff += 1 << 22;
 		}
 		// doNotScroll: If true, the text field does not scroll and the user, therefore, is limited by the rectangular region designed for the field.
-		if (isset($prop['doNotScroll']) AND ($prop['doNotScroll'] == 'true')) {
+		if (isset($prop['doNotScroll']) and ($prop['doNotScroll'] == 'true')) {
 			$ff += 1 << 23;
 		}
 		// comb: If set to true, the field background is drawn as series of boxes (one for each character in the value of the field) and each character of the content is drawn within those boxes. The number of boxes drawn is determined from the charLimit property. It applies only to text fields. The setter will also raise if any of the following field properties are also set multiline, password, and fileSelect. A side-effect of setting this property is that the doNotScroll property is also set.
-		if (isset($prop['comb']) AND ($prop['comb'] == 'true')) {
+		if (isset($prop['comb']) and ($prop['comb'] == 'true')) {
 			$ff += 1 << 24;
 		}
 		// radiosInUnison: If false, even if a group of radio buttons have the same name and export value, they behave in a mutually exclusive fashion, like HTML radio buttons.
-		if (isset($prop['radiosInUnison']) AND ($prop['radiosInUnison'] == 'true')) {
+		if (isset($prop['radiosInUnison']) and ($prop['radiosInUnison'] == 'true')) {
 			$ff += 1 << 25;
 		}
 		// richText: If true, the field allows rich text formatting.
-		if (isset($prop['richText']) AND ($prop['richText'] == 'true')) {
+		if (isset($prop['richText']) and ($prop['richText'] == 'true')) {
 			$ff += 1 << 25;
 		}
 		// commitOnSelChange: Controls whether a field value is committed after a selection change.
-		if (isset($prop['commitOnSelChange']) AND ($prop['commitOnSelChange'] == 'true')) {
+		if (isset($prop['commitOnSelChange']) and ($prop['commitOnSelChange'] == 'true')) {
 			$ff += 1 << 26;
 		}
 		$opt['ff'] = $ff;
@@ -899,7 +899,7 @@ 
 		}
 		$f = 4; // default value for annotation flags
 		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
+		if (isset($prop['readonly']) and ($prop['readonly'] == 'true')) {
 			$f += 1 << 6;
 		}
 		// display: Controls whether the field is hidden or visible on screen and in print.
@@ -916,14 +916,14 @@ 
 		}
 		$opt['f'] = $f;
 		// currentValueIndices: Reads and writes single or multiple values of a list box or combo box.
-		if (isset($prop['currentValueIndices']) AND is_array($prop['currentValueIndices'])) {
+		if (isset($prop['currentValueIndices']) and is_array($prop['currentValueIndices'])) {
 			$opt['i'] = $prop['currentValueIndices'];
 		}
 		// value: The value of the field data that the user has entered.
 		if (isset($prop['value'])) {
 			if (is_array($prop['value'])) {
 				$opt['opt'] = array();
-				foreach ($prop['value'] AS $key => $optval) {
+				foreach ($prop['value'] as $key => $optval) {
 					// exportValues: An array of strings representing the export values for the field.
 					if (isset($prop['exportValues'][$key])) {
 						$opt['opt'][$key] = array($prop['exportValues'][$key], $prop['value'][$key]);
@@ -1046,10 +1046,10 @@ 
 			$cssdata = preg_replace('/@media[\s]+([^\§]*)§([^§]*)§/i', '', $cssdata);
 		}
 		// keep 'all' and 'print' media, other media types are discarded
-		if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
+		if (isset($cssblocks['all']) and !empty($cssblocks['all'])) {
 			$cssdata .= $cssblocks['all'];
 		}
-		if (isset($cssblocks['print']) AND !empty($cssblocks['print'])) {
+		if (isset($cssblocks['print']) and !empty($cssblocks['print'])) {
 			$cssdata .= $cssblocks['print'];
 		}
 		// reset css blocks array
@@ -1184,11 +1184,11 @@ 
 		$valid = false; // value to be returned
 		$tag = $dom[$key]['value'];
 		$class = array();
-		if (isset($dom[$key]['attribute']['class']) AND !empty($dom[$key]['attribute']['class'])) {
+		if (isset($dom[$key]['attribute']['class']) and !empty($dom[$key]['attribute']['class'])) {
 			$class = explode(' ', strtolower($dom[$key]['attribute']['class']));
 		}
 		$id = '';
-		if (isset($dom[$key]['attribute']['id']) AND !empty($dom[$key]['attribute']['id'])) {
+		if (isset($dom[$key]['attribute']['id']) and !empty($dom[$key]['attribute']['id'])) {
 			$id = strtolower($dom[$key]['attribute']['id']);
 		}
 		$selector = preg_replace('/([\>\+\~\s]{1})([\.]{1})([^\>\+\~\s]*)/si', '\\1*.\\3', $selector);
@@ -1199,7 +1199,7 @@ 
 			$offset = $parentop[1];
 			$lasttag = array_pop($matches[2]);
 			$lasttag = strtolower(trim($lasttag[0]));
-			if (($lasttag == '*') OR ($lasttag == $tag)) {
+			if (($lasttag == '*') or ($lasttag == $tag)) {
 				// the last element on selector is our tag or 'any tag'
 				$attrib = array_pop($matches[3]);
 				$attrib = strtolower(trim($attrib[0]));
@@ -1285,7 +1285,7 @@ 
 				} else {
 					$valid = true;
 				}
-				if ($valid AND ($offset > 0)) {
+				if ($valid and ($offset > 0)) {
 					$valid = false;
 					// check remaining selector part
 					$selector = substr($selector, 0, $offset);
@@ -1307,7 +1307,7 @@ 
 						}
 						case '+': { // immediately preceded by an element
 							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
+								if ($dom[$i]['tag'] and $dom[$i]['opening']) {
 									$valid = self::isValidCSSSelectorForTag($dom, $i, $selector);
 									break;
 								}
@@ -1316,7 +1316,7 @@ 
 						}
 						case '~': { // preceded by an element
 							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
+								if ($dom[$i]['tag'] and $dom[$i]['opening']) {
 									if (self::isValidCSSSelectorForTag($dom, $i, $selector)) {
 										break;
 									}
@@ -1775,7 +1775,7 @@ 
 		$limit = $limit === null ? -1 : $limit;
 		$flags = $flags === null ? 0 : $flags;
 		// the bug only happens on PHP 5.2 when using the u modifier
-		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
+		if ((strpos($modifiers, 'u') === FALSE) or (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
 			$ret = preg_split($pattern.$modifiers, $subject, $limit, $flags);
 			if ($ret === false) {
 				return array();

htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 			}
 		}
 		if (empty($type)) {
-            $type = strtolower(trim(pathinfo(parse_url($imgfile, PHP_URL_PATH), PATHINFO_EXTENSION)));
+			$type = strtolower(trim(pathinfo(parse_url($imgfile, PHP_URL_PATH), PATHINFO_EXTENSION)));
 		}
 		if ($type == 'jpg') {
 			$type = 'jpeg';

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -72,9 +72,9 @@ 
 	 */
 	public static function getImageFileType($imgfile, $iminfo=array()) {
 		$type = '';
-		if (isset($iminfo['mime']) AND !empty($iminfo['mime'])) {
+		if (isset($iminfo['mime']) and !empty($iminfo['mime'])) {
 			$mime = explode('/', $iminfo['mime']);
-			if ((count($mime) > 1) AND ($mime[0] == 'image') AND (!empty($mime[1]))) {
+			if ((count($mime) > 1) and ($mime[0] == 'image') and (!empty($mime[1]))) {
 				$type = strtolower(trim($mime[1]));
 			}
 		}
@@ -101,7 +101,7 @@ 
 		// transparency index
 		$tid = imagecolortransparent($image);
 		$palletsize = imagecolorstotal($image);
-		if (($tid >= 0) AND ($tid < $palletsize)) {
+		if (($tid >= 0) and ($tid < $palletsize)) {
 			// get the colors for the transparency index
 			$tcol = imagecolorsforindex($image, $tid);
 		}
@@ -221,7 +221,7 @@ 
 		if (count($icc) > 0) {
 			ksort($icc);
 			$icc = implode('', $icc);
-			if ((ord($icc[36]) != 0x61) OR (ord($icc[37]) != 0x63) OR (ord($icc[38]) != 0x73) OR (ord($icc[39]) != 0x70)) {
+			if ((ord($icc[36]) != 0x61) or (ord($icc[37]) != 0x63) or (ord($icc[38]) != 0x73) or (ord($icc[39]) != 0x70)) {
 				// invalid ICC profile
 				$icc = false;
 			}
@@ -322,7 +322,7 @@ 
 			} elseif ($type == 'iCCP') {
 				// skip profile name
 				$len = 0;
-				while ((ord(fread($f, 1)) != 0) AND ($len < 80)) {
+				while ((ord(fread($f, 1)) != 0) and ($len < 80)) {
 					++$len;
 				}
 				// get compression method
@@ -343,7 +343,7 @@ 
 			}
 			$n = TCPDF_STATIC::_freadint($f);
 		} while ($n);
-		if (($colspace == 'Indexed') AND (empty($pal))) {
+		if (($colspace == 'Indexed') and (empty($pal))) {
 			// Missing palette
 			fclose($f);
 			return false;