Completed
Branch develop (b89940)
by
unknown
22:36
created
htdocs/fourn/product/list.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
 
30 30
 // Load Dolibarr environment
31 31
 require '../../main.inc.php';
32
-require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
33
-require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
34
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.class.php';
32
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
34
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
35 35
 
36 36
 
37 37
 // Load translation files required by the page
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
309 309
 
310 310
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
311
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
311
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
312 312
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
313 313
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
314 314
 
Please login to merge, or discard this patch.
htdocs/public/payment/paymentok.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
 $paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
147 147
 $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
148 148
 if (getDolGlobalString($paramcreditorlong)) {
149
-	$creditor = getDolGlobalString($paramcreditorlong);	// use label long of the seller to show
149
+	$creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
150 150
 } elseif (getDolGlobalString($paramcreditor)) {
151
-	$creditor = getDolGlobalString($paramcreditor);		// use label short of the seller to show
151
+	$creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
152 152
 }
153 153
 
154 154
 
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 
198 198
 $head = '';
199 199
 if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
200
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
200
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
201 201
 }
202 202
 
203 203
 $conf->dol_hide_topmenu = 1;
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	}
258 258
 	if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
259 259
 		print '<div class="backimagepublicpayment">';
260
-		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="' . getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
260
+		print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="'.getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
261 261
 		print '</div>';
262 262
 	}
263 263
 
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 			// Set by newpayment.php
278 278
 			$currencyCodeType   = $_SESSION['currencyCodeType'];
279 279
 			$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
280
-			$paymentType        = $_SESSION['PaymentType'];			// Value can be 'Mark', 'Sole', 'Sale' for example
280
+			$paymentType        = $_SESSION['PaymentType']; // Value can be 'Mark', 'Sole', 'Sale' for example
281 281
 			// From env
282 282
 			$ipaddress          = $_SESSION['ipaddress'];
283 283
 
@@ -380,10 +380,10 @@  discard block
 block discarded – undo
380 380
 	$ipaddress = $_SESSION['ipaddress'];
381 381
 }
382 382
 if (empty($TRANSACTIONID)) {
383
-	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' :$_SESSION['TRANSACTIONID'];	// pi_... or ch_...
383
+	$TRANSACTIONID = empty($_SESSION['TRANSACTIONID']) ? '' : $_SESSION['TRANSACTIONID']; // pi_... or ch_...
384 384
 	if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
385 385
 		// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
386
-		$TRANSACTIONID   = GETPOST('payment_intent', 'alphanohtml');
386
+		$TRANSACTIONID = GETPOST('payment_intent', 'alphanohtml');
387 387
 	}
388 388
 }
389 389
 if (empty($FinalPaymentAmt)) {
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
 
489 489
 						// Set amount for the subscription:
490 490
 						// - First check the amount of the member type.
491
-						$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
491
+						$amountbytype = $adht->amountByType(1); // Load the array of amount per type
492 492
 						$amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid];
493 493
 						// - If not found, take the default amount
494 494
 						if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 				if (getDolGlobalString('MEMBER_MIN_AMOUNT')) {
510 510
 					if ($FinalPaymentAmt < $conf->global->MEMBER_MIN_AMOUNT) {
511 511
 						$error++;
512
-						$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 ?';
512
+						$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 ?';
513 513
 						$postactionmessages[] = $errmsg;
514 514
 						$ispostactionok = -1;
515 515
 						dol_syslog("Failed to validate member (amount lower than minimum): ".$errmsg, LOG_ERR, 0, '_payment');
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
 					dol_syslog("Failed to validate member (bad currency check): ".$errmsg, LOG_ERR, 0, '_payment');
526 526
 				}
527 527
 
528
-				if (! $error) {
528
+				if (!$error) {
529 529
 					// We validate the member (no effect if it is already validated)
530 530
 					$result = ($object->status == $object::STATUS_EXCLUDED) ? -1 : $object->validate($user); // if membre is excluded (status == -2) the new validation is not possible
531 531
 					if ($result < 0 || empty($object->datevalid)) {
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 						$thirdparty = new Societe($db);
689 689
 						$thirdparty->fetch($thirdparty_id);
690 690
 
691
-						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';	// This also set $stripearrayofkeysbyenv
691
+						include_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php'; // This also set $stripearrayofkeysbyenv
692 692
 						$stripe = new Stripe($db);
693 693
 						//$stripeacc = $stripe->getStripeAccount($service);		Already defined previously
694 694
 
@@ -703,7 +703,7 @@  discard block
 block discarded – undo
703 703
 
704 704
 								if (preg_match('/^pi_/', $TRANSACTIONID)) {
705 705
 									// This may throw an error if not found.
706
-									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID);	// payment_intent (pi_...)
706
+									$chpi = \Stripe\PaymentIntent::retrieve($TRANSACTIONID); // payment_intent (pi_...)
707 707
 								} else {
708 708
 									// This throw an error if not found
709 709
 									$chpi = \Stripe\Charge::retrieve($TRANSACTIONID); // old method, contains the charge id (ch_...)
@@ -906,7 +906,7 @@  discard block
 block discarded – undo
906 906
 				$paiement->paiementid   = $paymentTypeId;
907 907
 				$paiement->num_payment = '';
908 908
 				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
909
-				$paiement->ext_payment_id = $TRANSACTIONID;		// TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
909
+				$paiement->ext_payment_id = $TRANSACTIONID; // TODO LDR May be we should store py_... instead of pi_... but we started with pi_... so we continue.
910 910
 				//$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 ?
911 911
 				$paiement->ext_payment_site = $service;
912 912
 
@@ -978,7 +978,7 @@  discard block
 block discarded – undo
978 978
 			$ispostactionok = -1;
979 979
 		}
980 980
 	} elseif (array_key_exists('ORD', $tmptag) && $tmptag['ORD'] > 0) {
981
-		include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
981
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
982 982
 		$object = new Commande($db);
983 983
 		$result = $object->fetch((int) $tmptag['ORD']);
984 984
 		if ($result) {
@@ -1013,14 +1013,14 @@  discard block
 block discarded – undo
1013 1013
 			// 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)
1014 1014
 			if (isModEnabled('invoice')) {
1015 1015
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
1016
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
1016
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
1017 1017
 					$invoice = new Facture($db);
1018 1018
 					$result = $invoice->createFromOrder($object, $user);
1019 1019
 					if ($result > 0) {
1020 1020
 						$object->classifyBilled($user);
1021 1021
 						$invoice->validate($user);
1022 1022
 						// Creation of payment line
1023
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
1023
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
1024 1024
 						$paiement = new Paiement($db);
1025 1025
 						$paiement->datepaye = $now;
1026 1026
 						if ($currencyCodeType == $conf->currency) {
@@ -1034,14 +1034,14 @@  discard block
 block discarded – undo
1034 1034
 						}
1035 1035
 						$paiement->paiementid = $paymentTypeId;
1036 1036
 						$paiement->num_payment = '';
1037
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
1038
-						$paiement->ext_payment_id = $TRANSACTIONID;		// pi_... for Stripe, ...
1039
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
1037
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
1038
+						$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
1039
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
1040 1040
 
1041 1041
 						if (!$error) {
1042 1042
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
1043 1043
 							if ($paiement_id < 0) {
1044
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
1044
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
1045 1045
 								$ispostactionok = -1;
1046 1046
 								$error++;
1047 1047
 							} else {
@@ -1078,7 +1078,7 @@  discard block
 block discarded – undo
1078 1078
 								}
1079 1079
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
1080 1080
 								if ($result < 0) {
1081
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
1081
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
1082 1082
 									$ispostactionok = -1;
1083 1083
 									$error++;
1084 1084
 								} else {
@@ -1086,7 +1086,7 @@  discard block
 block discarded – undo
1086 1086
 									$ispostactionok = 1;
1087 1087
 								}
1088 1088
 							} else {
1089
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
1089
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
1090 1090
 								$ispostactionok = -1;
1091 1091
 								$error++;
1092 1092
 							}
@@ -1098,11 +1098,11 @@  discard block
 block discarded – undo
1098 1098
 							$db->rollback();
1099 1099
 						}
1100 1100
 					} else {
1101
-						$postactionmessages[] = 'Failed to create invoice form order ' . $tmptag['ORD'] . '.';
1101
+						$postactionmessages[] = 'Failed to create invoice form order '.$tmptag['ORD'].'.';
1102 1102
 						$ispostactionok = -1;
1103 1103
 					}
1104 1104
 				} else {
1105
-					$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.';
1105
+					$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.';
1106 1106
 					$ispostactionok = -1;
1107 1107
 				}
1108 1108
 			} else {
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 				$ispostactionok = -1;
1111 1111
 			}
1112 1112
 		} else {
1113
-			$postactionmessages[] = 'Order paid ' . $tmptag['ORD'] . ' was not found';
1113
+			$postactionmessages[] = 'Order paid '.$tmptag['ORD'].' was not found';
1114 1114
 			$ispostactionok = -1;
1115 1115
 		}
1116 1116
 	} elseif (array_key_exists('DON', $tmptag) && $tmptag['DON'] > 0) {
@@ -1167,7 +1167,7 @@  discard block
 block discarded – undo
1167 1167
 				$paiement->datep = $now;
1168 1168
 				$paiement->paymenttype = $paymentTypeId;
1169 1169
 				$paiement->num_payment = '';
1170
-				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
1170
+				$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
1171 1171
 				$paiement->ext_payment_id = $TRANSACTIONID;
1172 1172
 				$paiement->ext_payment_site = $service;
1173 1173
 
@@ -1384,7 +1384,7 @@  discard block
 block discarded – undo
1384 1384
 						$db->rollback();
1385 1385
 					}
1386 1386
 
1387
-					if (! $error) {
1387
+					if (!$error) {
1388 1388
 						// Sending mail
1389 1389
 						$thirdparty = new Societe($db);
1390 1390
 						$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
@@ -1402,7 +1402,7 @@  discard block
 block discarded – undo
1402 1402
 							// Get email content from template
1403 1403
 							$arraydefaultmessage = null;
1404 1404
 
1405
-							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT');	// Email to send for Event organization registration
1405
+							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT'); // Email to send for Event organization registration
1406 1406
 
1407 1407
 							if (!empty($idoftemplatetouse)) {
1408 1408
 								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1604,18 +1604,18 @@  discard block
 block discarded – undo
1604 1604
 						} else {
1605 1605
 							$booth->status = ConferenceOrBooth::STATUS_SUGGESTED;
1606 1606
 							$resultboothupdate = $booth->update($user);
1607
-							if ($resultboothupdate<0) {
1607
+							if ($resultboothupdate < 0) {
1608 1608
 								// Finding the thirdparty by getting the invoice
1609 1609
 								$invoice = new Facture($db);
1610 1610
 								$resultinvoice = $invoice->fetch($ref);
1611
-								if ($resultinvoice<0) {
1611
+								if ($resultinvoice < 0) {
1612 1612
 									$postactionmessages[] = 'Could not find the associated invoice.';
1613 1613
 									$ispostactionok = -1;
1614 1614
 									$error++;
1615 1615
 								} else {
1616 1616
 									$thirdparty = new Societe($db);
1617 1617
 									$resultthirdparty = $thirdparty->fetch($invoice->socid);
1618
-									if ($resultthirdparty<0) {
1618
+									if ($resultthirdparty < 0) {
1619 1619
 										$error++;
1620 1620
 										setEventMessages(null, $thirdparty->errors, "errors");
1621 1621
 									} else {
@@ -1631,7 +1631,7 @@  discard block
 block discarded – undo
1631 1631
 										// Get email content from template
1632 1632
 										$arraydefaultmessage = null;
1633 1633
 
1634
-										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH');	// Email sent after registration for a Booth
1634
+										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH'); // Email sent after registration for a Booth
1635 1635
 
1636 1636
 										if (!empty($idoftemplatetouse)) {
1637 1637
 											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1687,7 +1687,7 @@  discard block
 block discarded – undo
1687 1687
 			$ispostactionok = -1;
1688 1688
 		}
1689 1689
 	} elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
1690
-		include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
1690
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
1691 1691
 		$object = new Contrat($db);
1692 1692
 		$result = $object->fetch((int) $tmptag['CON']);
1693 1693
 		if ($result) {
@@ -1725,14 +1725,14 @@  discard block
 block discarded – undo
1725 1725
 			// 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)
1726 1726
 			if (isModEnabled('invoice')) {
1727 1727
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
1728
-					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
1728
+					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
1729 1729
 					$invoice = new Facture($db);
1730 1730
 					$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
1731 1731
 					if ($result > 0) {
1732 1732
 						// $object->classifyBilled($user);
1733 1733
 						$invoice->validate($user);
1734 1734
 						// Creation of payment line
1735
-						include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
1735
+						include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
1736 1736
 						$paiement = new Paiement($db);
1737 1737
 						$paiement->datepaye = $now;
1738 1738
 						if ($currencyCodeType == $conf->currency) {
@@ -1746,14 +1746,14 @@  discard block
 block discarded – undo
1746 1746
 						}
1747 1747
 						$paiement->paiementid = $paymentTypeId;
1748 1748
 						$paiement->num_payment = '';
1749
-						$paiement->note_public = 'Online payment ' . dol_print_date($now, 'standard') . ' from ' . $ipaddress;
1750
-						$paiement->ext_payment_id = $TRANSACTIONID;		// pi_... for Stripe, ...
1751
-						$paiement->ext_payment_site = $service;			// 'StripeLive' or 'Stripe', or ...
1749
+						$paiement->note_public = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
1750
+						$paiement->ext_payment_id = $TRANSACTIONID; // pi_... for Stripe, ...
1751
+						$paiement->ext_payment_site = $service; // 'StripeLive' or 'Stripe', or ...
1752 1752
 
1753 1753
 						if (!$error) {
1754 1754
 							$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
1755 1755
 							if ($paiement_id < 0) {
1756
-								$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
1756
+								$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
1757 1757
 								$ispostactionok = -1;
1758 1758
 								$error++;
1759 1759
 							} else {
@@ -1790,7 +1790,7 @@  discard block
 block discarded – undo
1790 1790
 								}
1791 1791
 								$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
1792 1792
 								if ($result < 0) {
1793
-									$postactionmessages[] = $paiement->error . ' ' . implode("<br>\n", $paiement->errors);
1793
+									$postactionmessages[] = $paiement->error.' '.implode("<br>\n", $paiement->errors);
1794 1794
 									$ispostactionok = -1;
1795 1795
 									$error++;
1796 1796
 								} else {
@@ -1798,7 +1798,7 @@  discard block
 block discarded – undo
1798 1798
 									$ispostactionok = 1;
1799 1799
 								}
1800 1800
 							} else {
1801
-								$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
1801
+								$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
1802 1802
 								$ispostactionok = -1;
1803 1803
 								$error++;
1804 1804
 							}
@@ -1810,15 +1810,15 @@  discard block
 block discarded – undo
1810 1810
 							$db->rollback();
1811 1811
 						}
1812 1812
 					} else {
1813
-						$msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
1813
+						$msg = 'Failed to create invoice form contract '.$tmptag['CON'];
1814 1814
 						if (!empty($cols)) {
1815
-							$msg .= ' and col '. $cols .'.';
1815
+							$msg .= ' and col '.$cols.'.';
1816 1816
 						}
1817 1817
 						$postactionmessages[] = $msg;
1818 1818
 						$ispostactionok = -1;
1819 1819
 					}
1820 1820
 				} else {
1821
-					$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.';
1821
+					$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.';
1822 1822
 					$ispostactionok = -1;
1823 1823
 				}
1824 1824
 			} else {
@@ -1826,9 +1826,9 @@  discard block
 block discarded – undo
1826 1826
 				$ispostactionok = -1;
1827 1827
 			}
1828 1828
 		} else {
1829
-			$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
1829
+			$msg = 'Contract paid '.$tmptag['CON'].' was not found';
1830 1830
 			if (!empty($cols)) {
1831
-				$msg .= ' for col '.$tmptag['COL'] .'.';
1831
+				$msg .= ' for col '.$tmptag['COL'].'.';
1832 1832
 			}
1833 1833
 			$postactionmessages[] = $msg;
1834 1834
 			$ispostactionok = -1;
@@ -1844,8 +1844,8 @@  discard block
 block discarded – undo
1844 1844
 	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
1845 1845
 	// Set by newpayment.php
1846 1846
 	$currencyCodeType   = empty($_SESSION['currencyCodeType']) ? '' : $_SESSION['currencyCodeType'];
1847
-	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '': $_SESSION["FinalPaymentAmt"];
1848
-	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType'];	// Seems used by paypal only
1847
+	$FinalPaymentAmt    = empty($_SESSION["FinalPaymentAmt"]) ? '' : $_SESSION["FinalPaymentAmt"];
1848
+	$paymentType        = empty($_SESSION['PaymentType']) ? '' : $_SESSION['PaymentType']; // Seems used by paypal only
1849 1849
 
1850 1850
 	if (is_object($object) && method_exists($object, 'call_trigger')) {
1851 1851
 		// Call trigger
@@ -2082,7 +2082,7 @@  discard block
 block discarded – undo
2082 2082
 		// Redirect to a success page
2083 2083
 		// Paymentok page must be created for the specific website
2084 2084
 		$ext_urlok = DOL_URL_ROOT.'/public/website/index.php?website='.urlencode($ws).'&pageref=paymentok&fulltag='.$FULLTAG;
2085
-		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok) ."';</script>";
2085
+		print "<script>window.top.location.href = '".dol_escape_js($ext_urlok)."';</script>";
2086 2086
 	} else {
2087 2087
 		// Redirect to an error page
2088 2088
 		// Paymentko page must be created for the specific website
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/barcodes/qrcode.php 3 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -162,29 +162,29 @@  discard block
 block discarded – undo
162 162
 	/**
163 163
 	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
164 164
 	 */
165
-    define('QRSPEC_WIDTH_MAX', 177);
165
+	define('QRSPEC_WIDTH_MAX', 177);
166 166
 
167 167
 	// -----------------------------------------------------
168 168
 
169 169
 	/**
170 170
 	 * Matrix index to get width from $capacity array.
171 171
 	 */
172
-    define('QRCAP_WIDTH',    0);
172
+	define('QRCAP_WIDTH',    0);
173 173
 
174
-    /**
174
+	/**
175 175
 	 * Matrix index to get number of words from $capacity array.
176 176
 	 */
177
-    define('QRCAP_WORDS',    1);
177
+	define('QRCAP_WORDS',    1);
178 178
 
179
-    /**
179
+	/**
180 180
 	 * Matrix index to get remainder from $capacity array.
181 181
 	 */
182
-    define('QRCAP_REMINDER', 2);
182
+	define('QRCAP_REMINDER', 2);
183 183
 
184
-    /**
184
+	/**
185 185
 	 * Matrix index to get error correction level from $capacity array.
186 186
 	 */
187
-    define('QRCAP_EC',       3);
187
+	define('QRCAP_EC',       3);
188 188
 
189 189
 	// -----------------------------------------------------
190 190
 
@@ -193,33 +193,33 @@  discard block
 block discarded – undo
193 193
 	/**
194 194
 	 * Number of header bits for structured mode
195 195
 	 */
196
-    define('STRUCTURE_HEADER_BITS',  20);
196
+	define('STRUCTURE_HEADER_BITS',  20);
197 197
 
198
-    /**
198
+	/**
199 199
 	 * Max number of symbols for structured mode
200 200
 	 */
201
-    define('MAX_STRUCTURED_SYMBOLS', 16);
201
+	define('MAX_STRUCTURED_SYMBOLS', 16);
202 202
 
203 203
 	// -----------------------------------------------------
204 204
 
205
-    // Masks
205
+	// Masks
206 206
 
207
-    /**
207
+	/**
208 208
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
209 209
 	 */
210
-    define('N1',  3);
210
+	define('N1',  3);
211 211
 
212
-    /**
212
+	/**
213 213
 	 * Down point base value for case 2 mask pattern (module block of same color)
214 214
 	 */
215 215
 	define('N2',  3);
216 216
 
217
-    /**
217
+	/**
218 218
 	 * 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)
219 219
 	 */
220 220
 	define('N3', 40);
221 221
 
222
-    /**
222
+	/**
223 223
 	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
224 224
 	 */
225 225
 	define('N4', 10);
@@ -2592,7 +2592,7 @@  discard block
 block discarded – undo
2592 2592
 	}
2593 2593
 
2594 2594
 	/**
2595
-	* Return block number 1
2595
+	 * Return block number 1
2596 2596
 	 * @param array $spec
2597 2597
 	 * @return int value
2598 2598
 	 */
Please login to merge, or discard this patch.
Spacing   +263 added lines, -263 removed lines patch added patch discarded remove patch
@@ -169,12 +169,12 @@  discard block
 block discarded – undo
169 169
 	/**
170 170
 	 * Matrix index to get width from $capacity array.
171 171
 	 */
172
-    define('QRCAP_WIDTH',    0);
172
+    define('QRCAP_WIDTH', 0);
173 173
 
174 174
     /**
175 175
 	 * Matrix index to get number of words from $capacity array.
176 176
 	 */
177
-    define('QRCAP_WORDS',    1);
177
+    define('QRCAP_WORDS', 1);
178 178
 
179 179
     /**
180 180
 	 * Matrix index to get remainder from $capacity array.
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
     /**
185 185
 	 * Matrix index to get error correction level from $capacity array.
186 186
 	 */
187
-    define('QRCAP_EC',       3);
187
+    define('QRCAP_EC', 3);
188 188
 
189 189
 	// -----------------------------------------------------
190 190
 
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 	/**
194 194
 	 * Number of header bits for structured mode
195 195
 	 */
196
-    define('STRUCTURE_HEADER_BITS',  20);
196
+    define('STRUCTURE_HEADER_BITS', 20);
197 197
 
198 198
     /**
199 199
 	 * Max number of symbols for structured mode
@@ -207,12 +207,12 @@  discard block
 block discarded – undo
207 207
     /**
208 208
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
209 209
 	 */
210
-    define('N1',  3);
210
+    define('N1', 3);
211 211
 
212 212
     /**
213 213
 	 * Down point base value for case 2 mask pattern (module block of same color)
214 214
 	 */
215
-	define('N2',  3);
215
+	define('N2', 3);
216 216
 
217 217
     /**
218 218
 	 * 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 @@  discard block
 block discarded – undo
439 439
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
440 440
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
441 441
 		36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43, //
442
-		 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1, //
442
+		 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1, //
443 443
 		-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, //
444 444
 		25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, //
445 445
 		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, //
@@ -452,47 +452,47 @@  discard block
 block discarded – undo
452 452
 	 * @protected
453 453
 	 */
454 454
 	protected $capacity = array(
455
-		array(  0,    0, 0, array(   0,    0,    0,    0)), //
456
-		array( 21,   26, 0, array(   7,   10,   13,   17)), //  1
457
-		array( 25,   44, 7, array(  10,   16,   22,   28)), //
458
-		array( 29,   70, 7, array(  15,   26,   36,   44)), //
459
-		array( 33,  100, 7, array(  20,   36,   52,   64)), //
460
-		array( 37,  134, 7, array(  26,   48,   72,   88)), //  5
461
-		array( 41,  172, 7, array(  36,   64,   96,  112)), //
462
-		array( 45,  196, 0, array(  40,   72,  108,  130)), //
463
-		array( 49,  242, 0, array(  48,   88,  132,  156)), //
464
-		array( 53,  292, 0, array(  60,  110,  160,  192)), //
465
-		array( 57,  346, 0, array(  72,  130,  192,  224)), // 10
466
-		array( 61,  404, 0, array(  80,  150,  224,  264)), //
467
-		array( 65,  466, 0, array(  96,  176,  260,  308)), //
468
-		array( 69,  532, 0, array( 104,  198,  288,  352)), //
469
-		array( 73,  581, 3, array( 120,  216,  320,  384)), //
470
-		array( 77,  655, 3, array( 132,  240,  360,  432)), // 15
471
-		array( 81,  733, 3, array( 144,  280,  408,  480)), //
472
-		array( 85,  815, 3, array( 168,  308,  448,  532)), //
473
-		array( 89,  901, 3, array( 180,  338,  504,  588)), //
474
-		array( 93,  991, 3, array( 196,  364,  546,  650)), //
475
-		array( 97, 1085, 3, array( 224,  416,  600,  700)), // 20
476
-		array(101, 1156, 4, array( 224,  442,  644,  750)), //
477
-		array(105, 1258, 4, array( 252,  476,  690,  816)), //
478
-		array(109, 1364, 4, array( 270,  504,  750,  900)), //
479
-		array(113, 1474, 4, array( 300,  560,  810,  960)), //
480
-		array(117, 1588, 4, array( 312,  588,  870, 1050)), // 25
481
-		array(121, 1706, 4, array( 336,  644,  952, 1110)), //
482
-		array(125, 1828, 4, array( 360,  700, 1020, 1200)), //
483
-		array(129, 1921, 3, array( 390,  728, 1050, 1260)), //
484
-		array(133, 2051, 3, array( 420,  784, 1140, 1350)), //
485
-		array(137, 2185, 3, array( 450,  812, 1200, 1440)), // 30
486
-		array(141, 2323, 3, array( 480,  868, 1290, 1530)), //
487
-		array(145, 2465, 3, array( 510,  924, 1350, 1620)), //
488
-		array(149, 2611, 3, array( 540,  980, 1440, 1710)), //
489
-		array(153, 2761, 3, array( 570, 1036, 1530, 1800)), //
490
-		array(157, 2876, 0, array( 570, 1064, 1590, 1890)), // 35
491
-		array(161, 3034, 0, array( 600, 1120, 1680, 1980)), //
492
-		array(165, 3196, 0, array( 630, 1204, 1770, 2100)), //
493
-		array(169, 3362, 0, array( 660, 1260, 1860, 2220)), //
494
-		array(173, 3532, 0, array( 720, 1316, 1950, 2310)), //
495
-		array(177, 3706, 0, array( 750, 1372, 2040, 2430))  // 40
455
+		array(0, 0, 0, array(0, 0, 0, 0)), //
456
+		array(21, 26, 0, array(7, 10, 13, 17)), //  1
457
+		array(25, 44, 7, array(10, 16, 22, 28)), //
458
+		array(29, 70, 7, array(15, 26, 36, 44)), //
459
+		array(33, 100, 7, array(20, 36, 52, 64)), //
460
+		array(37, 134, 7, array(26, 48, 72, 88)), //  5
461
+		array(41, 172, 7, array(36, 64, 96, 112)), //
462
+		array(45, 196, 0, array(40, 72, 108, 130)), //
463
+		array(49, 242, 0, array(48, 88, 132, 156)), //
464
+		array(53, 292, 0, array(60, 110, 160, 192)), //
465
+		array(57, 346, 0, array(72, 130, 192, 224)), // 10
466
+		array(61, 404, 0, array(80, 150, 224, 264)), //
467
+		array(65, 466, 0, array(96, 176, 260, 308)), //
468
+		array(69, 532, 0, array(104, 198, 288, 352)), //
469
+		array(73, 581, 3, array(120, 216, 320, 384)), //
470
+		array(77, 655, 3, array(132, 240, 360, 432)), // 15
471
+		array(81, 733, 3, array(144, 280, 408, 480)), //
472
+		array(85, 815, 3, array(168, 308, 448, 532)), //
473
+		array(89, 901, 3, array(180, 338, 504, 588)), //
474
+		array(93, 991, 3, array(196, 364, 546, 650)), //
475
+		array(97, 1085, 3, array(224, 416, 600, 700)), // 20
476
+		array(101, 1156, 4, array(224, 442, 644, 750)), //
477
+		array(105, 1258, 4, array(252, 476, 690, 816)), //
478
+		array(109, 1364, 4, array(270, 504, 750, 900)), //
479
+		array(113, 1474, 4, array(300, 560, 810, 960)), //
480
+		array(117, 1588, 4, array(312, 588, 870, 1050)), // 25
481
+		array(121, 1706, 4, array(336, 644, 952, 1110)), //
482
+		array(125, 1828, 4, array(360, 700, 1020, 1200)), //
483
+		array(129, 1921, 3, array(390, 728, 1050, 1260)), //
484
+		array(133, 2051, 3, array(420, 784, 1140, 1350)), //
485
+		array(137, 2185, 3, array(450, 812, 1200, 1440)), // 30
486
+		array(141, 2323, 3, array(480, 868, 1290, 1530)), //
487
+		array(145, 2465, 3, array(510, 924, 1350, 1620)), //
488
+		array(149, 2611, 3, array(540, 980, 1440, 1710)), //
489
+		array(153, 2761, 3, array(570, 1036, 1530, 1800)), //
490
+		array(157, 2876, 0, array(570, 1064, 1590, 1890)), // 35
491
+		array(161, 3034, 0, array(600, 1120, 1680, 1980)), //
492
+		array(165, 3196, 0, array(630, 1204, 1770, 2100)), //
493
+		array(169, 3362, 0, array(660, 1260, 1860, 2220)), //
494
+		array(173, 3532, 0, array(720, 1316, 1950, 2310)), //
495
+		array(177, 3706, 0, array(750, 1372, 2040, 2430))  // 40
496 496
 	);
497 497
 
498 498
 	/**
@@ -501,9 +501,9 @@  discard block
 block discarded – undo
501 501
 	 */
502 502
 	protected $lengthTableBits = array(
503 503
 		array(10, 12, 14),
504
-		array( 9, 11, 13),
505
-		array( 8, 16, 16),
506
-		array( 8, 10, 12)
504
+		array(9, 11, 13),
505
+		array(8, 16, 16),
506
+		array(8, 10, 12)
507 507
 	);
508 508
 
509 509
 	/**
@@ -512,47 +512,47 @@  discard block
 block discarded – undo
512 512
 	 * @protected
513 513
 	 */
514 514
 	protected $eccTable = array(
515
-		array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)), //
516
-		array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //  1
517
-		array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), //
518
-		array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)), //
519
-		array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)), //
520
-		array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), //  5
521
-		array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)), //
522
-		array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)), //
523
-		array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)), //
524
-		array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)), //
525
-		array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), // 10
526
-		array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)), //
527
-		array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)), //
528
-		array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)), //
529
-		array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)), //
530
-		array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), // 15
531
-		array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)), //
532
-		array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)), //
533
-		array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)), //
534
-		array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)), //
535
-		array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), // 20
536
-		array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)), //
537
-		array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)), //
538
-		array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)), //
539
-		array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)), //
540
-		array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), // 25
541
-		array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)), //
542
-		array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)), //
543
-		array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)), //
544
-		array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)), //
545
-		array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
546
-		array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)), //
547
-		array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)), //
548
-		array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)), //
549
-		array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)), //
550
-		array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), // 35
551
-		array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)), //
552
-		array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)), //
553
-		array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)), //
554
-		array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)), //
555
-		array(array(19,  6), array(18, 31), array(34, 34), array(20, 61))  // 40
515
+		array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)), //
516
+		array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //  1
517
+		array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), //
518
+		array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)), //
519
+		array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)), //
520
+		array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), //  5
521
+		array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)), //
522
+		array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)), //
523
+		array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)), //
524
+		array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)), //
525
+		array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), // 10
526
+		array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)), //
527
+		array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)), //
528
+		array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)), //
529
+		array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)), //
530
+		array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), // 15
531
+		array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)), //
532
+		array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)), //
533
+		array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)), //
534
+		array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)), //
535
+		array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), // 20
536
+		array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)), //
537
+		array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)), //
538
+		array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)), //
539
+		array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)), //
540
+		array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), // 25
541
+		array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)), //
542
+		array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)), //
543
+		array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)), //
544
+		array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)), //
545
+		array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), // 30
546
+		array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)), //
547
+		array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)), //
548
+		array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)), //
549
+		array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)), //
550
+		array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), // 35
551
+		array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)), //
552
+		array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)), //
553
+		array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)), //
554
+		array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)), //
555
+		array(array(19, 6), array(18, 31), array(34, 34), array(20, 61))  // 40
556 556
 	);
557 557
 
558 558
 	/**
@@ -562,9 +562,9 @@  discard block
 block discarded – undo
562 562
 	 * @protected
563 563
 	 */
564 564
 	protected $alignmentPattern = array(
565
-		array( 0,  0),
566
-		array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), //  1- 5
567
-		array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
565
+		array(0, 0),
566
+		array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), //  1- 5
567
+		array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), //  6-10
568 568
 		array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), // 11-15
569 569
 		array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), // 16-20
570 570
 		array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), // 21-25
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
 		foreach ($qrTab as $line) {
641 641
 			$arrAdd = array();
642 642
 			foreach (str_split($line) as $char) {
643
-				$arrAdd[] = ($char=='1')?1:0;
643
+				$arrAdd[] = ($char == '1') ? 1 : 0;
644 644
 			}
645 645
 			$barcode_array['bcode'][] = $arrAdd;
646 646
 		}
@@ -665,8 +665,8 @@  discard block
 block discarded – undo
665 665
 		$len = count($frame);
666 666
 		// the frame is square (width = height)
667 667
 		foreach ($frame as &$frameLine) {
668
-			for ($i=0; $i<$len; $i++) {
669
-				$frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
668
+			for ($i = 0; $i < $len; $i++) {
669
+				$frameLine[$i] = (ord($frameLine[$i])&1) ? '1' : '0';
670 670
 			}
671 671
 		}
672 672
 		return $frame;
@@ -717,10 +717,10 @@  discard block
 block discarded – undo
717 717
 		$this->dir = -1;
718 718
 		$this->bit = -1;
719 719
 		// inteleaved data and ecc codes
720
-		for ($i=0; $i < ($this->dataLength + $this->eccLength); $i++) {
720
+		for ($i = 0; $i < ($this->dataLength + $this->eccLength); $i++) {
721 721
 			$code = $this->getCode();
722 722
 			$bit = 0x80;
723
-			for ($j=0; $j<8; $j++) {
723
+			for ($j = 0; $j < 8; $j++) {
724 724
 				$addr = $this->getNextPosition();
725 725
 				$this->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
726 726
 				$bit = $bit >> 1;
@@ -728,7 +728,7 @@  discard block
 block discarded – undo
728 728
 		}
729 729
 		// remainder bits
730 730
 		$j = $this->getRemainder($this->version);
731
-		for ($i=0; $i<$j; $i++) {
731
+		for ($i = 0; $i < $j; $i++) {
732 732
 			$addr = $this->getNextPosition();
733 733
 			$this->setFrameAt($addr, 0x02);
734 734
 		}
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 			}
819 819
 			$this->x = $x;
820 820
 			$this->y = $y;
821
-		} while(ord($this->frame[$y][$x]) & 0x80);
821
+		} while (ord($this->frame[$y][$x]) & 0x80);
822 822
 		return array('x'=>$x, 'y'=>$y);
823 823
 	}
824 824
 
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 		$dataPos = 0;
840 840
 		$eccPos = 0;
841 841
 		$endfor = $this->rsBlockNum1($spec);
842
-		for ($i=0; $i < $endfor; ++$i) {
842
+		for ($i = 0; $i < $endfor; ++$i) {
843 843
 			$ecc = array_slice($this->ecccode, $eccPos);
844 844
 			$this->rsblocks[$blockNo] = array();
845 845
 			$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
 			$this->rsblocks[$blockNo]['eccLength'] = $el;
848 848
 			$ecc = $this->encode_rs_char($rs, $this->rsblocks[$blockNo]['data'], $ecc);
849 849
 			$this->rsblocks[$blockNo]['ecc'] = $ecc;
850
-			$this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
850
+			$this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
851 851
 			$dataPos += $dl;
852 852
 			$eccPos += $el;
853 853
 			$blockNo++;
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
 			return -1;
863 863
 		}
864 864
 		$endfor = $this->rsBlockNum2($spec);
865
-		for ($i=0; $i < $endfor; ++$i) {
865
+		for ($i = 0; $i < $endfor; ++$i) {
866 866
 			$ecc = array_slice($this->ecccode, $eccPos);
867 867
 			$this->rsblocks[$blockNo] = array();
868 868
 			$this->rsblocks[$blockNo]['dataLength'] = $dl;
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 	protected function getCode() {
886 886
 		if ($this->count < $this->dataLength) {
887 887
 			$row = $this->count % $this->blocks;
888
-			$col = (int)($this->count / $this->blocks);
888
+			$col = (int) ($this->count / $this->blocks);
889 889
 			if ($col >= $this->rsblocks[0]['dataLength']) {
890 890
 				$row += $this->b1;
891 891
 			}
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
893 893
 			$ret = $this->rsblocks[$row]['data'][$col];
894 894
 		} elseif ($this->count < $this->dataLength + $this->eccLength) {
895 895
 			$row = ($this->count - $this->dataLength) % $this->blocks;
896
-			$col = (int)(($this->count - $this->dataLength) / $this->blocks);
896
+			$col = (int) (($this->count - $this->dataLength) / $this->blocks);
897 897
 			$ret = $this->rsblocks[$row]['ecc'][$col];
898 898
 		} else {
899 899
 			return 0;
@@ -916,8 +916,8 @@  discard block
 block discarded – undo
916 916
 	 */
917 917
 	 protected function writeFormatInformation($width, &$frame, $mask, $level) {
918 918
 		$blacks = 0;
919
-		$format =  $this->getFormatInfo($mask, $level);
920
-		for ($i=0; $i<8; ++$i) {
919
+		$format = $this->getFormatInfo($mask, $level);
920
+		for ($i = 0; $i < 8; ++$i) {
921 921
 			if ($format & 1) {
922 922
 				$blacks += 2;
923 923
 				$v = 0x85;
@@ -932,7 +932,7 @@  discard block
 block discarded – undo
932 932
 			}
933 933
 			$format = $format >> 1;
934 934
 		}
935
-		for ($i=0; $i<7; ++$i) {
935
+		for ($i = 0; $i < 7; ++$i) {
936 936
 		if ($format & 1) {
937 937
 			$blacks += 2;
938 938
 			$v = 0x85;
@@ -997,7 +997,7 @@  discard block
 block discarded – undo
997 997
 	 * @return int mask
998 998
 	 */
999 999
 	 protected function mask4($x, $y) {
1000
-		return (((int)($y / 2)) + ((int)($x / 3))) & 1;
1000
+		return (((int) ($y / 2)) + ((int) ($x / 3))) & 1;
1001 1001
 	}
1002 1002
 
1003 1003
 	/**
@@ -1039,13 +1039,13 @@  discard block
 block discarded – undo
1039 1039
 	 */
1040 1040
 	protected function generateMaskNo($maskNo, $width, $frame) {
1041 1041
 		$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
1042
-		for ($y=0; $y<$width; ++$y) {
1043
-			for ($x=0; $x<$width; ++$x) {
1042
+		for ($y = 0; $y < $width; ++$y) {
1043
+			for ($x = 0; $x < $width; ++$x) {
1044 1044
 				if (ord($frame[$y][$x]) & 0x80) {
1045 1045
 					$bitMask[$y][$x] = 0;
1046 1046
 				} else {
1047 1047
 					$maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
1048
-					$bitMask[$y][$x] = ($maskFunc == 0)?1:0;
1048
+					$bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
1049 1049
 				}
1050 1050
 			}
1051 1051
 		}
@@ -1061,7 +1061,7 @@  discard block
 block discarded – undo
1061 1061
 	 * @param boolean $maskGenOnly
1062 1062
 	 * @return int b
1063 1063
 	 */
1064
-	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
1064
+	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly = false) {
1065 1065
 		$b = 0;
1066 1066
 		$bitMask = array();
1067 1067
 		$bitMask = $this->generateMaskNo($maskNo, $width, $s);
@@ -1069,12 +1069,12 @@  discard block
 block discarded – undo
1069 1069
 			return;
1070 1070
 		}
1071 1071
 		$d = $s;
1072
-		for ($y=0; $y<$width; ++$y) {
1073
-			for ($x=0; $x<$width; ++$x) {
1072
+		for ($y = 0; $y < $width; ++$y) {
1073
+			for ($x = 0; $x < $width; ++$x) {
1074 1074
 				if ($bitMask[$y][$x] == 1) {
1075
-					$d[$y][$x] = chr(ord($s[$y][$x]) ^ ((int)($bitMask[$y][$x])));
1075
+					$d[$y][$x] = chr(ord($s[$y][$x]) ^ ((int) ($bitMask[$y][$x])));
1076 1076
 				}
1077
-				$b += (int)(ord($d[$y][$x]) & 1);
1077
+				$b += (int) (ord($d[$y][$x]) & 1);
1078 1078
 			}
1079 1079
 		}
1080 1080
 		return $b;
@@ -1102,20 +1102,20 @@  discard block
 block discarded – undo
1102 1102
 	 */
1103 1103
 	 protected function calcN1N3($length) {
1104 1104
 		$demerit = 0;
1105
-		for ($i=0; $i<$length; ++$i) {
1105
+		for ($i = 0; $i < $length; ++$i) {
1106 1106
 			if ($this->runLength[$i] >= 5) {
1107 1107
 				$demerit += (N1 + ($this->runLength[$i] - 5));
1108 1108
 			}
1109 1109
 			if ($i & 1) {
1110
-				if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
1111
-					$fact = (int)($this->runLength[$i] / 3);
1112
-					if (($this->runLength[$i-2] == $fact)
1113
-						AND ($this->runLength[$i-1] == $fact)
1114
-						AND ($this->runLength[$i+1] == $fact)
1115
-						AND ($this->runLength[$i+2] == $fact)) {
1116
-						if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
1110
+				if (($i >= 3) AND ($i < ($length - 2)) AND ($this->runLength[$i] % 3 == 0)) {
1111
+					$fact = (int) ($this->runLength[$i] / 3);
1112
+					if (($this->runLength[$i - 2] == $fact)
1113
+						AND ($this->runLength[$i - 1] == $fact)
1114
+						AND ($this->runLength[$i + 1] == $fact)
1115
+						AND ($this->runLength[$i + 2] == $fact)) {
1116
+						if (($this->runLength[$i - 3] < 0) OR ($this->runLength[$i - 3] >= (4 * $fact))) {
1117 1117
 							$demerit += N3;
1118
-						} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
1118
+						} elseif ((($i + 3) >= $length) OR ($this->runLength[$i + 3] >= (4 * $fact))) {
1119 1119
 							$demerit += N3;
1120 1120
 						}
1121 1121
 					}
@@ -1134,17 +1134,17 @@  discard block
 block discarded – undo
1134 1134
 	 protected function evaluateSymbol($width, $frame) {
1135 1135
 		$head = 0;
1136 1136
 		$demerit = 0;
1137
-		for ($y=0; $y<$width; ++$y) {
1137
+		for ($y = 0; $y < $width; ++$y) {
1138 1138
 			$head = 0;
1139 1139
 			$this->runLength[0] = 1;
1140 1140
 			$frameY = $frame[$y];
1141 1141
 			if ($y > 0) {
1142
-				$frameYM = $frame[$y-1];
1142
+				$frameYM = $frame[$y - 1];
1143 1143
 			}
1144
-			for ($x=0; $x<$width; ++$x) {
1144
+			for ($x = 0; $x < $width; ++$x) {
1145 1145
 				if (($x > 0) AND ($y > 0)) {
1146
-					$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
1147
-					$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
1146
+					$b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
1147
+					$w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
1148 1148
 					if (($b22 | ($w22 ^ 1)) & 1) {
1149 1149
 						$demerit += N2;
1150 1150
 					}
@@ -1154,7 +1154,7 @@  discard block
 block discarded – undo
1154 1154
 					$head = 1;
1155 1155
 					$this->runLength[$head] = 1;
1156 1156
 				} elseif ($x > 0) {
1157
-					if ((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
1157
+					if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
1158 1158
 						$head++;
1159 1159
 						$this->runLength[$head] = 1;
1160 1160
 					} else {
@@ -1162,18 +1162,18 @@  discard block
 block discarded – undo
1162 1162
 					}
1163 1163
 				}
1164 1164
 			}
1165
-			$demerit += $this->calcN1N3($head+1);
1165
+			$demerit += $this->calcN1N3($head + 1);
1166 1166
 		}
1167
-		for ($x=0; $x<$width; ++$x) {
1167
+		for ($x = 0; $x < $width; ++$x) {
1168 1168
 			$head = 0;
1169 1169
 			$this->runLength[0] = 1;
1170
-			for ($y=0; $y<$width; ++$y) {
1170
+			for ($y = 0; $y < $width; ++$y) {
1171 1171
 				if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
1172 1172
 					$this->runLength[0] = -1;
1173 1173
 					$head = 1;
1174 1174
 					$this->runLength[$head] = 1;
1175 1175
 				} elseif ($y > 0) {
1176
-					if ((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
1176
+					if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
1177 1177
 						$head++;
1178 1178
 						$this->runLength[$head] = 1;
1179 1179
 					} else {
@@ -1181,7 +1181,7 @@  discard block
 block discarded – undo
1181 1181
 					}
1182 1182
 				}
1183 1183
 			}
1184
-			$demerit += $this->calcN1N3($head+1);
1184
+			$demerit += $this->calcN1N3($head + 1);
1185 1185
 		}
1186 1186
 		return $demerit;
1187 1187
 	}
@@ -1200,8 +1200,8 @@  discard block
 block discarded – undo
1200 1200
 		$checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
1201 1201
 		if (QR_FIND_FROM_RANDOM !== false) {
1202 1202
 			$howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
1203
-			for ($i = 0; $i <  $howManuOut; ++$i) {
1204
-				$remPos = rand (0, count($checked_masks)-1);
1203
+			for ($i = 0; $i < $howManuOut; ++$i) {
1204
+				$remPos = rand(0, count($checked_masks) - 1);
1205 1205
 				unset($checked_masks[$remPos]);
1206 1206
 				$checked_masks = array_values($checked_masks);
1207 1207
 			}
@@ -1213,8 +1213,8 @@  discard block
 block discarded – undo
1213 1213
 			$blacks = 0;
1214 1214
 			$blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
1215 1215
 			$blacks += $this->writeFormatInformation($width, $mask, $i, $level);
1216
-			$blacks  = (int)(100 * $blacks / ($width * $width));
1217
-			$demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
1216
+			$blacks  = (int) (100 * $blacks / ($width * $width));
1217
+			$demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);
1218 1218
 			$demerit += $this->evaluateSymbol($width, $mask);
1219 1219
 			if ($demerit < $minDemerit) {
1220 1220
 				$minDemerit = $demerit;
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
 		if ($pos >= strlen($str)) {
1240 1240
 			return false;
1241 1241
 		}
1242
-		return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
1242
+		return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
1243 1243
 	}
1244 1244
 
1245 1245
 	/**
@@ -1270,8 +1270,8 @@  discard block
 block discarded – undo
1270 1270
 		} elseif ($this->isalnumat($this->dataStr, $pos)) {
1271 1271
 			return QR_MODE_AN;
1272 1272
 		} elseif ($this->hint == QR_MODE_KJ) {
1273
-			if ($pos+1 < strlen($this->dataStr)) {
1274
-				$d = $this->dataStr[$pos+1];
1273
+			if ($pos + 1 < strlen($this->dataStr)) {
1274
+				$d = $this->dataStr[$pos + 1];
1275 1275
 				$word = (ord($c) << 8) | ord($d);
1276 1276
 				if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
1277 1277
 					return QR_MODE_KJ;
@@ -1288,7 +1288,7 @@  discard block
 block discarded – undo
1288 1288
 	 protected function eatNum() {
1289 1289
 		$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
1290 1290
 		$p = 0;
1291
-		while($this->isdigitat($this->dataStr, $p)) {
1291
+		while ($this->isdigitat($this->dataStr, $p)) {
1292 1292
 			$p++;
1293 1293
 		}
1294 1294
 		$run = $p;
@@ -1304,7 +1304,7 @@  discard block
 block discarded – undo
1304 1304
 		if ($mode == QR_MODE_AN) {
1305 1305
 			$dif = $this->estimateBitsModeNum($run) + 4 + $ln
1306 1306
 			+ $this->estimateBitsModeAn(1)        // + 4 + la
1307
-			- $this->estimateBitsModeAn($run + 1);// - 4 - la
1307
+			- $this->estimateBitsModeAn($run + 1); // - 4 - la
1308 1308
 			if ($dif > 0) {
1309 1309
 				return $this->eatAn();
1310 1310
 			}
@@ -1318,13 +1318,13 @@  discard block
 block discarded – undo
1318 1318
 	 * @return int run
1319 1319
 	 */
1320 1320
 	 protected function eatAn() {
1321
-		$la = $this->lengthIndicator(QR_MODE_AN,  $this->version);
1321
+		$la = $this->lengthIndicator(QR_MODE_AN, $this->version);
1322 1322
 		$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
1323
-		$p =1 ;
1324
-		while($this->isalnumat($this->dataStr, $p)) {
1323
+		$p = 1;
1324
+		while ($this->isalnumat($this->dataStr, $p)) {
1325 1325
 			if ($this->isdigitat($this->dataStr, $p)) {
1326 1326
 				$q = $p;
1327
-				while($this->isdigitat($this->dataStr, $q)) {
1327
+				while ($this->isdigitat($this->dataStr, $q)) {
1328 1328
 					$q++;
1329 1329
 				}
1330 1330
 				$dif = $this->estimateBitsModeAn($p) // + 4 + la
@@ -1358,7 +1358,7 @@  discard block
 block discarded – undo
1358 1358
 	 */
1359 1359
 	 protected function eatKanji() {
1360 1360
 		$p = 0;
1361
-		while($this->identifyMode($p) == QR_MODE_KJ) {
1361
+		while ($this->identifyMode($p) == QR_MODE_KJ) {
1362 1362
 			$p += 2;
1363 1363
 		}
1364 1364
 		$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
@@ -1375,14 +1375,14 @@  discard block
 block discarded – undo
1375 1375
 		$ln = $this->lengthIndicator(QR_MODE_NM, $this->version);
1376 1376
 		$p = 1;
1377 1377
 		$dataStrLen = strlen($this->dataStr);
1378
-		while($p < $dataStrLen) {
1378
+		while ($p < $dataStrLen) {
1379 1379
 			$mode = $this->identifyMode($p);
1380 1380
 			if ($mode == QR_MODE_KJ) {
1381 1381
 				break;
1382 1382
 			}
1383 1383
 			if ($mode == QR_MODE_NM) {
1384 1384
 				$q = $p;
1385
-				while($this->isdigitat($this->dataStr, $q)) {
1385
+				while ($this->isdigitat($this->dataStr, $q)) {
1386 1386
 					$q++;
1387 1387
 				}
1388 1388
 				$dif = $this->estimateBitsMode8($p) // + 4 + l8
@@ -1395,7 +1395,7 @@  discard block
 block discarded – undo
1395 1395
 				}
1396 1396
 			} elseif ($mode == QR_MODE_AN) {
1397 1397
 				$q = $p;
1398
-				while($this->isalnumat($this->dataStr, $q)) {
1398
+				while ($this->isalnumat($this->dataStr, $q)) {
1399 1399
 					$q++;
1400 1400
 				}
1401 1401
 				$dif = $this->estimateBitsMode8($p)  // + 4 + l8
@@ -1487,7 +1487,7 @@  discard block
 block discarded – undo
1487 1487
 	 * @param array $bstream
1488 1488
 	 * @return array input item
1489 1489
 	 */
1490
-	 protected function newInputItem($mode, $size, $data, $bstream=null) {
1490
+	 protected function newInputItem($mode, $size, $data, $bstream = null) {
1491 1491
 		$setData = array_slice($data, 0, $size);
1492 1492
 		if (count($setData) < $size) {
1493 1493
 			$setData = array_merge($setData, array_fill(0, ($size - count($setData)), 0));
@@ -1510,23 +1510,23 @@  discard block
 block discarded – undo
1510 1510
 	 * @return array input item
1511 1511
 	 */
1512 1512
 	 protected function encodeModeNum($inputitem, $version) {
1513
-		$words = (int)($inputitem['size'] / 3);
1513
+		$words = (int) ($inputitem['size'] / 3);
1514 1514
 		$inputitem['bstream'] = array();
1515 1515
 		$val = 0x1;
1516 1516
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
1517 1517
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_NM, $version), $inputitem['size']);
1518
-		for ($i=0; $i < $words; ++$i) {
1519
-			$val  = (ord($inputitem['data'][$i*3  ]) - ord('0')) * 100;
1520
-			$val += (ord($inputitem['data'][$i*3+1]) - ord('0')) * 10;
1521
-			$val += (ord($inputitem['data'][$i*3+2]) - ord('0'));
1518
+		for ($i = 0; $i < $words; ++$i) {
1519
+			$val  = (ord($inputitem['data'][$i * 3]) - ord('0')) * 100;
1520
+			$val += (ord($inputitem['data'][$i * 3 + 1]) - ord('0')) * 10;
1521
+			$val += (ord($inputitem['data'][$i * 3 + 2]) - ord('0'));
1522 1522
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 10, $val);
1523 1523
 		}
1524 1524
 		if ($inputitem['size'] - $words * 3 == 1) {
1525
-			$val = ord($inputitem['data'][$words*3]) - ord('0');
1525
+			$val = ord($inputitem['data'][$words * 3]) - ord('0');
1526 1526
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, $val);
1527 1527
 		} elseif (($inputitem['size'] - ($words * 3)) == 2) {
1528
-			$val  = (ord($inputitem['data'][$words*3  ]) - ord('0')) * 10;
1529
-			$val += (ord($inputitem['data'][$words*3+1]) - ord('0'));
1528
+			$val  = (ord($inputitem['data'][$words * 3]) - ord('0')) * 10;
1529
+			$val += (ord($inputitem['data'][$words * 3 + 1]) - ord('0'));
1530 1530
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 7, $val);
1531 1531
 		}
1532 1532
 		return $inputitem;
@@ -1539,13 +1539,13 @@  discard block
 block discarded – undo
1539 1539
 	 * @return array input item
1540 1540
 	 */
1541 1541
 	 protected function encodeModeAn($inputitem, $version) {
1542
-		$words = (int)($inputitem['size'] / 2);
1542
+		$words = (int) ($inputitem['size'] / 2);
1543 1543
 		$inputitem['bstream'] = array();
1544 1544
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
1545 1545
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
1546
-		for ($i=0; $i < $words; ++$i) {
1547
-			$val  = (int)($this->lookAnTable(ord($inputitem['data'][$i*2])) * 45);
1548
-			$val += (int)($this->lookAnTable(ord($inputitem['data'][($i*2)+1])));
1546
+		for ($i = 0; $i < $words; ++$i) {
1547
+			$val  = (int) ($this->lookAnTable(ord($inputitem['data'][$i * 2])) * 45);
1548
+			$val += (int) ($this->lookAnTable(ord($inputitem['data'][($i * 2) + 1])));
1549 1549
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
1550 1550
 		}
1551 1551
 		if ($inputitem['size'] & 1) {
@@ -1565,7 +1565,7 @@  discard block
 block discarded – undo
1565 1565
 		$inputitem['bstream'] = array();
1566 1566
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x4);
1567 1567
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_8B, $version), $inputitem['size']);
1568
-		for ($i=0; $i < $inputitem['size']; ++$i) {
1568
+		for ($i = 0; $i < $inputitem['size']; ++$i) {
1569 1569
 			$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 8, ord($inputitem['data'][$i]));
1570 1570
 		}
1571 1571
 		return $inputitem;
@@ -1580,9 +1580,9 @@  discard block
 block discarded – undo
1580 1580
 	 protected function encodeModeKanji($inputitem, $version) {
1581 1581
 		$inputitem['bstream'] = array();
1582 1582
 		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x8);
1583
-		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int)($inputitem['size'] / 2));
1584
-		for ($i=0; $i<$inputitem['size']; $i+=2) {
1585
-			$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i+1]);
1583
+		$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_KJ, $version), (int) ($inputitem['size'] / 2));
1584
+		for ($i = 0; $i < $inputitem['size']; $i += 2) {
1585
+			$val = (ord($inputitem['data'][$i]) << 8) | ord($inputitem['data'][$i + 1]);
1586 1586
 			if ($val <= 0x9ffc) {
1587 1587
 				$val -= 0x8140;
1588 1588
 			} else {
@@ -1627,7 +1627,7 @@  discard block
 block discarded – undo
1627 1627
 			$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
1628 1628
 			$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
1629 1629
 		} else {
1630
-			switch($inputitem['mode']) {
1630
+			switch ($inputitem['mode']) {
1631 1631
 				case QR_MODE_NM: {
1632 1632
 					$inputitem = $this->encodeModeNum($inputitem, $version);
1633 1633
 					break;
@@ -1708,7 +1708,7 @@  discard block
 block discarded – undo
1708 1708
 		$parity = 0;
1709 1709
 		foreach ($items as $item) {
1710 1710
 			if ($item['mode'] != QR_MODE_ST) {
1711
-				for ($i=$item['size']-1; $i>=0; --$i) {
1711
+				for ($i = $item['size'] - 1; $i >= 0; --$i) {
1712 1712
 					$parity ^= $item['data'][$i];
1713 1713
 				}
1714 1714
 			}
@@ -1723,8 +1723,8 @@  discard block
 block discarded – undo
1723 1723
 	 * @return boolean true or false
1724 1724
 	 */
1725 1725
 	 protected function checkModeNum($size, $data) {
1726
-		for ($i=0; $i<$size; ++$i) {
1727
-			if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
1726
+		for ($i = 0; $i < $size; ++$i) {
1727
+			if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))) {
1728 1728
 				return false;
1729 1729
 			}
1730 1730
 		}
@@ -1737,7 +1737,7 @@  discard block
 block discarded – undo
1737 1737
 	 * @return int value
1738 1738
 	 */
1739 1739
 	protected function lookAnTable($c) {
1740
-		return (($c > 127)?-1:$this->anTable[$c]);
1740
+		return (($c > 127) ?-1 : $this->anTable[$c]);
1741 1741
 	}
1742 1742
 
1743 1743
 	/**
@@ -1747,7 +1747,7 @@  discard block
 block discarded – undo
1747 1747
 	 * @return boolean true or false
1748 1748
 	 */
1749 1749
 	 protected function checkModeAn($size, $data) {
1750
-		for ($i=0; $i<$size; ++$i) {
1750
+		for ($i = 0; $i < $size; ++$i) {
1751 1751
 			if ($this->lookAnTable(ord($data[$i])) == -1) {
1752 1752
 				return false;
1753 1753
 			}
@@ -1761,9 +1761,9 @@  discard block
 block discarded – undo
1761 1761
 	 * @return int number of bits
1762 1762
 	 */
1763 1763
 	 protected function estimateBitsModeNum($size) {
1764
-		$w = (int)($size / 3);
1764
+		$w = (int) ($size / 3);
1765 1765
 		$bits = ($w * 10);
1766
-		switch($size - ($w * 3)) {
1766
+		switch ($size - ($w * 3)) {
1767 1767
 			case 1: {
1768 1768
 				$bits += 4;
1769 1769
 				break;
@@ -1782,7 +1782,7 @@  discard block
 block discarded – undo
1782 1782
 	 * @return int number of bits
1783 1783
 	 */
1784 1784
 	 protected function estimateBitsModeAn($size) {
1785
-		$bits = (int)($size * 5.5); // (size / 2 ) * 11
1785
+		$bits = (int) ($size * 5.5); // (size / 2 ) * 11
1786 1786
 		if ($size & 1) {
1787 1787
 			$bits += 6;
1788 1788
 		}
@@ -1795,7 +1795,7 @@  discard block
 block discarded – undo
1795 1795
 	 * @return int number of bits
1796 1796
 	 */
1797 1797
 	 protected function estimateBitsMode8($size) {
1798
-		return (int)($size * 8);
1798
+		return (int) ($size * 8);
1799 1799
 	}
1800 1800
 
1801 1801
 	/**
@@ -1804,7 +1804,7 @@  discard block
 block discarded – undo
1804 1804
 	 * @return int number of bits
1805 1805
 	 */
1806 1806
 	 protected function estimateBitsModeKanji($size) {
1807
-		return (int)($size * 6.5); // (size / 2 ) * 13
1807
+		return (int) ($size * 6.5); // (size / 2 ) * 13
1808 1808
 	}
1809 1809
 
1810 1810
 	/**
@@ -1817,8 +1817,8 @@  discard block
 block discarded – undo
1817 1817
 		if ($size & 1) {
1818 1818
 			return false;
1819 1819
 		}
1820
-		for ($i=0; $i<$size; $i+=2) {
1821
-			$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
1820
+		for ($i = 0; $i < $size; $i += 2) {
1821
+			$val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
1822 1822
 			if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
1823 1823
 				return false;
1824 1824
 			}
@@ -1837,7 +1837,7 @@  discard block
 block discarded – undo
1837 1837
 		if ($size <= 0) {
1838 1838
 			return false;
1839 1839
 		}
1840
-		switch($mode) {
1840
+		switch ($mode) {
1841 1841
 			case QR_MODE_NM: {
1842 1842
 				return $this->checkModeNum($size, $data);
1843 1843
 			}
@@ -1872,7 +1872,7 @@  discard block
 block discarded – undo
1872 1872
 			$version = 1;
1873 1873
 		}
1874 1874
 		foreach ($items as $item) {
1875
-			switch($item['mode']) {
1875
+			switch ($item['mode']) {
1876 1876
 				case QR_MODE_NM: {
1877 1877
 					$bits = $this->estimateBitsModeNum($item['size']);
1878 1878
 					break;
@@ -1898,7 +1898,7 @@  discard block
 block discarded – undo
1898 1898
 			}
1899 1899
 			$l = $this->lengthIndicator($item['mode'], $version);
1900 1900
 			$m = 1 << $l;
1901
-			$num = (int)(($item['size'] + $m - 1) / $m);
1901
+			$num = (int) (($item['size'] + $m - 1) / $m);
1902 1902
 			$bits += $num * (4 + $l);
1903 1903
 		}
1904 1904
 		return $bits;
@@ -1915,7 +1915,7 @@  discard block
 block discarded – undo
1915 1915
 		do {
1916 1916
 			$prev = $version;
1917 1917
 			$bits = $this->estimateBitStreamSize($items, $prev);
1918
-			$version = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
1918
+			$version = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level);
1919 1919
 			if ($version < 0) {
1920 1920
 				return -1;
1921 1921
 			}
@@ -1932,9 +1932,9 @@  discard block
 block discarded – undo
1932 1932
 	 */
1933 1933
 	 protected function lengthOfCode($mode, $version, $bits) {
1934 1934
 		$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
1935
-		switch($mode) {
1935
+		switch ($mode) {
1936 1936
 			case QR_MODE_NM: {
1937
-				$chunks = (int)($payload / 10);
1937
+				$chunks = (int) ($payload / 10);
1938 1938
 				$remain = $payload - $chunks * 10;
1939 1939
 				$size = $chunks * 3;
1940 1940
 				if ($remain >= 7) {
@@ -1945,7 +1945,7 @@  discard block
 block discarded – undo
1945 1945
 				break;
1946 1946
 			}
1947 1947
 			case QR_MODE_AN: {
1948
-				$chunks = (int)($payload / 11);
1948
+				$chunks = (int) ($payload / 11);
1949 1949
 				$remain = $payload - $chunks * 11;
1950 1950
 				$size = $chunks * 2;
1951 1951
 				if ($remain >= 6) {
@@ -1954,15 +1954,15 @@  discard block
 block discarded – undo
1954 1954
 				break;
1955 1955
 			}
1956 1956
 			case QR_MODE_8B: {
1957
-				$size = (int)($payload / 8);
1957
+				$size = (int) ($payload / 8);
1958 1958
 				break;
1959 1959
 			}
1960 1960
 			case QR_MODE_KJ: {
1961
-				$size = (int)(($payload / 13) * 2);
1961
+				$size = (int) (($payload / 13) * 2);
1962 1962
 				break;
1963 1963
 			}
1964 1964
 			case QR_MODE_ST: {
1965
-				$size = (int)($payload / 8);
1965
+				$size = (int) ($payload / 8);
1966 1966
 				break;
1967 1967
 			}
1968 1968
 			default: {
@@ -2012,7 +2012,7 @@  discard block
 block discarded – undo
2012 2012
 			if ($bits < 0) {
2013 2013
 				return -1;
2014 2014
 			}
2015
-			$ver = $this->getMinimumVersion((int)(($bits + 7) / 8), $this->level);
2015
+			$ver = $this->getMinimumVersion((int) (($bits + 7) / 8), $this->level);
2016 2016
 			if ($ver < 0) {
2017 2017
 				return -1;
2018 2018
 			} elseif ($ver > $this->version) {
@@ -2043,14 +2043,14 @@  discard block
 block discarded – undo
2043 2043
 			return $this->appendNum($bstream, $maxbits - $bits, 0);
2044 2044
 		}
2045 2045
 		$bits += 4;
2046
-		$words = (int)(($bits + 7) / 8);
2046
+		$words = (int) (($bits + 7) / 8);
2047 2047
 		$padding = array();
2048 2048
 		$padding = $this->appendNum($padding, $words * 8 - $bits + 4, 0);
2049 2049
 		$padlen = $maxwords - $words;
2050 2050
 		if ($padlen > 0) {
2051 2051
 			$padbuf = array();
2052
-			for ($i=0; $i<$padlen; ++$i) {
2053
-				$padbuf[$i] = ($i&1)?0x11:0xec;
2052
+			for ($i = 0; $i < $padlen; ++$i) {
2053
+				$padbuf[$i] = ($i&1) ? 0x11 : 0xec;
2054 2054
 			}
2055 2055
 			$padding = $this->appendBytes($padding, $padlen, $padbuf);
2056 2056
 		}
@@ -2116,7 +2116,7 @@  discard block
 block discarded – undo
2116 2116
 	 protected function newFromNum($bits, $num) {
2117 2117
 		$bstream = $this->allocate($bits);
2118 2118
 		$mask = 1 << ($bits - 1);
2119
-		for ($i=0; $i<$bits; ++$i) {
2119
+		for ($i = 0; $i < $bits; ++$i) {
2120 2120
 			if ($num & $mask) {
2121 2121
 				$bstream[$i] = 1;
2122 2122
 			} else {
@@ -2135,10 +2135,10 @@  discard block
 block discarded – undo
2135 2135
 	 */
2136 2136
 	 protected function newFromBytes($size, $data) {
2137 2137
 		$bstream = $this->allocate($size * 8);
2138
-		$p=0;
2139
-		for ($i=0; $i<$size; ++$i) {
2138
+		$p = 0;
2139
+		for ($i = 0; $i < $size; ++$i) {
2140 2140
 			$mask = 0x80;
2141
-			for ($j=0; $j<8; ++$j) {
2141
+			for ($j = 0; $j < 8; ++$j) {
2142 2142
 				if ($data[$i] & $mask) {
2143 2143
 					$bstream[$p] = 1;
2144 2144
 				} else {
@@ -2210,12 +2210,12 @@  discard block
 block discarded – undo
2210 2210
 		if ($size == 0) {
2211 2211
 			return array();
2212 2212
 		}
2213
-		$data = array_fill(0, (int)(($size + 7) / 8), 0);
2214
-		$bytes = (int)($size / 8);
2213
+		$data = array_fill(0, (int) (($size + 7) / 8), 0);
2214
+		$bytes = (int) ($size / 8);
2215 2215
 		$p = 0;
2216
-		for ($i=0; $i<$bytes; $i++) {
2216
+		for ($i = 0; $i < $bytes; $i++) {
2217 2217
 			$v = 0;
2218
-			for ($j=0; $j<8; $j++) {
2218
+			for ($j = 0; $j < 8; $j++) {
2219 2219
 				$v = $v << 1;
2220 2220
 				$v |= $bstream[$p];
2221 2221
 				$p++;
@@ -2224,7 +2224,7 @@  discard block
 block discarded – undo
2224 2224
 		}
2225 2225
 		if ($size & 7) {
2226 2226
 			$v = 0;
2227
-			for ($j=0; $j<($size & 7); $j++) {
2227
+			for ($j = 0; $j < ($size & 7); $j++) {
2228 2228
 				$v = $v << 1;
2229 2229
 				$v |= $bstream[$p];
2230 2230
 				$p++;
@@ -2247,8 +2247,8 @@  discard block
 block discarded – undo
2247 2247
 	 * @param int $replLen length of the repl string
2248 2248
 	 * @return array srctab
2249 2249
 	 */
2250
-	 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
2251
-		$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));
2250
+	 protected function qrstrset($srctab, $x, $y, $repl, $replLen = false) {
2251
+		$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
2252 2252
 		return $srctab;
2253 2253
 	}
2254 2254
 
@@ -2268,7 +2268,7 @@  discard block
 block discarded – undo
2268 2268
 	 * @param int $level error correction level
2269 2269
 	 * @return int ECC size (bytes)
2270 2270
 	 */
2271
-	protected function getECCLength($version, $level){
2271
+	protected function getECCLength($version, $level) {
2272 2272
 		return $this->capacity[$version][QRCAP_EC][$level];
2273 2273
 	}
2274 2274
 
@@ -2369,14 +2369,14 @@  discard block
 block discarded – undo
2369 2369
 		$ecc = $this->getECCLength($version, $level);
2370 2370
 		if ($b2 == 0) {
2371 2371
 			$spec[0] = $b1;
2372
-			$spec[1] = (int)($data / $b1);
2373
-			$spec[2] = (int)($ecc / $b1);
2372
+			$spec[1] = (int) ($data / $b1);
2373
+			$spec[2] = (int) ($ecc / $b1);
2374 2374
 			$spec[3] = 0;
2375 2375
 			$spec[4] = 0;
2376 2376
 		} else {
2377 2377
 			$spec[0] = $b1;
2378
-			$spec[1] = (int)($data / ($b1 + $b2));
2379
-			$spec[2] = (int)($ecc  / ($b1 + $b2));
2378
+			$spec[1] = (int) ($data / ($b1 + $b2));
2379
+			$spec[2] = (int) ($ecc / ($b1 + $b2));
2380 2380
 			$spec[3] = $b2;
2381 2381
 			$spec[4] = $spec[1] + 1;
2382 2382
 		}
@@ -2400,8 +2400,8 @@  discard block
 block discarded – undo
2400 2400
 			);
2401 2401
 		$yStart = $oy - 2;
2402 2402
 		$xStart = $ox - 2;
2403
-		for ($y=0; $y < 5; $y++) {
2404
-			$frame = $this->qrstrset($frame, $xStart, $yStart+$y, $finder[$y]);
2403
+		for ($y = 0; $y < 5; $y++) {
2404
+			$frame = $this->qrstrset($frame, $xStart, $yStart + $y, $finder[$y]);
2405 2405
 		}
2406 2406
 		return $frame;
2407 2407
 	}
@@ -2421,7 +2421,7 @@  discard block
 block discarded – undo
2421 2421
 		if ($d < 0) {
2422 2422
 			$w = 2;
2423 2423
 		} else {
2424
-			$w = (int)(($width - $this->alignmentPattern[$version][0]) / $d + 2);
2424
+			$w = (int) (($width - $this->alignmentPattern[$version][0]) / $d + 2);
2425 2425
 		}
2426 2426
 		if ($w * $w - 3 == 1) {
2427 2427
 			$x = $this->alignmentPattern[$version][0];
@@ -2431,15 +2431,15 @@  discard block
 block discarded – undo
2431 2431
 		}
2432 2432
 		$cx = $this->alignmentPattern[$version][0];
2433 2433
 		$wo = $w - 1;
2434
-		for ($x=1; $x < $wo; ++$x) {
2434
+		for ($x = 1; $x < $wo; ++$x) {
2435 2435
 			$frame = $this->putAlignmentMarker($frame, 6, $cx);
2436
-			$frame = $this->putAlignmentMarker($frame, $cx,  6);
2436
+			$frame = $this->putAlignmentMarker($frame, $cx, 6);
2437 2437
 			$cx += $d;
2438 2438
 		}
2439 2439
 		$cy = $this->alignmentPattern[$version][0];
2440
-		for ($y=0; $y < $wo; ++$y) {
2440
+		for ($y = 0; $y < $wo; ++$y) {
2441 2441
 			$cx = $this->alignmentPattern[$version][0];
2442
-			for ($x=0; $x < $wo; ++$x) {
2442
+			for ($x = 0; $x < $wo; ++$x) {
2443 2443
 				$frame = $this->putAlignmentMarker($frame, $cx, $cy);
2444 2444
 				$cx += $d;
2445 2445
 			}
@@ -2493,7 +2493,7 @@  discard block
 block discarded – undo
2493 2493
 		"\xc1\xc0\xc0\xc0\xc0\xc0\xc1",
2494 2494
 		"\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
2495 2495
 		);
2496
-		for ($y=0; $y < 7; $y++) {
2496
+		for ($y = 0; $y < 7; $y++) {
2497 2497
 			$frame = $this->qrstrset($frame, $ox, ($oy + $y), $finder[$y]);
2498 2498
 		}
2499 2499
 		return $frame;
@@ -2506,7 +2506,7 @@  discard block
 block discarded – undo
2506 2506
 	 */
2507 2507
 	protected function createFrame($version) {
2508 2508
 		$width = $this->capacity[$version][QRCAP_WIDTH];
2509
-		$frameLine = str_repeat ("\0", $width);
2509
+		$frameLine = str_repeat("\0", $width);
2510 2510
 		$frame = array_fill(0, $width, $frameLine);
2511 2511
 		// Finder pattern
2512 2512
 		$frame = $this->putFinderPattern($frame, 0, 0);
@@ -2514,7 +2514,7 @@  discard block
 block discarded – undo
2514 2514
 		$frame = $this->putFinderPattern($frame, 0, $width - 7);
2515 2515
 		// Separator
2516 2516
 		$yOffset = $width - 7;
2517
-		for ($y=0; $y < 7; ++$y) {
2517
+		for ($y = 0; $y < 7; ++$y) {
2518 2518
 			$frame[$y][7] = "\xc0";
2519 2519
 			$frame[$y][$width - 8] = "\xc0";
2520 2520
 			$frame[$yOffset][7] = "\xc0";
@@ -2522,22 +2522,22 @@  discard block
 block discarded – undo
2522 2522
 		}
2523 2523
 		$setPattern = str_repeat("\xc0", 8);
2524 2524
 		$frame = $this->qrstrset($frame, 0, 7, $setPattern);
2525
-		$frame = $this->qrstrset($frame, $width-8, 7, $setPattern);
2525
+		$frame = $this->qrstrset($frame, $width - 8, 7, $setPattern);
2526 2526
 		$frame = $this->qrstrset($frame, 0, $width - 8, $setPattern);
2527 2527
 		// Format info
2528 2528
 		$setPattern = str_repeat("\x84", 9);
2529 2529
 		$frame = $this->qrstrset($frame, 0, 8, $setPattern);
2530 2530
 		$frame = $this->qrstrset($frame, $width - 8, 8, $setPattern, 8);
2531 2531
 		$yOffset = $width - 8;
2532
-		for ($y=0; $y < 8; ++$y,++$yOffset) {
2532
+		for ($y = 0; $y < 8; ++$y, ++$yOffset) {
2533 2533
 			$frame[$y][8] = "\x84";
2534 2534
 			$frame[$yOffset][8] = "\x84";
2535 2535
 		}
2536 2536
 		// Timing pattern
2537 2537
 		$wo = $width - 15;
2538
-		for ($i=1; $i < $wo; ++$i) {
2539
-			$frame[6][7+$i] = chr(0x90 | ($i & 1));
2540
-			$frame[7+$i][6] = chr(0x90 | ($i & 1));
2538
+		for ($i = 1; $i < $wo; ++$i) {
2539
+			$frame[6][7 + $i] = chr(0x90 | ($i & 1));
2540
+			$frame[7 + $i][6] = chr(0x90 | ($i & 1));
2541 2541
 		}
2542 2542
 		// Alignment pattern
2543 2543
 		$frame = $this->putAlignmentPattern($version, $frame, $width);
@@ -2545,16 +2545,16 @@  discard block
 block discarded – undo
2545 2545
 		if ($version >= 7) {
2546 2546
 			$vinf = $this->getVersionPattern($version);
2547 2547
 			$v = $vinf;
2548
-			for ($x=0; $x<6; ++$x) {
2549
-				for ($y=0; $y<3; ++$y) {
2550
-					$frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
2548
+			for ($x = 0; $x < 6; ++$x) {
2549
+				for ($y = 0; $y < 3; ++$y) {
2550
+					$frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));
2551 2551
 					$v = $v >> 1;
2552 2552
 				}
2553 2553
 			}
2554 2554
 			$v = $vinf;
2555
-			for ($y=0; $y<6; ++$y) {
2556
-				for ($x=0; $x<3; ++$x) {
2557
-					$frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
2555
+			for ($y = 0; $y < 6; ++$y) {
2556
+				for ($x = 0; $x < 3; ++$x) {
2557
+					$frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));
2558 2558
 					$v = $v >> 1;
2559 2559
 				}
2560 2560
 			}
@@ -2725,16 +2725,16 @@  discard block
 block discarded – undo
2725 2725
 		if (($symsize < 0) OR ($symsize > 8)) {
2726 2726
 			return $rs;
2727 2727
 		}
2728
-		if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
2728
+		if (($fcr < 0) OR ($fcr >= (1 << $symsize))) {
2729 2729
 			return $rs;
2730 2730
 		}
2731
-		if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
2731
+		if (($prim <= 0) OR ($prim >= (1 << $symsize))) {
2732 2732
 			return $rs;
2733 2733
 		}
2734
-		if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
2734
+		if (($nroots < 0) OR ($nroots >= (1 << $symsize))) {
2735 2735
 			return $rs;
2736 2736
 		}
2737
-		if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
2737
+		if (($pad < 0) OR ($pad >= ((1 << $symsize) - 1 - $nroots))) {
2738 2738
 			return $rs;
2739 2739
 		}
2740 2740
 		$rs = array();
@@ -2744,13 +2744,13 @@  discard block
 block discarded – undo
2744 2744
 		$rs['alpha_to'] = array_fill(0, ($rs['nn'] + 1), 0);
2745 2745
 		$rs['index_of'] = array_fill(0, ($rs['nn'] + 1), 0);
2746 2746
 		// PHP style macro replacement ;)
2747
-		$NN =& $rs['nn'];
2748
-		$A0 =& $NN;
2747
+		$NN = & $rs['nn'];
2748
+		$A0 = & $NN;
2749 2749
 		// Generate Galois field lookup tables
2750 2750
 		$rs['index_of'][0] = $A0; // log(zero) = -inf
2751 2751
 		$rs['alpha_to'][$A0] = 0; // alpha**-inf = 0
2752 2752
 		$sr = 1;
2753
-		for ($i=0; $i<$rs['nn']; ++$i) {
2753
+		for ($i = 0; $i < $rs['nn']; ++$i) {
2754 2754
 			$rs['index_of'][$sr] = $i;
2755 2755
 			$rs['alpha_to'][$i] = $sr;
2756 2756
 			$sr <<= 1;
@@ -2770,19 +2770,19 @@  discard block
 block discarded – undo
2770 2770
 		$rs['nroots'] = $nroots;
2771 2771
 		$rs['gfpoly'] = $gfpoly;
2772 2772
 		// Find prim-th root of 1, used in decoding
2773
-		for ($iprim=1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
2773
+		for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs['nn']) {
2774 2774
 			; // intentional empty-body loop!
2775 2775
 		}
2776
-		$rs['iprim'] = (int)($iprim / $prim);
2776
+		$rs['iprim'] = (int) ($iprim / $prim);
2777 2777
 		$rs['genpoly'][0] = 1;
2778
-		for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
2779
-			$rs['genpoly'][$i+1] = 1;
2778
+		for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {
2779
+			$rs['genpoly'][$i + 1] = 1;
2780 2780
 			// Multiply rs->genpoly[] by  @**(root + x)
2781 2781
 			for ($j = $i; $j > 0; --$j) {
2782 2782
 				if ($rs['genpoly'][$j] != 0) {
2783
-					$rs['genpoly'][$j] = $rs['genpoly'][$j-1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
2783
+					$rs['genpoly'][$j] = $rs['genpoly'][$j - 1] ^ $rs['alpha_to'][$this->modnn($rs, $rs['index_of'][$rs['genpoly'][$j]] + $root)];
2784 2784
 				} else {
2785
-					$rs['genpoly'][$j] = $rs['genpoly'][$j-1];
2785
+					$rs['genpoly'][$j] = $rs['genpoly'][$j - 1];
2786 2786
 				}
2787 2787
 			}
2788 2788
 			// rs->genpoly[0] can never be zero
@@ -2803,26 +2803,26 @@  discard block
 block discarded – undo
2803 2803
 	 * @return parity array
2804 2804
 	 */
2805 2805
 	 protected function encode_rs_char($rs, $data, $parity) {
2806
-		$MM       =& $rs['mm']; // bits per symbol
2807
-		$NN       =& $rs['nn']; // the total number of symbols in a RS block
2808
-		$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
2809
-		$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
2810
-		$GENPOLY  =& $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
2811
-		$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
2812
-		$FCR      =& $rs['fcr']; // first consecutive root, index form
2813
-		$PRIM     =& $rs['prim']; // primitive element, index form
2814
-		$IPRIM    =& $rs['iprim']; // prim-th root of 1, index form
2815
-		$PAD      =& $rs['pad']; // the number of pad symbols in a block
2816
-		$A0       =& $NN;
2806
+		$MM       = & $rs['mm']; // bits per symbol
2807
+		$NN       = & $rs['nn']; // the total number of symbols in a RS block
2808
+		$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
2809
+		$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
2810
+		$GENPOLY  = & $rs['genpoly']; // an array of NROOTS+1 elements containing the generator polynomial in index form
2811
+		$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
2812
+		$FCR      = & $rs['fcr']; // first consecutive root, index form
2813
+		$PRIM     = & $rs['prim']; // primitive element, index form
2814
+		$IPRIM    = & $rs['iprim']; // prim-th root of 1, index form
2815
+		$PAD      = & $rs['pad']; // the number of pad symbols in a block
2816
+		$A0       = & $NN;
2817 2817
 		$parity = array_fill(0, $NROOTS, 0);
2818
-		for ($i=0; $i < ($NN - $NROOTS - $PAD); $i++) {
2818
+		for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {
2819 2819
 			$feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
2820 2820
 			if ($feedback != $A0) {
2821 2821
 				// feedback term is non-zero
2822 2822
 				// This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
2823 2823
 				// always be for the polynomials constructed by init_rs()
2824 2824
 				$feedback = $this->modnn($rs, $NN - $GENPOLY[$NROOTS] + $feedback);
2825
-				for ($j=1; $j < $NROOTS; ++$j) {
2825
+				for ($j = 1; $j < $NROOTS; ++$j) {
2826 2826
 				$parity[$j] ^= $ALPHA_TO[$this->modnn($rs, $feedback + $GENPOLY[($NROOTS - $j)])];
2827 2827
 				}
2828 2828
 			}
Please login to merge, or discard this patch.
Upper-Lower-Casing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -613,7 +613,7 @@  discard block
 block discarded – undo
613 613
 	 */
614 614
 	public function __construct($code, $eclevel = 'L') {
615 615
 		$barcode_array = array();
616
-		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
616
+		if ((is_null($code)) or ($code == '\0') or ($code == '')) {
617 617
 			return false;
618 618
 		}
619 619
 		// set error correction level
@@ -621,10 +621,10 @@  discard block
 block discarded – undo
621 621
 		if ($this->level === false) {
622 622
 			$this->level = QR_ECLEVEL_L;
623 623
 		}
624
-		if (($this->hint != QR_MODE_8B) AND ($this->hint != QR_MODE_KJ)) {
624
+		if (($this->hint != QR_MODE_8B) and ($this->hint != QR_MODE_KJ)) {
625 625
 			return false;
626 626
 		}
627
-		if (($this->version < 0) OR ($this->version > QRSPEC_VERSION_MAX)) {
627
+		if (($this->version < 0) or ($this->version > QRSPEC_VERSION_MAX)) {
628 628
 			return false;
629 629
 		}
630 630
 		$this->items = array();
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
 					}
814 814
 				}
815 815
 			}
816
-			if (($x < 0) OR ($y < 0)) {
816
+			if (($x < 0) or ($y < 0)) {
817 817
 				return NULL;
818 818
 			}
819 819
 			$this->x = $x;
@@ -1107,15 +1107,15 @@  discard block
 block discarded – undo
1107 1107
 				$demerit += (N1 + ($this->runLength[$i] - 5));
1108 1108
 			}
1109 1109
 			if ($i & 1) {
1110
-				if (($i >= 3) AND ($i < ($length-2)) AND ($this->runLength[$i] % 3 == 0)) {
1110
+				if (($i >= 3) and ($i < ($length-2)) and ($this->runLength[$i] % 3 == 0)) {
1111 1111
 					$fact = (int)($this->runLength[$i] / 3);
1112 1112
 					if (($this->runLength[$i-2] == $fact)
1113
-						AND ($this->runLength[$i-1] == $fact)
1114
-						AND ($this->runLength[$i+1] == $fact)
1115
-						AND ($this->runLength[$i+2] == $fact)) {
1116
-						if (($this->runLength[$i-3] < 0) OR ($this->runLength[$i-3] >= (4 * $fact))) {
1113
+						and ($this->runLength[$i-1] == $fact)
1114
+						and ($this->runLength[$i+1] == $fact)
1115
+						and ($this->runLength[$i+2] == $fact)) {
1116
+						if (($this->runLength[$i-3] < 0) or ($this->runLength[$i-3] >= (4 * $fact))) {
1117 1117
 							$demerit += N3;
1118
-						} elseif ((($i+3) >= $length) OR ($this->runLength[$i+3] >= (4 * $fact))) {
1118
+						} elseif ((($i+3) >= $length) or ($this->runLength[$i+3] >= (4 * $fact))) {
1119 1119
 							$demerit += N3;
1120 1120
 						}
1121 1121
 					}
@@ -1142,14 +1142,14 @@  discard block
 block discarded – undo
1142 1142
 				$frameYM = $frame[$y-1];
1143 1143
 			}
1144 1144
 			for ($x=0; $x<$width; ++$x) {
1145
-				if (($x > 0) AND ($y > 0)) {
1145
+				if (($x > 0) and ($y > 0)) {
1146 1146
 					$b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
1147 1147
 					$w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
1148 1148
 					if (($b22 | ($w22 ^ 1)) & 1) {
1149 1149
 						$demerit += N2;
1150 1150
 					}
1151 1151
 				}
1152
-				if (($x == 0) AND (ord($frameY[$x]) & 1)) {
1152
+				if (($x == 0) and (ord($frameY[$x]) & 1)) {
1153 1153
 					$this->runLength[0] = -1;
1154 1154
 					$head = 1;
1155 1155
 					$this->runLength[$head] = 1;
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 			$head = 0;
1169 1169
 			$this->runLength[0] = 1;
1170 1170
 			for ($y=0; $y<$width; ++$y) {
1171
-				if (($y == 0) AND (ord($frame[$y][$x]) & 1)) {
1171
+				if (($y == 0) and (ord($frame[$y][$x]) & 1)) {
1172 1172
 					$this->runLength[0] = -1;
1173 1173
 					$head = 1;
1174 1174
 					$this->runLength[$head] = 1;
@@ -1273,7 +1273,7 @@  discard block
 block discarded – undo
1273 1273
 			if ($pos+1 < strlen($this->dataStr)) {
1274 1274
 				$d = $this->dataStr[$pos+1];
1275 1275
 				$word = (ord($c) << 8) | ord($d);
1276
-				if (($word >= 0x8140 && $word <= 0x9ffc) OR ($word >= 0xe040 && $word <= 0xebbf)) {
1276
+				if (($word >= 0x8140 && $word <= 0x9ffc) or ($word >= 0xe040 && $word <= 0xebbf)) {
1277 1277
 					return QR_MODE_KJ;
1278 1278
 				}
1279 1279
 			}
@@ -1466,7 +1466,7 @@  discard block
 block discarded – undo
1466 1466
 			if ($mode == QR_MODE_KJ) {
1467 1467
 				$p += 2;
1468 1468
 			} else {
1469
-				if ((ord($this->dataStr[$p]) >= ord('a')) AND (ord($this->dataStr[$p]) <= ord('z'))) {
1469
+				if ((ord($this->dataStr[$p]) >= ord('a')) and (ord($this->dataStr[$p]) <= ord('z'))) {
1470 1470
 					$this->dataStr[$p] = chr(ord($this->dataStr[$p]) - 32);
1471 1471
 				}
1472 1472
 				$p++;
@@ -1690,7 +1690,7 @@  discard block
 block discarded – undo
1690 1690
 		if ($size > MAX_STRUCTURED_SYMBOLS) {
1691 1691
 			return -1;
1692 1692
 		}
1693
-		if (($index <= 0) OR ($index > MAX_STRUCTURED_SYMBOLS)) {
1693
+		if (($index <= 0) or ($index > MAX_STRUCTURED_SYMBOLS)) {
1694 1694
 			return -1;
1695 1695
 		}
1696 1696
 		$buf = array($size, $index, $parity);
@@ -1724,7 +1724,7 @@  discard block
 block discarded – undo
1724 1724
 	 */
1725 1725
 	 protected function checkModeNum($size, $data) {
1726 1726
 		for ($i=0; $i<$size; ++$i) {
1727
-			if ((ord($data[$i]) < ord('0')) OR (ord($data[$i]) > ord('9'))){
1727
+			if ((ord($data[$i]) < ord('0')) or (ord($data[$i]) > ord('9'))){
1728 1728
 				return false;
1729 1729
 			}
1730 1730
 		}
@@ -1819,7 +1819,7 @@  discard block
 block discarded – undo
1819 1819
 		}
1820 1820
 		for ($i=0; $i<$size; $i+=2) {
1821 1821
 			$val = (ord($data[$i]) << 8) | ord($data[$i+1]);
1822
-			if (($val < 0x8140) OR (($val > 0x9ffc) AND ($val < 0xe040)) OR ($val > 0xebbf)) {
1822
+			if (($val < 0x8140) or (($val > 0x9ffc) and ($val < 0xe040)) or ($val > 0xebbf)) {
1823 1823
 				return false;
1824 1824
 			}
1825 1825
 		}
@@ -2158,7 +2158,7 @@  discard block
 block discarded – undo
2158 2158
 	 * @return array bitstream
2159 2159
 	 */
2160 2160
 	 protected function appendBitstream($bitstream, $append) {
2161
-		if ((!is_array($append)) OR (count($append) == 0)) {
2161
+		if ((!is_array($append)) or (count($append) == 0)) {
2162 2162
 			return $bitstream;
2163 2163
 		}
2164 2164
 		if (count($bitstream) == 0) {
@@ -2454,7 +2454,7 @@  discard block
 block discarded – undo
2454 2454
 	 * @return string BCH encoded version information pattern
2455 2455
 	 */
2456 2456
 	protected function getVersionPattern($version) {
2457
-		if (($version < 7) OR ($version > QRSPEC_VERSION_MAX)) {
2457
+		if (($version < 7) or ($version > QRSPEC_VERSION_MAX)) {
2458 2458
 			return 0;
2459 2459
 		}
2460 2460
 		return $this->versionPattern[($version - 7)];
@@ -2467,10 +2467,10 @@  discard block
 block discarded – undo
2467 2467
 	 * @return string BCH encoded format information pattern
2468 2468
 	 */
2469 2469
 	protected function getFormatInfo($mask, $level) {
2470
-		if (($mask < 0) OR ($mask > 7)) {
2470
+		if (($mask < 0) or ($mask > 7)) {
2471 2471
 			return 0;
2472 2472
 		}
2473
-		if (($level < 0) OR ($level > 3)) {
2473
+		if (($level < 0) or ($level > 3)) {
2474 2474
 			return 0;
2475 2475
 		}
2476 2476
 		return $this->formatInfo[$level][$mask];
@@ -2570,7 +2570,7 @@  discard block
 block discarded – undo
2570 2570
 	 * @return array array of unsigned char.
2571 2571
 	 */
2572 2572
 	protected function newFrame($version) {
2573
-		if (($version < 1) OR ($version > QRSPEC_VERSION_MAX)) {
2573
+		if (($version < 1) or ($version > QRSPEC_VERSION_MAX)) {
2574 2574
 			return NULL;
2575 2575
 		}
2576 2576
 		if (!isset($this->frames[$version])) {
@@ -2679,8 +2679,8 @@  discard block
 block discarded – undo
2679 2679
 	 */
2680 2680
 	 protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
2681 2681
 		foreach ($this->rsitems as $rs) {
2682
-			if (($rs['pad'] != $pad) OR ($rs['nroots'] != $nroots) OR ($rs['mm'] != $symsize)
2683
-				OR ($rs['gfpoly'] != $gfpoly) OR ($rs['fcr'] != $fcr) OR ($rs['prim'] != $prim)) {
2682
+			if (($rs['pad'] != $pad) or ($rs['nroots'] != $nroots) or ($rs['mm'] != $symsize)
2683
+				or ($rs['gfpoly'] != $gfpoly) or ($rs['fcr'] != $fcr) or ($rs['prim'] != $prim)) {
2684 2684
 				continue;
2685 2685
 			}
2686 2686
 			return $rs;
@@ -2722,19 +2722,19 @@  discard block
 block discarded – undo
2722 2722
 		// Based on Reed solomon encoder by Phil Karn, KA9Q (GNU-LGPLv2)
2723 2723
 		$rs = null;
2724 2724
 		// Check parameter ranges
2725
-		if (($symsize < 0) OR ($symsize > 8)) {
2725
+		if (($symsize < 0) or ($symsize > 8)) {
2726 2726
 			return $rs;
2727 2727
 		}
2728
-		if (($fcr < 0) OR ($fcr >= (1<<$symsize))) {
2728
+		if (($fcr < 0) or ($fcr >= (1<<$symsize))) {
2729 2729
 			return $rs;
2730 2730
 		}
2731
-		if (($prim <= 0) OR ($prim >= (1<<$symsize))) {
2731
+		if (($prim <= 0) or ($prim >= (1<<$symsize))) {
2732 2732
 			return $rs;
2733 2733
 		}
2734
-		if (($nroots < 0) OR ($nroots >= (1<<$symsize))) {
2734
+		if (($nroots < 0) or ($nroots >= (1<<$symsize))) {
2735 2735
 			return $rs;
2736 2736
 		}
2737
-		if (($pad < 0) OR ($pad >= ((1<<$symsize) -1 - $nroots))) {
2737
+		if (($pad < 0) or ($pad >= ((1<<$symsize) -1 - $nroots))) {
2738 2738
 			return $rs;
2739 2739
 		}
2740 2740
 		$rs = array();
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php 1 patch
Upper-Lower-Casing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 	 */
235 235
 	public function __construct($code) {
236 236
 		$barcode_array = array();
237
-		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
237
+		if ((is_null($code)) or ($code == '\0') or ($code == '')) {
238 238
 			return false;
239 239
 		}
240 240
 		// get data codewords
@@ -256,12 +256,12 @@  discard block
 block discarded – undo
256 256
 			return false;
257 257
 		} elseif ($params[11] > $nd) {
258 258
 			// add padding
259
-			if ((($params[11] - $nd) > 1) AND ($cw[($nd - 1)] != 254)) {
259
+			if ((($params[11] - $nd) > 1) and ($cw[($nd - 1)] != 254)) {
260 260
 				if ($this->last_enc == ENC_EDF) {
261 261
 					// switch to ASCII encoding
262 262
 					$cw[] = 124;
263 263
 					++$nd;
264
-				} elseif (($this->last_enc != ENC_ASCII) AND ($this->last_enc != ENC_BASE256)) {
264
+				} elseif (($this->last_enc != ENC_ASCII) and ($this->last_enc != ENC_BASE256)) {
265 265
 					// switch to ASCII encoding
266 266
 					$cw[] = 254;
267 267
 					++$nd;
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 	 * @protected
365 365
 	 */
366 366
 	protected function getGFProduct($a, $b, $log, $alog, $gf) {
367
-		if (($a == 0) OR ($b == 0)) {
367
+		if (($a == 0) or ($b == 0)) {
368 368
 			return 0;
369 369
 		}
370 370
 		return ($alog[($log[$a] + $log[$b]) % ($gf - 1)]);
@@ -477,35 +477,35 @@  discard block
 block discarded – undo
477 477
 		$status = false;
478 478
 		switch ($mode) {
479 479
 			case ENC_ASCII: { // ASCII character 0 to 127
480
-				$status = (($chr >= 0) AND ($chr <= 127));
480
+				$status = (($chr >= 0) and ($chr <= 127));
481 481
 				break;
482 482
 			}
483 483
 			case ENC_C40: { // Upper-case alphanumeric
484
-				$status = (($chr == 32) OR (($chr >= 48) AND ($chr <= 57)) OR (($chr >= 65) AND ($chr <= 90)));
484
+				$status = (($chr == 32) or (($chr >= 48) and ($chr <= 57)) or (($chr >= 65) and ($chr <= 90)));
485 485
 				break;
486 486
 			}
487 487
 			case ENC_TXT: { // Lower-case alphanumeric
488
-				$status = (($chr == 32) OR (($chr >= 48) AND ($chr <= 57)) OR (($chr >= 97) AND ($chr <= 122)));
488
+				$status = (($chr == 32) or (($chr >= 48) and ($chr <= 57)) or (($chr >= 97) and ($chr <= 122)));
489 489
 				break;
490 490
 			}
491 491
 			case ENC_X12: { // ANSI X12
492
-				$status = (($chr == 13) OR ($chr == 42) OR ($chr == 62));
492
+				$status = (($chr == 13) or ($chr == 42) or ($chr == 62));
493 493
 				break;
494 494
 			}
495 495
 			case ENC_EDF: { // ASCII character 32 to 94
496
-				$status = (($chr >= 32) AND ($chr <= 94));
496
+				$status = (($chr >= 32) and ($chr <= 94));
497 497
 				break;
498 498
 			}
499 499
 			case ENC_BASE256: { // Function character (FNC1, Structured Append, Reader Program, or Code Page)
500
-				$status = (($chr == 232) OR ($chr == 233) OR ($chr == 234) OR ($chr == 241));
500
+				$status = (($chr == 232) or ($chr == 233) or ($chr == 234) or ($chr == 241));
501 501
 				break;
502 502
 			}
503 503
 			case ENC_ASCII_EXT: { // ASCII character 128 to 255
504
-				$status = (($chr >= 128) AND ($chr <= 255));
504
+				$status = (($chr >= 128) and ($chr <= 255));
505 505
 				break;
506 506
 			}
507 507
 			case ENC_ASCII_NUM: { // ASCII digits
508
-				$status = (($chr >= 48) AND ($chr <= 57));
508
+				$status = (($chr >= 48) and ($chr <= 57));
509 509
 				break;
510 510
 			}
511 511
 		}
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 				$numch[ENC_TXT] += (4 / 3);
584 584
 			}
585 585
 			// STEP O
586
-			if ($this->isCharMode($chr, ENC_X12) OR $this->isCharMode($chr, ENC_C40)) {
586
+			if ($this->isCharMode($chr, ENC_X12) or $this->isCharMode($chr, ENC_C40)) {
587 587
 				$numch[ENC_X12] += (2 / 3);
588 588
 			} elseif ($this->isCharMode($chr, ENC_ASCII_EXT)) {
589 589
 				$numch[ENC_X12] += (13 / 3);
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
 					return ENC_ASCII;
611 611
 				}
612 612
 				if ((($numch[ENC_BASE256] + 1) <= $numch[ENC_ASCII])
613
-					OR (($numch[ENC_BASE256] + 1) < min($numch[ENC_C40], $numch[ENC_TXT], $numch[ENC_X12], $numch[ENC_EDF]))) {
613
+					or (($numch[ENC_BASE256] + 1) < min($numch[ENC_C40], $numch[ENC_TXT], $numch[ENC_X12], $numch[ENC_EDF]))) {
614 614
 					return ENC_BASE256;
615 615
 				}
616 616
 				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 @@  discard block
 block discarded – undo
632 632
 							$tmpchr = ord($data[$k]);
633 633
 							if ($this->isCharMode($tmpchr, ENC_X12)) {
634 634
 								return ENC_X12;
635
-							} elseif (!($this->isCharMode($tmpchr, ENC_X12) OR $this->isCharMode($tmpchr, ENC_C40))) {
635
+							} elseif (!($this->isCharMode($tmpchr, ENC_X12) or $this->isCharMode($tmpchr, ENC_C40))) {
636 636
 								break;
637 637
 							}
638 638
 							++$k;
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 			$this->last_enc = $enc;
717 717
 			switch ($enc) {
718 718
 				case ENC_ASCII: { // STEP B. While in ASCII encodation
719
-					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))) {
719
+					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))) {
720 720
 						// 1. If the next data sequence is at least 2 consecutive digits, encode the next two digits as a double digit in ASCII mode.
721 721
 						$cw[] = (intval(substr($data, $pos, 2)) + 130);
722 722
 						++$cw_num;
@@ -781,10 +781,10 @@  discard block
 block discarded – undo
781 781
 							} elseif (isset($this->chset['SH2'][$chr])) {
782 782
 								$temp_cw[] = 1; // shift 2
783 783
 								$shiftset = $this->chset['SH2'];
784
-							} elseif (($enc == ENC_C40) AND isset($this->chset['S3C'][$chr])) {
784
+							} elseif (($enc == ENC_C40) and isset($this->chset['S3C'][$chr])) {
785 785
 								$temp_cw[] = 2; // shift 3
786 786
 								$shiftset = $this->chset['S3C'];
787
-							} elseif (($enc == ENC_TXT) AND isset($this->chset['S3T'][$chr])) {
787
+							} elseif (($enc == ENC_TXT) and isset($this->chset['S3T'][$chr])) {
788 788
 								$temp_cw[] = 2; // shift 3
789 789
 								$shiftset = $this->chset['S3T'];
790 790
 							} else {
@@ -820,12 +820,12 @@  discard block
 block discarded – undo
820 820
 								break;
821 821
 							}
822 822
 						}
823
-					} while (($p > 0) AND ($epos < $data_length));
823
+					} while (($p > 0) and ($epos < $data_length));
824 824
 					// process last data (if any)
825 825
 					if ($p > 0) {
826 826
 						// get remaining number of data symbols
827 827
 						$cwr = ($this->getMaxDataCodewords($cw_num) - $cw_num);
828
-						if (($cwr == 1) AND ($p == 1)) {
828
+						if (($cwr == 1) and ($p == 1)) {
829 829
 							// d. If one symbol character remains and one C40 value (data character) remains to be encoded
830 830
 							$c1 = array_shift($temp_cw);
831 831
 							--$p;
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 							$pos = $epos;
835 835
 							$enc = ENC_ASCII;
836 836
 							$this->last_enc = $enc;
837
-						} elseif (($cwr == 2) AND ($p == 1)) {
837
+						} elseif (($cwr == 2) and ($p == 1)) {
838 838
 							// c. If two symbol characters remain and only one C40 value (data character) remains to be encoded
839 839
 							$c1 = array_shift($temp_cw);
840 840
 							--$p;
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 							$pos = $epos;
845 845
 							$enc = ENC_ASCII;
846 846
 							$this->last_enc = $enc;
847
-						} elseif (($cwr == 2) AND ($p == 2)) {
847
+						} elseif (($cwr == 2) and ($p == 2)) {
848 848
 							// b. If two symbol characters remain and two C40 values remain to be encoded
849 849
 							$c1 = array_shift($temp_cw);
850 850
 							$c2 = array_shift($temp_cw);
@@ -883,8 +883,8 @@  discard block
 block discarded – undo
883 883
 							$temp_cw[] = $chr;
884 884
 							++$field_length;
885 885
 						}
886
-						if (($field_length == 4) OR ($epos == $data_length) OR !$this->isCharMode($chr, ENC_EDF)) {
887
-							if (($epos == $data_length) AND ($field_length < 3)) {
886
+						if (($field_length == 4) or ($epos == $data_length) or !$this->isCharMode($chr, ENC_EDF)) {
887
+							if (($epos == $data_length) and ($field_length < 3)) {
888 888
 								$enc = ENC_ASCII;
889 889
 								$cw[] = $this->getSwitchEncodingCodeword($enc);
890 890
 								++$cw_num;
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 					// initialize temporary array with 0 length
932 932
 					$temp_cw = array();
933 933
 					$field_length = 0;
934
-					while (($pos < $data_length) AND ($field_length <= 1555)) {
934
+					while (($pos < $data_length) and ($field_length <= 1555)) {
935 935
 						$newenc = $this->lookAheadTest($data, $pos, $enc);
936 936
 						if ($newenc != $enc) {
937 937
 							// 1. If the look-ahead test (starting at step J) indicates another mode, switch to that mode.
@@ -1122,46 +1122,46 @@  discard block
 block discarded – undo
1122 1122
 		$col = 0;
1123 1123
 		do {
1124 1124
 			// repeatedly first check for one of the special corner cases, then
1125
-			if (($row == $nrow) AND ($col == 0)) {
1125
+			if (($row == $nrow) and ($col == 0)) {
1126 1126
 				$marr = $this->placeCornerA($marr, $nrow, $ncol, $chr);
1127 1127
 				++$chr;
1128 1128
 			}
1129
-			if (($row == ($nrow - 2)) AND ($col == 0) AND ($ncol % 4)) {
1129
+			if (($row == ($nrow - 2)) and ($col == 0) and ($ncol % 4)) {
1130 1130
 				$marr = $this->placeCornerB($marr, $nrow, $ncol, $chr);
1131 1131
 				++$chr;
1132 1132
 			}
1133
-			if (($row == ($nrow - 2)) AND ($col == 0) AND (($ncol % 8) == 4)) {
1133
+			if (($row == ($nrow - 2)) and ($col == 0) and (($ncol % 8) == 4)) {
1134 1134
 				$marr = $this->placeCornerC($marr, $nrow, $ncol, $chr);
1135 1135
 				++$chr;
1136 1136
 			}
1137
-			if (($row == ($nrow + 4)) AND ($col == 2) AND (!($ncol % 8))) {
1137
+			if (($row == ($nrow + 4)) and ($col == 2) and (!($ncol % 8))) {
1138 1138
 				$marr = $this->placeCornerD($marr, $nrow, $ncol, $chr);
1139 1139
 				++$chr;
1140 1140
 			}
1141 1141
 			// sweep upward diagonally, inserting successive characters,
1142 1142
 			do {
1143
-				if (($row < $nrow) AND ($col >= 0) AND (!$marr[(($row * $ncol) + $col)])) {
1143
+				if (($row < $nrow) and ($col >= 0) and (!$marr[(($row * $ncol) + $col)])) {
1144 1144
 					$marr = $this->placeUtah($marr, $nrow, $ncol, $row, $col, $chr);
1145 1145
 					++$chr;
1146 1146
 				}
1147 1147
 				$row -= 2;
1148 1148
 				$col += 2;
1149
-			} while (($row >= 0) AND ($col < $ncol));
1149
+			} while (($row >= 0) and ($col < $ncol));
1150 1150
 			++$row;
1151 1151
 			$col += 3;
1152 1152
 			// & then sweep downward diagonally, inserting successive characters,...
1153 1153
 			do {
1154
-				if (($row >= 0) AND ($col < $ncol) AND (!$marr[(($row * $ncol) + $col)])) {
1154
+				if (($row >= 0) and ($col < $ncol) and (!$marr[(($row * $ncol) + $col)])) {
1155 1155
 					$marr = $this->placeUtah($marr, $nrow, $ncol, $row, $col, $chr);
1156 1156
 					++$chr;
1157 1157
 				}
1158 1158
 				$row += 2;
1159 1159
 				$col -= 2;
1160
-			} while (($row < $nrow) AND ($col >= 0));
1160
+			} while (($row < $nrow) and ($col >= 0));
1161 1161
 			$row += 3;
1162 1162
 			++$col;
1163 1163
 			// ... until the entire array is scanned
1164
-		} while (($row < $nrow) OR ($col < $ncol));
1164
+		} while (($row < $nrow) or ($col < $ncol));
1165 1165
 		// lastly, if the lower righthand corner is untouched, fill in fixed pattern
1166 1166
 		if (!$marr[(($nrow * $ncol) - 1)]) {
1167 1167
 			$marr[(($nrow * $ncol) - 1)] = 1;
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/barcodes/pdf417.php 2 patches
Spacing   +363 added lines, -363 removed lines patch added patch discarded remove patch
@@ -115,10 +115,10 @@  discard block
 block discarded – undo
115 115
 	 * @protected
116 116
 	 */
117 117
 	protected $textsubmodes = array(
118
-		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
119
-		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
120
-		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
121
-		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
118
+		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
119
+		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
120
+		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
121
+		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
122 122
 	);
123 123
 
124 124
 	/**
@@ -126,10 +126,10 @@  discard block
 block discarded – undo
126 126
 	 * @protected
127 127
 	 */
128 128
 	protected $textlatch = array(
129
-		'01' => array(27), '02' => array(28), '03' => array(28,25), //
130
-		'10' => array(28,28), '12' => array(28), '13' => array(28,25), //
129
+		'01' => array(27), '02' => array(28), '03' => array(28, 25), //
130
+		'10' => array(28, 28), '12' => array(28), '13' => array(28, 25), //
131 131
 		'20' => array(28), '21' => array(27), '23' => array(25), //
132
-		'30' => array(29), '31' => array(29,27), '32' => array(29,28) //
132
+		'30' => array(29), '31' => array(29, 27), '32' => array(29, 28) //
133 133
 	);
134 134
 
135 135
 	/**
@@ -155,287 +155,287 @@  discard block
 block discarded – undo
155 155
 	 */
156 156
 	protected $clusters = array(
157 157
 		array( // cluster 0 -----------------------------------------------------------------------
158
-			0x1d5c0,0x1eaf0,0x1f57c,0x1d4e0,0x1ea78,0x1f53e,0x1a8c0,0x1d470,0x1a860,0x15040, //  10
159
-			0x1a830,0x15020,0x1adc0,0x1d6f0,0x1eb7c,0x1ace0,0x1d678,0x1eb3e,0x158c0,0x1ac70, //  20
160
-			0x15860,0x15dc0,0x1aef0,0x1d77c,0x15ce0,0x1ae78,0x1d73e,0x15c70,0x1ae3c,0x15ef0, //  30
161
-			0x1af7c,0x15e78,0x1af3e,0x15f7c,0x1f5fa,0x1d2e0,0x1e978,0x1f4be,0x1a4c0,0x1d270, //  40
162
-			0x1e93c,0x1a460,0x1d238,0x14840,0x1a430,0x1d21c,0x14820,0x1a418,0x14810,0x1a6e0, //  50
163
-			0x1d378,0x1e9be,0x14cc0,0x1a670,0x1d33c,0x14c60,0x1a638,0x1d31e,0x14c30,0x1a61c, //  60
164
-			0x14ee0,0x1a778,0x1d3be,0x14e70,0x1a73c,0x14e38,0x1a71e,0x14f78,0x1a7be,0x14f3c, //  70
165
-			0x14f1e,0x1a2c0,0x1d170,0x1e8bc,0x1a260,0x1d138,0x1e89e,0x14440,0x1a230,0x1d11c, //  80
166
-			0x14420,0x1a218,0x14410,0x14408,0x146c0,0x1a370,0x1d1bc,0x14660,0x1a338,0x1d19e, //  90
167
-			0x14630,0x1a31c,0x14618,0x1460c,0x14770,0x1a3bc,0x14738,0x1a39e,0x1471c,0x147bc, // 100
168
-			0x1a160,0x1d0b8,0x1e85e,0x14240,0x1a130,0x1d09c,0x14220,0x1a118,0x1d08e,0x14210, // 110
169
-			0x1a10c,0x14208,0x1a106,0x14360,0x1a1b8,0x1d0de,0x14330,0x1a19c,0x14318,0x1a18e, // 120
170
-			0x1430c,0x14306,0x1a1de,0x1438e,0x14140,0x1a0b0,0x1d05c,0x14120,0x1a098,0x1d04e, // 130
171
-			0x14110,0x1a08c,0x14108,0x1a086,0x14104,0x141b0,0x14198,0x1418c,0x140a0,0x1d02e, // 140
172
-			0x1a04c,0x1a046,0x14082,0x1cae0,0x1e578,0x1f2be,0x194c0,0x1ca70,0x1e53c,0x19460, // 150
173
-			0x1ca38,0x1e51e,0x12840,0x19430,0x12820,0x196e0,0x1cb78,0x1e5be,0x12cc0,0x19670, // 160
174
-			0x1cb3c,0x12c60,0x19638,0x12c30,0x12c18,0x12ee0,0x19778,0x1cbbe,0x12e70,0x1973c, // 170
175
-			0x12e38,0x12e1c,0x12f78,0x197be,0x12f3c,0x12fbe,0x1dac0,0x1ed70,0x1f6bc,0x1da60, // 180
176
-			0x1ed38,0x1f69e,0x1b440,0x1da30,0x1ed1c,0x1b420,0x1da18,0x1ed0e,0x1b410,0x1da0c, // 190
177
-			0x192c0,0x1c970,0x1e4bc,0x1b6c0,0x19260,0x1c938,0x1e49e,0x1b660,0x1db38,0x1ed9e, // 200
178
-			0x16c40,0x12420,0x19218,0x1c90e,0x16c20,0x1b618,0x16c10,0x126c0,0x19370,0x1c9bc, // 210
179
-			0x16ec0,0x12660,0x19338,0x1c99e,0x16e60,0x1b738,0x1db9e,0x16e30,0x12618,0x16e18, // 220
180
-			0x12770,0x193bc,0x16f70,0x12738,0x1939e,0x16f38,0x1b79e,0x16f1c,0x127bc,0x16fbc, // 230
181
-			0x1279e,0x16f9e,0x1d960,0x1ecb8,0x1f65e,0x1b240,0x1d930,0x1ec9c,0x1b220,0x1d918, // 240
182
-			0x1ec8e,0x1b210,0x1d90c,0x1b208,0x1b204,0x19160,0x1c8b8,0x1e45e,0x1b360,0x19130, // 250
183
-			0x1c89c,0x16640,0x12220,0x1d99c,0x1c88e,0x16620,0x12210,0x1910c,0x16610,0x1b30c, // 260
184
-			0x19106,0x12204,0x12360,0x191b8,0x1c8de,0x16760,0x12330,0x1919c,0x16730,0x1b39c, // 270
185
-			0x1918e,0x16718,0x1230c,0x12306,0x123b8,0x191de,0x167b8,0x1239c,0x1679c,0x1238e, // 280
186
-			0x1678e,0x167de,0x1b140,0x1d8b0,0x1ec5c,0x1b120,0x1d898,0x1ec4e,0x1b110,0x1d88c, // 290
187
-			0x1b108,0x1d886,0x1b104,0x1b102,0x12140,0x190b0,0x1c85c,0x16340,0x12120,0x19098, // 300
188
-			0x1c84e,0x16320,0x1b198,0x1d8ce,0x16310,0x12108,0x19086,0x16308,0x1b186,0x16304, // 310
189
-			0x121b0,0x190dc,0x163b0,0x12198,0x190ce,0x16398,0x1b1ce,0x1638c,0x12186,0x16386, // 320
190
-			0x163dc,0x163ce,0x1b0a0,0x1d858,0x1ec2e,0x1b090,0x1d84c,0x1b088,0x1d846,0x1b084, // 330
191
-			0x1b082,0x120a0,0x19058,0x1c82e,0x161a0,0x12090,0x1904c,0x16190,0x1b0cc,0x19046, // 340
192
-			0x16188,0x12084,0x16184,0x12082,0x120d8,0x161d8,0x161cc,0x161c6,0x1d82c,0x1d826, // 350
193
-			0x1b042,0x1902c,0x12048,0x160c8,0x160c4,0x160c2,0x18ac0,0x1c570,0x1e2bc,0x18a60, // 360
194
-			0x1c538,0x11440,0x18a30,0x1c51c,0x11420,0x18a18,0x11410,0x11408,0x116c0,0x18b70, // 370
195
-			0x1c5bc,0x11660,0x18b38,0x1c59e,0x11630,0x18b1c,0x11618,0x1160c,0x11770,0x18bbc, // 380
196
-			0x11738,0x18b9e,0x1171c,0x117bc,0x1179e,0x1cd60,0x1e6b8,0x1f35e,0x19a40,0x1cd30, // 390
197
-			0x1e69c,0x19a20,0x1cd18,0x1e68e,0x19a10,0x1cd0c,0x19a08,0x1cd06,0x18960,0x1c4b8, // 400
198
-			0x1e25e,0x19b60,0x18930,0x1c49c,0x13640,0x11220,0x1cd9c,0x1c48e,0x13620,0x19b18, // 410
199
-			0x1890c,0x13610,0x11208,0x13608,0x11360,0x189b8,0x1c4de,0x13760,0x11330,0x1cdde, // 420
200
-			0x13730,0x19b9c,0x1898e,0x13718,0x1130c,0x1370c,0x113b8,0x189de,0x137b8,0x1139c, // 430
201
-			0x1379c,0x1138e,0x113de,0x137de,0x1dd40,0x1eeb0,0x1f75c,0x1dd20,0x1ee98,0x1f74e, // 440
202
-			0x1dd10,0x1ee8c,0x1dd08,0x1ee86,0x1dd04,0x19940,0x1ccb0,0x1e65c,0x1bb40,0x19920, // 450
203
-			0x1eedc,0x1e64e,0x1bb20,0x1dd98,0x1eece,0x1bb10,0x19908,0x1cc86,0x1bb08,0x1dd86, // 460
204
-			0x19902,0x11140,0x188b0,0x1c45c,0x13340,0x11120,0x18898,0x1c44e,0x17740,0x13320, // 470
205
-			0x19998,0x1ccce,0x17720,0x1bb98,0x1ddce,0x18886,0x17710,0x13308,0x19986,0x17708, // 480
206
-			0x11102,0x111b0,0x188dc,0x133b0,0x11198,0x188ce,0x177b0,0x13398,0x199ce,0x17798, // 490
207
-			0x1bbce,0x11186,0x13386,0x111dc,0x133dc,0x111ce,0x177dc,0x133ce,0x1dca0,0x1ee58, // 500
208
-			0x1f72e,0x1dc90,0x1ee4c,0x1dc88,0x1ee46,0x1dc84,0x1dc82,0x198a0,0x1cc58,0x1e62e, // 510
209
-			0x1b9a0,0x19890,0x1ee6e,0x1b990,0x1dccc,0x1cc46,0x1b988,0x19884,0x1b984,0x19882, // 520
210
-			0x1b982,0x110a0,0x18858,0x1c42e,0x131a0,0x11090,0x1884c,0x173a0,0x13190,0x198cc, // 530
211
-			0x18846,0x17390,0x1b9cc,0x11084,0x17388,0x13184,0x11082,0x13182,0x110d8,0x1886e, // 540
212
-			0x131d8,0x110cc,0x173d8,0x131cc,0x110c6,0x173cc,0x131c6,0x110ee,0x173ee,0x1dc50, // 550
213
-			0x1ee2c,0x1dc48,0x1ee26,0x1dc44,0x1dc42,0x19850,0x1cc2c,0x1b8d0,0x19848,0x1cc26, // 560
214
-			0x1b8c8,0x1dc66,0x1b8c4,0x19842,0x1b8c2,0x11050,0x1882c,0x130d0,0x11048,0x18826, // 570
215
-			0x171d0,0x130c8,0x19866,0x171c8,0x1b8e6,0x11042,0x171c4,0x130c2,0x171c2,0x130ec, // 580
216
-			0x171ec,0x171e6,0x1ee16,0x1dc22,0x1cc16,0x19824,0x19822,0x11028,0x13068,0x170e8, // 590
217
-			0x11022,0x13062,0x18560,0x10a40,0x18530,0x10a20,0x18518,0x1c28e,0x10a10,0x1850c, // 600
218
-			0x10a08,0x18506,0x10b60,0x185b8,0x1c2de,0x10b30,0x1859c,0x10b18,0x1858e,0x10b0c, // 610
219
-			0x10b06,0x10bb8,0x185de,0x10b9c,0x10b8e,0x10bde,0x18d40,0x1c6b0,0x1e35c,0x18d20, // 620
220
-			0x1c698,0x18d10,0x1c68c,0x18d08,0x1c686,0x18d04,0x10940,0x184b0,0x1c25c,0x11b40, // 630
221
-			0x10920,0x1c6dc,0x1c24e,0x11b20,0x18d98,0x1c6ce,0x11b10,0x10908,0x18486,0x11b08, // 640
222
-			0x18d86,0x10902,0x109b0,0x184dc,0x11bb0,0x10998,0x184ce,0x11b98,0x18dce,0x11b8c, // 650
223
-			0x10986,0x109dc,0x11bdc,0x109ce,0x11bce,0x1cea0,0x1e758,0x1f3ae,0x1ce90,0x1e74c, // 660
224
-			0x1ce88,0x1e746,0x1ce84,0x1ce82,0x18ca0,0x1c658,0x19da0,0x18c90,0x1c64c,0x19d90, // 670
225
-			0x1cecc,0x1c646,0x19d88,0x18c84,0x19d84,0x18c82,0x19d82,0x108a0,0x18458,0x119a0, // 680
226
-			0x10890,0x1c66e,0x13ba0,0x11990,0x18ccc,0x18446,0x13b90,0x19dcc,0x10884,0x13b88, // 690
227
-			0x11984,0x10882,0x11982,0x108d8,0x1846e,0x119d8,0x108cc,0x13bd8,0x119cc,0x108c6, // 700
228
-			0x13bcc,0x119c6,0x108ee,0x119ee,0x13bee,0x1ef50,0x1f7ac,0x1ef48,0x1f7a6,0x1ef44, // 710
229
-			0x1ef42,0x1ce50,0x1e72c,0x1ded0,0x1ef6c,0x1e726,0x1dec8,0x1ef66,0x1dec4,0x1ce42, // 720
230
-			0x1dec2,0x18c50,0x1c62c,0x19cd0,0x18c48,0x1c626,0x1bdd0,0x19cc8,0x1ce66,0x1bdc8, // 730
231
-			0x1dee6,0x18c42,0x1bdc4,0x19cc2,0x1bdc2,0x10850,0x1842c,0x118d0,0x10848,0x18426, // 740
232
-			0x139d0,0x118c8,0x18c66,0x17bd0,0x139c8,0x19ce6,0x10842,0x17bc8,0x1bde6,0x118c2, // 750
233
-			0x17bc4,0x1086c,0x118ec,0x10866,0x139ec,0x118e6,0x17bec,0x139e6,0x17be6,0x1ef28, // 760
234
-			0x1f796,0x1ef24,0x1ef22,0x1ce28,0x1e716,0x1de68,0x1ef36,0x1de64,0x1ce22,0x1de62, // 770
235
-			0x18c28,0x1c616,0x19c68,0x18c24,0x1bce8,0x19c64,0x18c22,0x1bce4,0x19c62,0x1bce2, // 780
236
-			0x10828,0x18416,0x11868,0x18c36,0x138e8,0x11864,0x10822,0x179e8,0x138e4,0x11862, // 790
237
-			0x179e4,0x138e2,0x179e2,0x11876,0x179f6,0x1ef12,0x1de34,0x1de32,0x19c34,0x1bc74, // 800
238
-			0x1bc72,0x11834,0x13874,0x178f4,0x178f2,0x10540,0x10520,0x18298,0x10510,0x10508, // 810
239
-			0x10504,0x105b0,0x10598,0x1058c,0x10586,0x105dc,0x105ce,0x186a0,0x18690,0x1c34c, // 820
240
-			0x18688,0x1c346,0x18684,0x18682,0x104a0,0x18258,0x10da0,0x186d8,0x1824c,0x10d90, // 830
241
-			0x186cc,0x10d88,0x186c6,0x10d84,0x10482,0x10d82,0x104d8,0x1826e,0x10dd8,0x186ee, // 840
242
-			0x10dcc,0x104c6,0x10dc6,0x104ee,0x10dee,0x1c750,0x1c748,0x1c744,0x1c742,0x18650, // 850
243
-			0x18ed0,0x1c76c,0x1c326,0x18ec8,0x1c766,0x18ec4,0x18642,0x18ec2,0x10450,0x10cd0, // 860
244
-			0x10448,0x18226,0x11dd0,0x10cc8,0x10444,0x11dc8,0x10cc4,0x10442,0x11dc4,0x10cc2, // 870
245
-			0x1046c,0x10cec,0x10466,0x11dec,0x10ce6,0x11de6,0x1e7a8,0x1e7a4,0x1e7a2,0x1c728, // 880
246
-			0x1cf68,0x1e7b6,0x1cf64,0x1c722,0x1cf62,0x18628,0x1c316,0x18e68,0x1c736,0x19ee8, // 890
247
-			0x18e64,0x18622,0x19ee4,0x18e62,0x19ee2,0x10428,0x18216,0x10c68,0x18636,0x11ce8, // 900
248
-			0x10c64,0x10422,0x13de8,0x11ce4,0x10c62,0x13de4,0x11ce2,0x10436,0x10c76,0x11cf6, // 910
249
-			0x13df6,0x1f7d4,0x1f7d2,0x1e794,0x1efb4,0x1e792,0x1efb2,0x1c714,0x1cf34,0x1c712, // 920
250
-			0x1df74,0x1cf32,0x1df72,0x18614,0x18e34,0x18612,0x19e74,0x18e32,0x1bef4),        // 929
158
+			0x1d5c0, 0x1eaf0, 0x1f57c, 0x1d4e0, 0x1ea78, 0x1f53e, 0x1a8c0, 0x1d470, 0x1a860, 0x15040, //  10
159
+			0x1a830, 0x15020, 0x1adc0, 0x1d6f0, 0x1eb7c, 0x1ace0, 0x1d678, 0x1eb3e, 0x158c0, 0x1ac70, //  20
160
+			0x15860, 0x15dc0, 0x1aef0, 0x1d77c, 0x15ce0, 0x1ae78, 0x1d73e, 0x15c70, 0x1ae3c, 0x15ef0, //  30
161
+			0x1af7c, 0x15e78, 0x1af3e, 0x15f7c, 0x1f5fa, 0x1d2e0, 0x1e978, 0x1f4be, 0x1a4c0, 0x1d270, //  40
162
+			0x1e93c, 0x1a460, 0x1d238, 0x14840, 0x1a430, 0x1d21c, 0x14820, 0x1a418, 0x14810, 0x1a6e0, //  50
163
+			0x1d378, 0x1e9be, 0x14cc0, 0x1a670, 0x1d33c, 0x14c60, 0x1a638, 0x1d31e, 0x14c30, 0x1a61c, //  60
164
+			0x14ee0, 0x1a778, 0x1d3be, 0x14e70, 0x1a73c, 0x14e38, 0x1a71e, 0x14f78, 0x1a7be, 0x14f3c, //  70
165
+			0x14f1e, 0x1a2c0, 0x1d170, 0x1e8bc, 0x1a260, 0x1d138, 0x1e89e, 0x14440, 0x1a230, 0x1d11c, //  80
166
+			0x14420, 0x1a218, 0x14410, 0x14408, 0x146c0, 0x1a370, 0x1d1bc, 0x14660, 0x1a338, 0x1d19e, //  90
167
+			0x14630, 0x1a31c, 0x14618, 0x1460c, 0x14770, 0x1a3bc, 0x14738, 0x1a39e, 0x1471c, 0x147bc, // 100
168
+			0x1a160, 0x1d0b8, 0x1e85e, 0x14240, 0x1a130, 0x1d09c, 0x14220, 0x1a118, 0x1d08e, 0x14210, // 110
169
+			0x1a10c, 0x14208, 0x1a106, 0x14360, 0x1a1b8, 0x1d0de, 0x14330, 0x1a19c, 0x14318, 0x1a18e, // 120
170
+			0x1430c, 0x14306, 0x1a1de, 0x1438e, 0x14140, 0x1a0b0, 0x1d05c, 0x14120, 0x1a098, 0x1d04e, // 130
171
+			0x14110, 0x1a08c, 0x14108, 0x1a086, 0x14104, 0x141b0, 0x14198, 0x1418c, 0x140a0, 0x1d02e, // 140
172
+			0x1a04c, 0x1a046, 0x14082, 0x1cae0, 0x1e578, 0x1f2be, 0x194c0, 0x1ca70, 0x1e53c, 0x19460, // 150
173
+			0x1ca38, 0x1e51e, 0x12840, 0x19430, 0x12820, 0x196e0, 0x1cb78, 0x1e5be, 0x12cc0, 0x19670, // 160
174
+			0x1cb3c, 0x12c60, 0x19638, 0x12c30, 0x12c18, 0x12ee0, 0x19778, 0x1cbbe, 0x12e70, 0x1973c, // 170
175
+			0x12e38, 0x12e1c, 0x12f78, 0x197be, 0x12f3c, 0x12fbe, 0x1dac0, 0x1ed70, 0x1f6bc, 0x1da60, // 180
176
+			0x1ed38, 0x1f69e, 0x1b440, 0x1da30, 0x1ed1c, 0x1b420, 0x1da18, 0x1ed0e, 0x1b410, 0x1da0c, // 190
177
+			0x192c0, 0x1c970, 0x1e4bc, 0x1b6c0, 0x19260, 0x1c938, 0x1e49e, 0x1b660, 0x1db38, 0x1ed9e, // 200
178
+			0x16c40, 0x12420, 0x19218, 0x1c90e, 0x16c20, 0x1b618, 0x16c10, 0x126c0, 0x19370, 0x1c9bc, // 210
179
+			0x16ec0, 0x12660, 0x19338, 0x1c99e, 0x16e60, 0x1b738, 0x1db9e, 0x16e30, 0x12618, 0x16e18, // 220
180
+			0x12770, 0x193bc, 0x16f70, 0x12738, 0x1939e, 0x16f38, 0x1b79e, 0x16f1c, 0x127bc, 0x16fbc, // 230
181
+			0x1279e, 0x16f9e, 0x1d960, 0x1ecb8, 0x1f65e, 0x1b240, 0x1d930, 0x1ec9c, 0x1b220, 0x1d918, // 240
182
+			0x1ec8e, 0x1b210, 0x1d90c, 0x1b208, 0x1b204, 0x19160, 0x1c8b8, 0x1e45e, 0x1b360, 0x19130, // 250
183
+			0x1c89c, 0x16640, 0x12220, 0x1d99c, 0x1c88e, 0x16620, 0x12210, 0x1910c, 0x16610, 0x1b30c, // 260
184
+			0x19106, 0x12204, 0x12360, 0x191b8, 0x1c8de, 0x16760, 0x12330, 0x1919c, 0x16730, 0x1b39c, // 270
185
+			0x1918e, 0x16718, 0x1230c, 0x12306, 0x123b8, 0x191de, 0x167b8, 0x1239c, 0x1679c, 0x1238e, // 280
186
+			0x1678e, 0x167de, 0x1b140, 0x1d8b0, 0x1ec5c, 0x1b120, 0x1d898, 0x1ec4e, 0x1b110, 0x1d88c, // 290
187
+			0x1b108, 0x1d886, 0x1b104, 0x1b102, 0x12140, 0x190b0, 0x1c85c, 0x16340, 0x12120, 0x19098, // 300
188
+			0x1c84e, 0x16320, 0x1b198, 0x1d8ce, 0x16310, 0x12108, 0x19086, 0x16308, 0x1b186, 0x16304, // 310
189
+			0x121b0, 0x190dc, 0x163b0, 0x12198, 0x190ce, 0x16398, 0x1b1ce, 0x1638c, 0x12186, 0x16386, // 320
190
+			0x163dc, 0x163ce, 0x1b0a0, 0x1d858, 0x1ec2e, 0x1b090, 0x1d84c, 0x1b088, 0x1d846, 0x1b084, // 330
191
+			0x1b082, 0x120a0, 0x19058, 0x1c82e, 0x161a0, 0x12090, 0x1904c, 0x16190, 0x1b0cc, 0x19046, // 340
192
+			0x16188, 0x12084, 0x16184, 0x12082, 0x120d8, 0x161d8, 0x161cc, 0x161c6, 0x1d82c, 0x1d826, // 350
193
+			0x1b042, 0x1902c, 0x12048, 0x160c8, 0x160c4, 0x160c2, 0x18ac0, 0x1c570, 0x1e2bc, 0x18a60, // 360
194
+			0x1c538, 0x11440, 0x18a30, 0x1c51c, 0x11420, 0x18a18, 0x11410, 0x11408, 0x116c0, 0x18b70, // 370
195
+			0x1c5bc, 0x11660, 0x18b38, 0x1c59e, 0x11630, 0x18b1c, 0x11618, 0x1160c, 0x11770, 0x18bbc, // 380
196
+			0x11738, 0x18b9e, 0x1171c, 0x117bc, 0x1179e, 0x1cd60, 0x1e6b8, 0x1f35e, 0x19a40, 0x1cd30, // 390
197
+			0x1e69c, 0x19a20, 0x1cd18, 0x1e68e, 0x19a10, 0x1cd0c, 0x19a08, 0x1cd06, 0x18960, 0x1c4b8, // 400
198
+			0x1e25e, 0x19b60, 0x18930, 0x1c49c, 0x13640, 0x11220, 0x1cd9c, 0x1c48e, 0x13620, 0x19b18, // 410
199
+			0x1890c, 0x13610, 0x11208, 0x13608, 0x11360, 0x189b8, 0x1c4de, 0x13760, 0x11330, 0x1cdde, // 420
200
+			0x13730, 0x19b9c, 0x1898e, 0x13718, 0x1130c, 0x1370c, 0x113b8, 0x189de, 0x137b8, 0x1139c, // 430
201
+			0x1379c, 0x1138e, 0x113de, 0x137de, 0x1dd40, 0x1eeb0, 0x1f75c, 0x1dd20, 0x1ee98, 0x1f74e, // 440
202
+			0x1dd10, 0x1ee8c, 0x1dd08, 0x1ee86, 0x1dd04, 0x19940, 0x1ccb0, 0x1e65c, 0x1bb40, 0x19920, // 450
203
+			0x1eedc, 0x1e64e, 0x1bb20, 0x1dd98, 0x1eece, 0x1bb10, 0x19908, 0x1cc86, 0x1bb08, 0x1dd86, // 460
204
+			0x19902, 0x11140, 0x188b0, 0x1c45c, 0x13340, 0x11120, 0x18898, 0x1c44e, 0x17740, 0x13320, // 470
205
+			0x19998, 0x1ccce, 0x17720, 0x1bb98, 0x1ddce, 0x18886, 0x17710, 0x13308, 0x19986, 0x17708, // 480
206
+			0x11102, 0x111b0, 0x188dc, 0x133b0, 0x11198, 0x188ce, 0x177b0, 0x13398, 0x199ce, 0x17798, // 490
207
+			0x1bbce, 0x11186, 0x13386, 0x111dc, 0x133dc, 0x111ce, 0x177dc, 0x133ce, 0x1dca0, 0x1ee58, // 500
208
+			0x1f72e, 0x1dc90, 0x1ee4c, 0x1dc88, 0x1ee46, 0x1dc84, 0x1dc82, 0x198a0, 0x1cc58, 0x1e62e, // 510
209
+			0x1b9a0, 0x19890, 0x1ee6e, 0x1b990, 0x1dccc, 0x1cc46, 0x1b988, 0x19884, 0x1b984, 0x19882, // 520
210
+			0x1b982, 0x110a0, 0x18858, 0x1c42e, 0x131a0, 0x11090, 0x1884c, 0x173a0, 0x13190, 0x198cc, // 530
211
+			0x18846, 0x17390, 0x1b9cc, 0x11084, 0x17388, 0x13184, 0x11082, 0x13182, 0x110d8, 0x1886e, // 540
212
+			0x131d8, 0x110cc, 0x173d8, 0x131cc, 0x110c6, 0x173cc, 0x131c6, 0x110ee, 0x173ee, 0x1dc50, // 550
213
+			0x1ee2c, 0x1dc48, 0x1ee26, 0x1dc44, 0x1dc42, 0x19850, 0x1cc2c, 0x1b8d0, 0x19848, 0x1cc26, // 560
214
+			0x1b8c8, 0x1dc66, 0x1b8c4, 0x19842, 0x1b8c2, 0x11050, 0x1882c, 0x130d0, 0x11048, 0x18826, // 570
215
+			0x171d0, 0x130c8, 0x19866, 0x171c8, 0x1b8e6, 0x11042, 0x171c4, 0x130c2, 0x171c2, 0x130ec, // 580
216
+			0x171ec, 0x171e6, 0x1ee16, 0x1dc22, 0x1cc16, 0x19824, 0x19822, 0x11028, 0x13068, 0x170e8, // 590
217
+			0x11022, 0x13062, 0x18560, 0x10a40, 0x18530, 0x10a20, 0x18518, 0x1c28e, 0x10a10, 0x1850c, // 600
218
+			0x10a08, 0x18506, 0x10b60, 0x185b8, 0x1c2de, 0x10b30, 0x1859c, 0x10b18, 0x1858e, 0x10b0c, // 610
219
+			0x10b06, 0x10bb8, 0x185de, 0x10b9c, 0x10b8e, 0x10bde, 0x18d40, 0x1c6b0, 0x1e35c, 0x18d20, // 620
220
+			0x1c698, 0x18d10, 0x1c68c, 0x18d08, 0x1c686, 0x18d04, 0x10940, 0x184b0, 0x1c25c, 0x11b40, // 630
221
+			0x10920, 0x1c6dc, 0x1c24e, 0x11b20, 0x18d98, 0x1c6ce, 0x11b10, 0x10908, 0x18486, 0x11b08, // 640
222
+			0x18d86, 0x10902, 0x109b0, 0x184dc, 0x11bb0, 0x10998, 0x184ce, 0x11b98, 0x18dce, 0x11b8c, // 650
223
+			0x10986, 0x109dc, 0x11bdc, 0x109ce, 0x11bce, 0x1cea0, 0x1e758, 0x1f3ae, 0x1ce90, 0x1e74c, // 660
224
+			0x1ce88, 0x1e746, 0x1ce84, 0x1ce82, 0x18ca0, 0x1c658, 0x19da0, 0x18c90, 0x1c64c, 0x19d90, // 670
225
+			0x1cecc, 0x1c646, 0x19d88, 0x18c84, 0x19d84, 0x18c82, 0x19d82, 0x108a0, 0x18458, 0x119a0, // 680
226
+			0x10890, 0x1c66e, 0x13ba0, 0x11990, 0x18ccc, 0x18446, 0x13b90, 0x19dcc, 0x10884, 0x13b88, // 690
227
+			0x11984, 0x10882, 0x11982, 0x108d8, 0x1846e, 0x119d8, 0x108cc, 0x13bd8, 0x119cc, 0x108c6, // 700
228
+			0x13bcc, 0x119c6, 0x108ee, 0x119ee, 0x13bee, 0x1ef50, 0x1f7ac, 0x1ef48, 0x1f7a6, 0x1ef44, // 710
229
+			0x1ef42, 0x1ce50, 0x1e72c, 0x1ded0, 0x1ef6c, 0x1e726, 0x1dec8, 0x1ef66, 0x1dec4, 0x1ce42, // 720
230
+			0x1dec2, 0x18c50, 0x1c62c, 0x19cd0, 0x18c48, 0x1c626, 0x1bdd0, 0x19cc8, 0x1ce66, 0x1bdc8, // 730
231
+			0x1dee6, 0x18c42, 0x1bdc4, 0x19cc2, 0x1bdc2, 0x10850, 0x1842c, 0x118d0, 0x10848, 0x18426, // 740
232
+			0x139d0, 0x118c8, 0x18c66, 0x17bd0, 0x139c8, 0x19ce6, 0x10842, 0x17bc8, 0x1bde6, 0x118c2, // 750
233
+			0x17bc4, 0x1086c, 0x118ec, 0x10866, 0x139ec, 0x118e6, 0x17bec, 0x139e6, 0x17be6, 0x1ef28, // 760
234
+			0x1f796, 0x1ef24, 0x1ef22, 0x1ce28, 0x1e716, 0x1de68, 0x1ef36, 0x1de64, 0x1ce22, 0x1de62, // 770
235
+			0x18c28, 0x1c616, 0x19c68, 0x18c24, 0x1bce8, 0x19c64, 0x18c22, 0x1bce4, 0x19c62, 0x1bce2, // 780
236
+			0x10828, 0x18416, 0x11868, 0x18c36, 0x138e8, 0x11864, 0x10822, 0x179e8, 0x138e4, 0x11862, // 790
237
+			0x179e4, 0x138e2, 0x179e2, 0x11876, 0x179f6, 0x1ef12, 0x1de34, 0x1de32, 0x19c34, 0x1bc74, // 800
238
+			0x1bc72, 0x11834, 0x13874, 0x178f4, 0x178f2, 0x10540, 0x10520, 0x18298, 0x10510, 0x10508, // 810
239
+			0x10504, 0x105b0, 0x10598, 0x1058c, 0x10586, 0x105dc, 0x105ce, 0x186a0, 0x18690, 0x1c34c, // 820
240
+			0x18688, 0x1c346, 0x18684, 0x18682, 0x104a0, 0x18258, 0x10da0, 0x186d8, 0x1824c, 0x10d90, // 830
241
+			0x186cc, 0x10d88, 0x186c6, 0x10d84, 0x10482, 0x10d82, 0x104d8, 0x1826e, 0x10dd8, 0x186ee, // 840
242
+			0x10dcc, 0x104c6, 0x10dc6, 0x104ee, 0x10dee, 0x1c750, 0x1c748, 0x1c744, 0x1c742, 0x18650, // 850
243
+			0x18ed0, 0x1c76c, 0x1c326, 0x18ec8, 0x1c766, 0x18ec4, 0x18642, 0x18ec2, 0x10450, 0x10cd0, // 860
244
+			0x10448, 0x18226, 0x11dd0, 0x10cc8, 0x10444, 0x11dc8, 0x10cc4, 0x10442, 0x11dc4, 0x10cc2, // 870
245
+			0x1046c, 0x10cec, 0x10466, 0x11dec, 0x10ce6, 0x11de6, 0x1e7a8, 0x1e7a4, 0x1e7a2, 0x1c728, // 880
246
+			0x1cf68, 0x1e7b6, 0x1cf64, 0x1c722, 0x1cf62, 0x18628, 0x1c316, 0x18e68, 0x1c736, 0x19ee8, // 890
247
+			0x18e64, 0x18622, 0x19ee4, 0x18e62, 0x19ee2, 0x10428, 0x18216, 0x10c68, 0x18636, 0x11ce8, // 900
248
+			0x10c64, 0x10422, 0x13de8, 0x11ce4, 0x10c62, 0x13de4, 0x11ce2, 0x10436, 0x10c76, 0x11cf6, // 910
249
+			0x13df6, 0x1f7d4, 0x1f7d2, 0x1e794, 0x1efb4, 0x1e792, 0x1efb2, 0x1c714, 0x1cf34, 0x1c712, // 920
250
+			0x1df74, 0x1cf32, 0x1df72, 0x18614, 0x18e34, 0x18612, 0x19e74, 0x18e32, 0x1bef4), // 929
251 251
 		array( // cluster 3 -----------------------------------------------------------------------
252
-			0x1f560,0x1fab8,0x1ea40,0x1f530,0x1fa9c,0x1ea20,0x1f518,0x1fa8e,0x1ea10,0x1f50c, //  10
253
-			0x1ea08,0x1f506,0x1ea04,0x1eb60,0x1f5b8,0x1fade,0x1d640,0x1eb30,0x1f59c,0x1d620, //  20
254
-			0x1eb18,0x1f58e,0x1d610,0x1eb0c,0x1d608,0x1eb06,0x1d604,0x1d760,0x1ebb8,0x1f5de, //  30
255
-			0x1ae40,0x1d730,0x1eb9c,0x1ae20,0x1d718,0x1eb8e,0x1ae10,0x1d70c,0x1ae08,0x1d706, //  40
256
-			0x1ae04,0x1af60,0x1d7b8,0x1ebde,0x15e40,0x1af30,0x1d79c,0x15e20,0x1af18,0x1d78e, //  50
257
-			0x15e10,0x1af0c,0x15e08,0x1af06,0x15f60,0x1afb8,0x1d7de,0x15f30,0x1af9c,0x15f18, //  60
258
-			0x1af8e,0x15f0c,0x15fb8,0x1afde,0x15f9c,0x15f8e,0x1e940,0x1f4b0,0x1fa5c,0x1e920, //  70
259
-			0x1f498,0x1fa4e,0x1e910,0x1f48c,0x1e908,0x1f486,0x1e904,0x1e902,0x1d340,0x1e9b0, //  80
260
-			0x1f4dc,0x1d320,0x1e998,0x1f4ce,0x1d310,0x1e98c,0x1d308,0x1e986,0x1d304,0x1d302, //  90
261
-			0x1a740,0x1d3b0,0x1e9dc,0x1a720,0x1d398,0x1e9ce,0x1a710,0x1d38c,0x1a708,0x1d386, // 100
262
-			0x1a704,0x1a702,0x14f40,0x1a7b0,0x1d3dc,0x14f20,0x1a798,0x1d3ce,0x14f10,0x1a78c, // 110
263
-			0x14f08,0x1a786,0x14f04,0x14fb0,0x1a7dc,0x14f98,0x1a7ce,0x14f8c,0x14f86,0x14fdc, // 120
264
-			0x14fce,0x1e8a0,0x1f458,0x1fa2e,0x1e890,0x1f44c,0x1e888,0x1f446,0x1e884,0x1e882, // 130
265
-			0x1d1a0,0x1e8d8,0x1f46e,0x1d190,0x1e8cc,0x1d188,0x1e8c6,0x1d184,0x1d182,0x1a3a0, // 140
266
-			0x1d1d8,0x1e8ee,0x1a390,0x1d1cc,0x1a388,0x1d1c6,0x1a384,0x1a382,0x147a0,0x1a3d8, // 150
267
-			0x1d1ee,0x14790,0x1a3cc,0x14788,0x1a3c6,0x14784,0x14782,0x147d8,0x1a3ee,0x147cc, // 160
268
-			0x147c6,0x147ee,0x1e850,0x1f42c,0x1e848,0x1f426,0x1e844,0x1e842,0x1d0d0,0x1e86c, // 170
269
-			0x1d0c8,0x1e866,0x1d0c4,0x1d0c2,0x1a1d0,0x1d0ec,0x1a1c8,0x1d0e6,0x1a1c4,0x1a1c2, // 180
270
-			0x143d0,0x1a1ec,0x143c8,0x1a1e6,0x143c4,0x143c2,0x143ec,0x143e6,0x1e828,0x1f416, // 190
271
-			0x1e824,0x1e822,0x1d068,0x1e836,0x1d064,0x1d062,0x1a0e8,0x1d076,0x1a0e4,0x1a0e2, // 200
272
-			0x141e8,0x1a0f6,0x141e4,0x141e2,0x1e814,0x1e812,0x1d034,0x1d032,0x1a074,0x1a072, // 210
273
-			0x1e540,0x1f2b0,0x1f95c,0x1e520,0x1f298,0x1f94e,0x1e510,0x1f28c,0x1e508,0x1f286, // 220
274
-			0x1e504,0x1e502,0x1cb40,0x1e5b0,0x1f2dc,0x1cb20,0x1e598,0x1f2ce,0x1cb10,0x1e58c, // 230
275
-			0x1cb08,0x1e586,0x1cb04,0x1cb02,0x19740,0x1cbb0,0x1e5dc,0x19720,0x1cb98,0x1e5ce, // 240
276
-			0x19710,0x1cb8c,0x19708,0x1cb86,0x19704,0x19702,0x12f40,0x197b0,0x1cbdc,0x12f20, // 250
277
-			0x19798,0x1cbce,0x12f10,0x1978c,0x12f08,0x19786,0x12f04,0x12fb0,0x197dc,0x12f98, // 260
278
-			0x197ce,0x12f8c,0x12f86,0x12fdc,0x12fce,0x1f6a0,0x1fb58,0x16bf0,0x1f690,0x1fb4c, // 270
279
-			0x169f8,0x1f688,0x1fb46,0x168fc,0x1f684,0x1f682,0x1e4a0,0x1f258,0x1f92e,0x1eda0, // 280
280
-			0x1e490,0x1fb6e,0x1ed90,0x1f6cc,0x1f246,0x1ed88,0x1e484,0x1ed84,0x1e482,0x1ed82, // 290
281
-			0x1c9a0,0x1e4d8,0x1f26e,0x1dba0,0x1c990,0x1e4cc,0x1db90,0x1edcc,0x1e4c6,0x1db88, // 300
282
-			0x1c984,0x1db84,0x1c982,0x1db82,0x193a0,0x1c9d8,0x1e4ee,0x1b7a0,0x19390,0x1c9cc, // 310
283
-			0x1b790,0x1dbcc,0x1c9c6,0x1b788,0x19384,0x1b784,0x19382,0x1b782,0x127a0,0x193d8, // 320
284
-			0x1c9ee,0x16fa0,0x12790,0x193cc,0x16f90,0x1b7cc,0x193c6,0x16f88,0x12784,0x16f84, // 330
285
-			0x12782,0x127d8,0x193ee,0x16fd8,0x127cc,0x16fcc,0x127c6,0x16fc6,0x127ee,0x1f650, // 340
286
-			0x1fb2c,0x165f8,0x1f648,0x1fb26,0x164fc,0x1f644,0x1647e,0x1f642,0x1e450,0x1f22c, // 350
287
-			0x1ecd0,0x1e448,0x1f226,0x1ecc8,0x1f666,0x1ecc4,0x1e442,0x1ecc2,0x1c8d0,0x1e46c, // 360
288
-			0x1d9d0,0x1c8c8,0x1e466,0x1d9c8,0x1ece6,0x1d9c4,0x1c8c2,0x1d9c2,0x191d0,0x1c8ec, // 370
289
-			0x1b3d0,0x191c8,0x1c8e6,0x1b3c8,0x1d9e6,0x1b3c4,0x191c2,0x1b3c2,0x123d0,0x191ec, // 380
290
-			0x167d0,0x123c8,0x191e6,0x167c8,0x1b3e6,0x167c4,0x123c2,0x167c2,0x123ec,0x167ec, // 390
291
-			0x123e6,0x167e6,0x1f628,0x1fb16,0x162fc,0x1f624,0x1627e,0x1f622,0x1e428,0x1f216, // 400
292
-			0x1ec68,0x1f636,0x1ec64,0x1e422,0x1ec62,0x1c868,0x1e436,0x1d8e8,0x1c864,0x1d8e4, // 410
293
-			0x1c862,0x1d8e2,0x190e8,0x1c876,0x1b1e8,0x1d8f6,0x1b1e4,0x190e2,0x1b1e2,0x121e8, // 420
294
-			0x190f6,0x163e8,0x121e4,0x163e4,0x121e2,0x163e2,0x121f6,0x163f6,0x1f614,0x1617e, // 430
295
-			0x1f612,0x1e414,0x1ec34,0x1e412,0x1ec32,0x1c834,0x1d874,0x1c832,0x1d872,0x19074, // 440
296
-			0x1b0f4,0x19072,0x1b0f2,0x120f4,0x161f4,0x120f2,0x161f2,0x1f60a,0x1e40a,0x1ec1a, // 450
297
-			0x1c81a,0x1d83a,0x1903a,0x1b07a,0x1e2a0,0x1f158,0x1f8ae,0x1e290,0x1f14c,0x1e288, // 460
298
-			0x1f146,0x1e284,0x1e282,0x1c5a0,0x1e2d8,0x1f16e,0x1c590,0x1e2cc,0x1c588,0x1e2c6, // 470
299
-			0x1c584,0x1c582,0x18ba0,0x1c5d8,0x1e2ee,0x18b90,0x1c5cc,0x18b88,0x1c5c6,0x18b84, // 480
300
-			0x18b82,0x117a0,0x18bd8,0x1c5ee,0x11790,0x18bcc,0x11788,0x18bc6,0x11784,0x11782, // 490
301
-			0x117d8,0x18bee,0x117cc,0x117c6,0x117ee,0x1f350,0x1f9ac,0x135f8,0x1f348,0x1f9a6, // 500
302
-			0x134fc,0x1f344,0x1347e,0x1f342,0x1e250,0x1f12c,0x1e6d0,0x1e248,0x1f126,0x1e6c8, // 510
303
-			0x1f366,0x1e6c4,0x1e242,0x1e6c2,0x1c4d0,0x1e26c,0x1cdd0,0x1c4c8,0x1e266,0x1cdc8, // 520
304
-			0x1e6e6,0x1cdc4,0x1c4c2,0x1cdc2,0x189d0,0x1c4ec,0x19bd0,0x189c8,0x1c4e6,0x19bc8, // 530
305
-			0x1cde6,0x19bc4,0x189c2,0x19bc2,0x113d0,0x189ec,0x137d0,0x113c8,0x189e6,0x137c8, // 540
306
-			0x19be6,0x137c4,0x113c2,0x137c2,0x113ec,0x137ec,0x113e6,0x137e6,0x1fba8,0x175f0, // 550
307
-			0x1bafc,0x1fba4,0x174f8,0x1ba7e,0x1fba2,0x1747c,0x1743e,0x1f328,0x1f996,0x132fc, // 560
308
-			0x1f768,0x1fbb6,0x176fc,0x1327e,0x1f764,0x1f322,0x1767e,0x1f762,0x1e228,0x1f116, // 570
309
-			0x1e668,0x1e224,0x1eee8,0x1f776,0x1e222,0x1eee4,0x1e662,0x1eee2,0x1c468,0x1e236, // 580
310
-			0x1cce8,0x1c464,0x1dde8,0x1cce4,0x1c462,0x1dde4,0x1cce2,0x1dde2,0x188e8,0x1c476, // 590
311
-			0x199e8,0x188e4,0x1bbe8,0x199e4,0x188e2,0x1bbe4,0x199e2,0x1bbe2,0x111e8,0x188f6, // 600
312
-			0x133e8,0x111e4,0x177e8,0x133e4,0x111e2,0x177e4,0x133e2,0x177e2,0x111f6,0x133f6, // 610
313
-			0x1fb94,0x172f8,0x1b97e,0x1fb92,0x1727c,0x1723e,0x1f314,0x1317e,0x1f734,0x1f312, // 620
314
-			0x1737e,0x1f732,0x1e214,0x1e634,0x1e212,0x1ee74,0x1e632,0x1ee72,0x1c434,0x1cc74, // 630
315
-			0x1c432,0x1dcf4,0x1cc72,0x1dcf2,0x18874,0x198f4,0x18872,0x1b9f4,0x198f2,0x1b9f2, // 640
316
-			0x110f4,0x131f4,0x110f2,0x173f4,0x131f2,0x173f2,0x1fb8a,0x1717c,0x1713e,0x1f30a, // 650
317
-			0x1f71a,0x1e20a,0x1e61a,0x1ee3a,0x1c41a,0x1cc3a,0x1dc7a,0x1883a,0x1987a,0x1b8fa, // 660
318
-			0x1107a,0x130fa,0x171fa,0x170be,0x1e150,0x1f0ac,0x1e148,0x1f0a6,0x1e144,0x1e142, // 670
319
-			0x1c2d0,0x1e16c,0x1c2c8,0x1e166,0x1c2c4,0x1c2c2,0x185d0,0x1c2ec,0x185c8,0x1c2e6, // 680
320
-			0x185c4,0x185c2,0x10bd0,0x185ec,0x10bc8,0x185e6,0x10bc4,0x10bc2,0x10bec,0x10be6, // 690
321
-			0x1f1a8,0x1f8d6,0x11afc,0x1f1a4,0x11a7e,0x1f1a2,0x1e128,0x1f096,0x1e368,0x1e124, // 700
322
-			0x1e364,0x1e122,0x1e362,0x1c268,0x1e136,0x1c6e8,0x1c264,0x1c6e4,0x1c262,0x1c6e2, // 710
323
-			0x184e8,0x1c276,0x18de8,0x184e4,0x18de4,0x184e2,0x18de2,0x109e8,0x184f6,0x11be8, // 720
324
-			0x109e4,0x11be4,0x109e2,0x11be2,0x109f6,0x11bf6,0x1f9d4,0x13af8,0x19d7e,0x1f9d2, // 730
325
-			0x13a7c,0x13a3e,0x1f194,0x1197e,0x1f3b4,0x1f192,0x13b7e,0x1f3b2,0x1e114,0x1e334, // 740
326
-			0x1e112,0x1e774,0x1e332,0x1e772,0x1c234,0x1c674,0x1c232,0x1cef4,0x1c672,0x1cef2, // 750
327
-			0x18474,0x18cf4,0x18472,0x19df4,0x18cf2,0x19df2,0x108f4,0x119f4,0x108f2,0x13bf4, // 760
328
-			0x119f2,0x13bf2,0x17af0,0x1bd7c,0x17a78,0x1bd3e,0x17a3c,0x17a1e,0x1f9ca,0x1397c, // 770
329
-			0x1fbda,0x17b7c,0x1393e,0x17b3e,0x1f18a,0x1f39a,0x1f7ba,0x1e10a,0x1e31a,0x1e73a, // 780
330
-			0x1ef7a,0x1c21a,0x1c63a,0x1ce7a,0x1defa,0x1843a,0x18c7a,0x19cfa,0x1bdfa,0x1087a, // 790
331
-			0x118fa,0x139fa,0x17978,0x1bcbe,0x1793c,0x1791e,0x138be,0x179be,0x178bc,0x1789e, // 800
332
-			0x1785e,0x1e0a8,0x1e0a4,0x1e0a2,0x1c168,0x1e0b6,0x1c164,0x1c162,0x182e8,0x1c176, // 810
333
-			0x182e4,0x182e2,0x105e8,0x182f6,0x105e4,0x105e2,0x105f6,0x1f0d4,0x10d7e,0x1f0d2, // 820
334
-			0x1e094,0x1e1b4,0x1e092,0x1e1b2,0x1c134,0x1c374,0x1c132,0x1c372,0x18274,0x186f4, // 830
335
-			0x18272,0x186f2,0x104f4,0x10df4,0x104f2,0x10df2,0x1f8ea,0x11d7c,0x11d3e,0x1f0ca, // 840
336
-			0x1f1da,0x1e08a,0x1e19a,0x1e3ba,0x1c11a,0x1c33a,0x1c77a,0x1823a,0x1867a,0x18efa, // 850
337
-			0x1047a,0x10cfa,0x11dfa,0x13d78,0x19ebe,0x13d3c,0x13d1e,0x11cbe,0x13dbe,0x17d70, // 860
338
-			0x1bebc,0x17d38,0x1be9e,0x17d1c,0x17d0e,0x13cbc,0x17dbc,0x13c9e,0x17d9e,0x17cb8, // 870
339
-			0x1be5e,0x17c9c,0x17c8e,0x13c5e,0x17cde,0x17c5c,0x17c4e,0x17c2e,0x1c0b4,0x1c0b2, // 880
340
-			0x18174,0x18172,0x102f4,0x102f2,0x1e0da,0x1c09a,0x1c1ba,0x1813a,0x1837a,0x1027a, // 890
341
-			0x106fa,0x10ebe,0x11ebc,0x11e9e,0x13eb8,0x19f5e,0x13e9c,0x13e8e,0x11e5e,0x13ede, // 900
342
-			0x17eb0,0x1bf5c,0x17e98,0x1bf4e,0x17e8c,0x17e86,0x13e5c,0x17edc,0x13e4e,0x17ece, // 910
343
-			0x17e58,0x1bf2e,0x17e4c,0x17e46,0x13e2e,0x17e6e,0x17e2c,0x17e26,0x10f5e,0x11f5c, // 920
344
-			0x11f4e,0x13f58,0x19fae,0x13f4c,0x13f46,0x11f2e,0x13f6e,0x13f2c,0x13f26),        // 929
252
+			0x1f560, 0x1fab8, 0x1ea40, 0x1f530, 0x1fa9c, 0x1ea20, 0x1f518, 0x1fa8e, 0x1ea10, 0x1f50c, //  10
253
+			0x1ea08, 0x1f506, 0x1ea04, 0x1eb60, 0x1f5b8, 0x1fade, 0x1d640, 0x1eb30, 0x1f59c, 0x1d620, //  20
254
+			0x1eb18, 0x1f58e, 0x1d610, 0x1eb0c, 0x1d608, 0x1eb06, 0x1d604, 0x1d760, 0x1ebb8, 0x1f5de, //  30
255
+			0x1ae40, 0x1d730, 0x1eb9c, 0x1ae20, 0x1d718, 0x1eb8e, 0x1ae10, 0x1d70c, 0x1ae08, 0x1d706, //  40
256
+			0x1ae04, 0x1af60, 0x1d7b8, 0x1ebde, 0x15e40, 0x1af30, 0x1d79c, 0x15e20, 0x1af18, 0x1d78e, //  50
257
+			0x15e10, 0x1af0c, 0x15e08, 0x1af06, 0x15f60, 0x1afb8, 0x1d7de, 0x15f30, 0x1af9c, 0x15f18, //  60
258
+			0x1af8e, 0x15f0c, 0x15fb8, 0x1afde, 0x15f9c, 0x15f8e, 0x1e940, 0x1f4b0, 0x1fa5c, 0x1e920, //  70
259
+			0x1f498, 0x1fa4e, 0x1e910, 0x1f48c, 0x1e908, 0x1f486, 0x1e904, 0x1e902, 0x1d340, 0x1e9b0, //  80
260
+			0x1f4dc, 0x1d320, 0x1e998, 0x1f4ce, 0x1d310, 0x1e98c, 0x1d308, 0x1e986, 0x1d304, 0x1d302, //  90
261
+			0x1a740, 0x1d3b0, 0x1e9dc, 0x1a720, 0x1d398, 0x1e9ce, 0x1a710, 0x1d38c, 0x1a708, 0x1d386, // 100
262
+			0x1a704, 0x1a702, 0x14f40, 0x1a7b0, 0x1d3dc, 0x14f20, 0x1a798, 0x1d3ce, 0x14f10, 0x1a78c, // 110
263
+			0x14f08, 0x1a786, 0x14f04, 0x14fb0, 0x1a7dc, 0x14f98, 0x1a7ce, 0x14f8c, 0x14f86, 0x14fdc, // 120
264
+			0x14fce, 0x1e8a0, 0x1f458, 0x1fa2e, 0x1e890, 0x1f44c, 0x1e888, 0x1f446, 0x1e884, 0x1e882, // 130
265
+			0x1d1a0, 0x1e8d8, 0x1f46e, 0x1d190, 0x1e8cc, 0x1d188, 0x1e8c6, 0x1d184, 0x1d182, 0x1a3a0, // 140
266
+			0x1d1d8, 0x1e8ee, 0x1a390, 0x1d1cc, 0x1a388, 0x1d1c6, 0x1a384, 0x1a382, 0x147a0, 0x1a3d8, // 150
267
+			0x1d1ee, 0x14790, 0x1a3cc, 0x14788, 0x1a3c6, 0x14784, 0x14782, 0x147d8, 0x1a3ee, 0x147cc, // 160
268
+			0x147c6, 0x147ee, 0x1e850, 0x1f42c, 0x1e848, 0x1f426, 0x1e844, 0x1e842, 0x1d0d0, 0x1e86c, // 170
269
+			0x1d0c8, 0x1e866, 0x1d0c4, 0x1d0c2, 0x1a1d0, 0x1d0ec, 0x1a1c8, 0x1d0e6, 0x1a1c4, 0x1a1c2, // 180
270
+			0x143d0, 0x1a1ec, 0x143c8, 0x1a1e6, 0x143c4, 0x143c2, 0x143ec, 0x143e6, 0x1e828, 0x1f416, // 190
271
+			0x1e824, 0x1e822, 0x1d068, 0x1e836, 0x1d064, 0x1d062, 0x1a0e8, 0x1d076, 0x1a0e4, 0x1a0e2, // 200
272
+			0x141e8, 0x1a0f6, 0x141e4, 0x141e2, 0x1e814, 0x1e812, 0x1d034, 0x1d032, 0x1a074, 0x1a072, // 210
273
+			0x1e540, 0x1f2b0, 0x1f95c, 0x1e520, 0x1f298, 0x1f94e, 0x1e510, 0x1f28c, 0x1e508, 0x1f286, // 220
274
+			0x1e504, 0x1e502, 0x1cb40, 0x1e5b0, 0x1f2dc, 0x1cb20, 0x1e598, 0x1f2ce, 0x1cb10, 0x1e58c, // 230
275
+			0x1cb08, 0x1e586, 0x1cb04, 0x1cb02, 0x19740, 0x1cbb0, 0x1e5dc, 0x19720, 0x1cb98, 0x1e5ce, // 240
276
+			0x19710, 0x1cb8c, 0x19708, 0x1cb86, 0x19704, 0x19702, 0x12f40, 0x197b0, 0x1cbdc, 0x12f20, // 250
277
+			0x19798, 0x1cbce, 0x12f10, 0x1978c, 0x12f08, 0x19786, 0x12f04, 0x12fb0, 0x197dc, 0x12f98, // 260
278
+			0x197ce, 0x12f8c, 0x12f86, 0x12fdc, 0x12fce, 0x1f6a0, 0x1fb58, 0x16bf0, 0x1f690, 0x1fb4c, // 270
279
+			0x169f8, 0x1f688, 0x1fb46, 0x168fc, 0x1f684, 0x1f682, 0x1e4a0, 0x1f258, 0x1f92e, 0x1eda0, // 280
280
+			0x1e490, 0x1fb6e, 0x1ed90, 0x1f6cc, 0x1f246, 0x1ed88, 0x1e484, 0x1ed84, 0x1e482, 0x1ed82, // 290
281
+			0x1c9a0, 0x1e4d8, 0x1f26e, 0x1dba0, 0x1c990, 0x1e4cc, 0x1db90, 0x1edcc, 0x1e4c6, 0x1db88, // 300
282
+			0x1c984, 0x1db84, 0x1c982, 0x1db82, 0x193a0, 0x1c9d8, 0x1e4ee, 0x1b7a0, 0x19390, 0x1c9cc, // 310
283
+			0x1b790, 0x1dbcc, 0x1c9c6, 0x1b788, 0x19384, 0x1b784, 0x19382, 0x1b782, 0x127a0, 0x193d8, // 320
284
+			0x1c9ee, 0x16fa0, 0x12790, 0x193cc, 0x16f90, 0x1b7cc, 0x193c6, 0x16f88, 0x12784, 0x16f84, // 330
285
+			0x12782, 0x127d8, 0x193ee, 0x16fd8, 0x127cc, 0x16fcc, 0x127c6, 0x16fc6, 0x127ee, 0x1f650, // 340
286
+			0x1fb2c, 0x165f8, 0x1f648, 0x1fb26, 0x164fc, 0x1f644, 0x1647e, 0x1f642, 0x1e450, 0x1f22c, // 350
287
+			0x1ecd0, 0x1e448, 0x1f226, 0x1ecc8, 0x1f666, 0x1ecc4, 0x1e442, 0x1ecc2, 0x1c8d0, 0x1e46c, // 360
288
+			0x1d9d0, 0x1c8c8, 0x1e466, 0x1d9c8, 0x1ece6, 0x1d9c4, 0x1c8c2, 0x1d9c2, 0x191d0, 0x1c8ec, // 370
289
+			0x1b3d0, 0x191c8, 0x1c8e6, 0x1b3c8, 0x1d9e6, 0x1b3c4, 0x191c2, 0x1b3c2, 0x123d0, 0x191ec, // 380
290
+			0x167d0, 0x123c8, 0x191e6, 0x167c8, 0x1b3e6, 0x167c4, 0x123c2, 0x167c2, 0x123ec, 0x167ec, // 390
291
+			0x123e6, 0x167e6, 0x1f628, 0x1fb16, 0x162fc, 0x1f624, 0x1627e, 0x1f622, 0x1e428, 0x1f216, // 400
292
+			0x1ec68, 0x1f636, 0x1ec64, 0x1e422, 0x1ec62, 0x1c868, 0x1e436, 0x1d8e8, 0x1c864, 0x1d8e4, // 410
293
+			0x1c862, 0x1d8e2, 0x190e8, 0x1c876, 0x1b1e8, 0x1d8f6, 0x1b1e4, 0x190e2, 0x1b1e2, 0x121e8, // 420
294
+			0x190f6, 0x163e8, 0x121e4, 0x163e4, 0x121e2, 0x163e2, 0x121f6, 0x163f6, 0x1f614, 0x1617e, // 430
295
+			0x1f612, 0x1e414, 0x1ec34, 0x1e412, 0x1ec32, 0x1c834, 0x1d874, 0x1c832, 0x1d872, 0x19074, // 440
296
+			0x1b0f4, 0x19072, 0x1b0f2, 0x120f4, 0x161f4, 0x120f2, 0x161f2, 0x1f60a, 0x1e40a, 0x1ec1a, // 450
297
+			0x1c81a, 0x1d83a, 0x1903a, 0x1b07a, 0x1e2a0, 0x1f158, 0x1f8ae, 0x1e290, 0x1f14c, 0x1e288, // 460
298
+			0x1f146, 0x1e284, 0x1e282, 0x1c5a0, 0x1e2d8, 0x1f16e, 0x1c590, 0x1e2cc, 0x1c588, 0x1e2c6, // 470
299
+			0x1c584, 0x1c582, 0x18ba0, 0x1c5d8, 0x1e2ee, 0x18b90, 0x1c5cc, 0x18b88, 0x1c5c6, 0x18b84, // 480
300
+			0x18b82, 0x117a0, 0x18bd8, 0x1c5ee, 0x11790, 0x18bcc, 0x11788, 0x18bc6, 0x11784, 0x11782, // 490
301
+			0x117d8, 0x18bee, 0x117cc, 0x117c6, 0x117ee, 0x1f350, 0x1f9ac, 0x135f8, 0x1f348, 0x1f9a6, // 500
302
+			0x134fc, 0x1f344, 0x1347e, 0x1f342, 0x1e250, 0x1f12c, 0x1e6d0, 0x1e248, 0x1f126, 0x1e6c8, // 510
303
+			0x1f366, 0x1e6c4, 0x1e242, 0x1e6c2, 0x1c4d0, 0x1e26c, 0x1cdd0, 0x1c4c8, 0x1e266, 0x1cdc8, // 520
304
+			0x1e6e6, 0x1cdc4, 0x1c4c2, 0x1cdc2, 0x189d0, 0x1c4ec, 0x19bd0, 0x189c8, 0x1c4e6, 0x19bc8, // 530
305
+			0x1cde6, 0x19bc4, 0x189c2, 0x19bc2, 0x113d0, 0x189ec, 0x137d0, 0x113c8, 0x189e6, 0x137c8, // 540
306
+			0x19be6, 0x137c4, 0x113c2, 0x137c2, 0x113ec, 0x137ec, 0x113e6, 0x137e6, 0x1fba8, 0x175f0, // 550
307
+			0x1bafc, 0x1fba4, 0x174f8, 0x1ba7e, 0x1fba2, 0x1747c, 0x1743e, 0x1f328, 0x1f996, 0x132fc, // 560
308
+			0x1f768, 0x1fbb6, 0x176fc, 0x1327e, 0x1f764, 0x1f322, 0x1767e, 0x1f762, 0x1e228, 0x1f116, // 570
309
+			0x1e668, 0x1e224, 0x1eee8, 0x1f776, 0x1e222, 0x1eee4, 0x1e662, 0x1eee2, 0x1c468, 0x1e236, // 580
310
+			0x1cce8, 0x1c464, 0x1dde8, 0x1cce4, 0x1c462, 0x1dde4, 0x1cce2, 0x1dde2, 0x188e8, 0x1c476, // 590
311
+			0x199e8, 0x188e4, 0x1bbe8, 0x199e4, 0x188e2, 0x1bbe4, 0x199e2, 0x1bbe2, 0x111e8, 0x188f6, // 600
312
+			0x133e8, 0x111e4, 0x177e8, 0x133e4, 0x111e2, 0x177e4, 0x133e2, 0x177e2, 0x111f6, 0x133f6, // 610
313
+			0x1fb94, 0x172f8, 0x1b97e, 0x1fb92, 0x1727c, 0x1723e, 0x1f314, 0x1317e, 0x1f734, 0x1f312, // 620
314
+			0x1737e, 0x1f732, 0x1e214, 0x1e634, 0x1e212, 0x1ee74, 0x1e632, 0x1ee72, 0x1c434, 0x1cc74, // 630
315
+			0x1c432, 0x1dcf4, 0x1cc72, 0x1dcf2, 0x18874, 0x198f4, 0x18872, 0x1b9f4, 0x198f2, 0x1b9f2, // 640
316
+			0x110f4, 0x131f4, 0x110f2, 0x173f4, 0x131f2, 0x173f2, 0x1fb8a, 0x1717c, 0x1713e, 0x1f30a, // 650
317
+			0x1f71a, 0x1e20a, 0x1e61a, 0x1ee3a, 0x1c41a, 0x1cc3a, 0x1dc7a, 0x1883a, 0x1987a, 0x1b8fa, // 660
318
+			0x1107a, 0x130fa, 0x171fa, 0x170be, 0x1e150, 0x1f0ac, 0x1e148, 0x1f0a6, 0x1e144, 0x1e142, // 670
319
+			0x1c2d0, 0x1e16c, 0x1c2c8, 0x1e166, 0x1c2c4, 0x1c2c2, 0x185d0, 0x1c2ec, 0x185c8, 0x1c2e6, // 680
320
+			0x185c4, 0x185c2, 0x10bd0, 0x185ec, 0x10bc8, 0x185e6, 0x10bc4, 0x10bc2, 0x10bec, 0x10be6, // 690
321
+			0x1f1a8, 0x1f8d6, 0x11afc, 0x1f1a4, 0x11a7e, 0x1f1a2, 0x1e128, 0x1f096, 0x1e368, 0x1e124, // 700
322
+			0x1e364, 0x1e122, 0x1e362, 0x1c268, 0x1e136, 0x1c6e8, 0x1c264, 0x1c6e4, 0x1c262, 0x1c6e2, // 710
323
+			0x184e8, 0x1c276, 0x18de8, 0x184e4, 0x18de4, 0x184e2, 0x18de2, 0x109e8, 0x184f6, 0x11be8, // 720
324
+			0x109e4, 0x11be4, 0x109e2, 0x11be2, 0x109f6, 0x11bf6, 0x1f9d4, 0x13af8, 0x19d7e, 0x1f9d2, // 730
325
+			0x13a7c, 0x13a3e, 0x1f194, 0x1197e, 0x1f3b4, 0x1f192, 0x13b7e, 0x1f3b2, 0x1e114, 0x1e334, // 740
326
+			0x1e112, 0x1e774, 0x1e332, 0x1e772, 0x1c234, 0x1c674, 0x1c232, 0x1cef4, 0x1c672, 0x1cef2, // 750
327
+			0x18474, 0x18cf4, 0x18472, 0x19df4, 0x18cf2, 0x19df2, 0x108f4, 0x119f4, 0x108f2, 0x13bf4, // 760
328
+			0x119f2, 0x13bf2, 0x17af0, 0x1bd7c, 0x17a78, 0x1bd3e, 0x17a3c, 0x17a1e, 0x1f9ca, 0x1397c, // 770
329
+			0x1fbda, 0x17b7c, 0x1393e, 0x17b3e, 0x1f18a, 0x1f39a, 0x1f7ba, 0x1e10a, 0x1e31a, 0x1e73a, // 780
330
+			0x1ef7a, 0x1c21a, 0x1c63a, 0x1ce7a, 0x1defa, 0x1843a, 0x18c7a, 0x19cfa, 0x1bdfa, 0x1087a, // 790
331
+			0x118fa, 0x139fa, 0x17978, 0x1bcbe, 0x1793c, 0x1791e, 0x138be, 0x179be, 0x178bc, 0x1789e, // 800
332
+			0x1785e, 0x1e0a8, 0x1e0a4, 0x1e0a2, 0x1c168, 0x1e0b6, 0x1c164, 0x1c162, 0x182e8, 0x1c176, // 810
333
+			0x182e4, 0x182e2, 0x105e8, 0x182f6, 0x105e4, 0x105e2, 0x105f6, 0x1f0d4, 0x10d7e, 0x1f0d2, // 820
334
+			0x1e094, 0x1e1b4, 0x1e092, 0x1e1b2, 0x1c134, 0x1c374, 0x1c132, 0x1c372, 0x18274, 0x186f4, // 830
335
+			0x18272, 0x186f2, 0x104f4, 0x10df4, 0x104f2, 0x10df2, 0x1f8ea, 0x11d7c, 0x11d3e, 0x1f0ca, // 840
336
+			0x1f1da, 0x1e08a, 0x1e19a, 0x1e3ba, 0x1c11a, 0x1c33a, 0x1c77a, 0x1823a, 0x1867a, 0x18efa, // 850
337
+			0x1047a, 0x10cfa, 0x11dfa, 0x13d78, 0x19ebe, 0x13d3c, 0x13d1e, 0x11cbe, 0x13dbe, 0x17d70, // 860
338
+			0x1bebc, 0x17d38, 0x1be9e, 0x17d1c, 0x17d0e, 0x13cbc, 0x17dbc, 0x13c9e, 0x17d9e, 0x17cb8, // 870
339
+			0x1be5e, 0x17c9c, 0x17c8e, 0x13c5e, 0x17cde, 0x17c5c, 0x17c4e, 0x17c2e, 0x1c0b4, 0x1c0b2, // 880
340
+			0x18174, 0x18172, 0x102f4, 0x102f2, 0x1e0da, 0x1c09a, 0x1c1ba, 0x1813a, 0x1837a, 0x1027a, // 890
341
+			0x106fa, 0x10ebe, 0x11ebc, 0x11e9e, 0x13eb8, 0x19f5e, 0x13e9c, 0x13e8e, 0x11e5e, 0x13ede, // 900
342
+			0x17eb0, 0x1bf5c, 0x17e98, 0x1bf4e, 0x17e8c, 0x17e86, 0x13e5c, 0x17edc, 0x13e4e, 0x17ece, // 910
343
+			0x17e58, 0x1bf2e, 0x17e4c, 0x17e46, 0x13e2e, 0x17e6e, 0x17e2c, 0x17e26, 0x10f5e, 0x11f5c, // 920
344
+			0x11f4e, 0x13f58, 0x19fae, 0x13f4c, 0x13f46, 0x11f2e, 0x13f6e, 0x13f2c, 0x13f26), // 929
345 345
 		array( // cluster 6 -----------------------------------------------------------------------
346
-			0x1abe0,0x1d5f8,0x153c0,0x1a9f0,0x1d4fc,0x151e0,0x1a8f8,0x1d47e,0x150f0,0x1a87c, //  10
347
-			0x15078,0x1fad0,0x15be0,0x1adf8,0x1fac8,0x159f0,0x1acfc,0x1fac4,0x158f8,0x1ac7e, //  20
348
-			0x1fac2,0x1587c,0x1f5d0,0x1faec,0x15df8,0x1f5c8,0x1fae6,0x15cfc,0x1f5c4,0x15c7e, //  30
349
-			0x1f5c2,0x1ebd0,0x1f5ec,0x1ebc8,0x1f5e6,0x1ebc4,0x1ebc2,0x1d7d0,0x1ebec,0x1d7c8, //  40
350
-			0x1ebe6,0x1d7c4,0x1d7c2,0x1afd0,0x1d7ec,0x1afc8,0x1d7e6,0x1afc4,0x14bc0,0x1a5f0, //  50
351
-			0x1d2fc,0x149e0,0x1a4f8,0x1d27e,0x148f0,0x1a47c,0x14878,0x1a43e,0x1483c,0x1fa68, //  60
352
-			0x14df0,0x1a6fc,0x1fa64,0x14cf8,0x1a67e,0x1fa62,0x14c7c,0x14c3e,0x1f4e8,0x1fa76, //  70
353
-			0x14efc,0x1f4e4,0x14e7e,0x1f4e2,0x1e9e8,0x1f4f6,0x1e9e4,0x1e9e2,0x1d3e8,0x1e9f6, //  80
354
-			0x1d3e4,0x1d3e2,0x1a7e8,0x1d3f6,0x1a7e4,0x1a7e2,0x145e0,0x1a2f8,0x1d17e,0x144f0, //  90
355
-			0x1a27c,0x14478,0x1a23e,0x1443c,0x1441e,0x1fa34,0x146f8,0x1a37e,0x1fa32,0x1467c, // 100
356
-			0x1463e,0x1f474,0x1477e,0x1f472,0x1e8f4,0x1e8f2,0x1d1f4,0x1d1f2,0x1a3f4,0x1a3f2, // 110
357
-			0x142f0,0x1a17c,0x14278,0x1a13e,0x1423c,0x1421e,0x1fa1a,0x1437c,0x1433e,0x1f43a, // 120
358
-			0x1e87a,0x1d0fa,0x14178,0x1a0be,0x1413c,0x1411e,0x141be,0x140bc,0x1409e,0x12bc0, // 130
359
-			0x195f0,0x1cafc,0x129e0,0x194f8,0x1ca7e,0x128f0,0x1947c,0x12878,0x1943e,0x1283c, // 140
360
-			0x1f968,0x12df0,0x196fc,0x1f964,0x12cf8,0x1967e,0x1f962,0x12c7c,0x12c3e,0x1f2e8, // 150
361
-			0x1f976,0x12efc,0x1f2e4,0x12e7e,0x1f2e2,0x1e5e8,0x1f2f6,0x1e5e4,0x1e5e2,0x1cbe8, // 160
362
-			0x1e5f6,0x1cbe4,0x1cbe2,0x197e8,0x1cbf6,0x197e4,0x197e2,0x1b5e0,0x1daf8,0x1ed7e, // 170
363
-			0x169c0,0x1b4f0,0x1da7c,0x168e0,0x1b478,0x1da3e,0x16870,0x1b43c,0x16838,0x1b41e, // 180
364
-			0x1681c,0x125e0,0x192f8,0x1c97e,0x16de0,0x124f0,0x1927c,0x16cf0,0x1b67c,0x1923e, // 190
365
-			0x16c78,0x1243c,0x16c3c,0x1241e,0x16c1e,0x1f934,0x126f8,0x1937e,0x1fb74,0x1f932, // 200
366
-			0x16ef8,0x1267c,0x1fb72,0x16e7c,0x1263e,0x16e3e,0x1f274,0x1277e,0x1f6f4,0x1f272, // 210
367
-			0x16f7e,0x1f6f2,0x1e4f4,0x1edf4,0x1e4f2,0x1edf2,0x1c9f4,0x1dbf4,0x1c9f2,0x1dbf2, // 220
368
-			0x193f4,0x193f2,0x165c0,0x1b2f0,0x1d97c,0x164e0,0x1b278,0x1d93e,0x16470,0x1b23c, // 230
369
-			0x16438,0x1b21e,0x1641c,0x1640e,0x122f0,0x1917c,0x166f0,0x12278,0x1913e,0x16678, // 240
370
-			0x1b33e,0x1663c,0x1221e,0x1661e,0x1f91a,0x1237c,0x1fb3a,0x1677c,0x1233e,0x1673e, // 250
371
-			0x1f23a,0x1f67a,0x1e47a,0x1ecfa,0x1c8fa,0x1d9fa,0x191fa,0x162e0,0x1b178,0x1d8be, // 260
372
-			0x16270,0x1b13c,0x16238,0x1b11e,0x1621c,0x1620e,0x12178,0x190be,0x16378,0x1213c, // 270
373
-			0x1633c,0x1211e,0x1631e,0x121be,0x163be,0x16170,0x1b0bc,0x16138,0x1b09e,0x1611c, // 280
374
-			0x1610e,0x120bc,0x161bc,0x1209e,0x1619e,0x160b8,0x1b05e,0x1609c,0x1608e,0x1205e, // 290
375
-			0x160de,0x1605c,0x1604e,0x115e0,0x18af8,0x1c57e,0x114f0,0x18a7c,0x11478,0x18a3e, // 300
376
-			0x1143c,0x1141e,0x1f8b4,0x116f8,0x18b7e,0x1f8b2,0x1167c,0x1163e,0x1f174,0x1177e, // 310
377
-			0x1f172,0x1e2f4,0x1e2f2,0x1c5f4,0x1c5f2,0x18bf4,0x18bf2,0x135c0,0x19af0,0x1cd7c, // 320
378
-			0x134e0,0x19a78,0x1cd3e,0x13470,0x19a3c,0x13438,0x19a1e,0x1341c,0x1340e,0x112f0, // 330
379
-			0x1897c,0x136f0,0x11278,0x1893e,0x13678,0x19b3e,0x1363c,0x1121e,0x1361e,0x1f89a, // 340
380
-			0x1137c,0x1f9ba,0x1377c,0x1133e,0x1373e,0x1f13a,0x1f37a,0x1e27a,0x1e6fa,0x1c4fa, // 350
381
-			0x1cdfa,0x189fa,0x1bae0,0x1dd78,0x1eebe,0x174c0,0x1ba70,0x1dd3c,0x17460,0x1ba38, // 360
382
-			0x1dd1e,0x17430,0x1ba1c,0x17418,0x1ba0e,0x1740c,0x132e0,0x19978,0x1ccbe,0x176e0, // 370
383
-			0x13270,0x1993c,0x17670,0x1bb3c,0x1991e,0x17638,0x1321c,0x1761c,0x1320e,0x1760e, // 380
384
-			0x11178,0x188be,0x13378,0x1113c,0x17778,0x1333c,0x1111e,0x1773c,0x1331e,0x1771e, // 390
385
-			0x111be,0x133be,0x177be,0x172c0,0x1b970,0x1dcbc,0x17260,0x1b938,0x1dc9e,0x17230, // 400
386
-			0x1b91c,0x17218,0x1b90e,0x1720c,0x17206,0x13170,0x198bc,0x17370,0x13138,0x1989e, // 410
387
-			0x17338,0x1b99e,0x1731c,0x1310e,0x1730e,0x110bc,0x131bc,0x1109e,0x173bc,0x1319e, // 420
388
-			0x1739e,0x17160,0x1b8b8,0x1dc5e,0x17130,0x1b89c,0x17118,0x1b88e,0x1710c,0x17106, // 430
389
-			0x130b8,0x1985e,0x171b8,0x1309c,0x1719c,0x1308e,0x1718e,0x1105e,0x130de,0x171de, // 440
390
-			0x170b0,0x1b85c,0x17098,0x1b84e,0x1708c,0x17086,0x1305c,0x170dc,0x1304e,0x170ce, // 450
391
-			0x17058,0x1b82e,0x1704c,0x17046,0x1302e,0x1706e,0x1702c,0x17026,0x10af0,0x1857c, // 460
392
-			0x10a78,0x1853e,0x10a3c,0x10a1e,0x10b7c,0x10b3e,0x1f0ba,0x1e17a,0x1c2fa,0x185fa, // 470
393
-			0x11ae0,0x18d78,0x1c6be,0x11a70,0x18d3c,0x11a38,0x18d1e,0x11a1c,0x11a0e,0x10978, // 480
394
-			0x184be,0x11b78,0x1093c,0x11b3c,0x1091e,0x11b1e,0x109be,0x11bbe,0x13ac0,0x19d70, // 490
395
-			0x1cebc,0x13a60,0x19d38,0x1ce9e,0x13a30,0x19d1c,0x13a18,0x19d0e,0x13a0c,0x13a06, // 500
396
-			0x11970,0x18cbc,0x13b70,0x11938,0x18c9e,0x13b38,0x1191c,0x13b1c,0x1190e,0x13b0e, // 510
397
-			0x108bc,0x119bc,0x1089e,0x13bbc,0x1199e,0x13b9e,0x1bd60,0x1deb8,0x1ef5e,0x17a40, // 520
398
-			0x1bd30,0x1de9c,0x17a20,0x1bd18,0x1de8e,0x17a10,0x1bd0c,0x17a08,0x1bd06,0x17a04, // 530
399
-			0x13960,0x19cb8,0x1ce5e,0x17b60,0x13930,0x19c9c,0x17b30,0x1bd9c,0x19c8e,0x17b18, // 540
400
-			0x1390c,0x17b0c,0x13906,0x17b06,0x118b8,0x18c5e,0x139b8,0x1189c,0x17bb8,0x1399c, // 550
401
-			0x1188e,0x17b9c,0x1398e,0x17b8e,0x1085e,0x118de,0x139de,0x17bde,0x17940,0x1bcb0, // 560
402
-			0x1de5c,0x17920,0x1bc98,0x1de4e,0x17910,0x1bc8c,0x17908,0x1bc86,0x17904,0x17902, // 570
403
-			0x138b0,0x19c5c,0x179b0,0x13898,0x19c4e,0x17998,0x1bcce,0x1798c,0x13886,0x17986, // 580
404
-			0x1185c,0x138dc,0x1184e,0x179dc,0x138ce,0x179ce,0x178a0,0x1bc58,0x1de2e,0x17890, // 590
405
-			0x1bc4c,0x17888,0x1bc46,0x17884,0x17882,0x13858,0x19c2e,0x178d8,0x1384c,0x178cc, // 600
406
-			0x13846,0x178c6,0x1182e,0x1386e,0x178ee,0x17850,0x1bc2c,0x17848,0x1bc26,0x17844, // 610
407
-			0x17842,0x1382c,0x1786c,0x13826,0x17866,0x17828,0x1bc16,0x17824,0x17822,0x13816, // 620
408
-			0x17836,0x10578,0x182be,0x1053c,0x1051e,0x105be,0x10d70,0x186bc,0x10d38,0x1869e, // 630
409
-			0x10d1c,0x10d0e,0x104bc,0x10dbc,0x1049e,0x10d9e,0x11d60,0x18eb8,0x1c75e,0x11d30, // 640
410
-			0x18e9c,0x11d18,0x18e8e,0x11d0c,0x11d06,0x10cb8,0x1865e,0x11db8,0x10c9c,0x11d9c, // 650
411
-			0x10c8e,0x11d8e,0x1045e,0x10cde,0x11dde,0x13d40,0x19eb0,0x1cf5c,0x13d20,0x19e98, // 660
412
-			0x1cf4e,0x13d10,0x19e8c,0x13d08,0x19e86,0x13d04,0x13d02,0x11cb0,0x18e5c,0x13db0, // 670
413
-			0x11c98,0x18e4e,0x13d98,0x19ece,0x13d8c,0x11c86,0x13d86,0x10c5c,0x11cdc,0x10c4e, // 680
414
-			0x13ddc,0x11cce,0x13dce,0x1bea0,0x1df58,0x1efae,0x1be90,0x1df4c,0x1be88,0x1df46, // 690
415
-			0x1be84,0x1be82,0x13ca0,0x19e58,0x1cf2e,0x17da0,0x13c90,0x19e4c,0x17d90,0x1becc, // 700
416
-			0x19e46,0x17d88,0x13c84,0x17d84,0x13c82,0x17d82,0x11c58,0x18e2e,0x13cd8,0x11c4c, // 710
417
-			0x17dd8,0x13ccc,0x11c46,0x17dcc,0x13cc6,0x17dc6,0x10c2e,0x11c6e,0x13cee,0x17dee, // 720
418
-			0x1be50,0x1df2c,0x1be48,0x1df26,0x1be44,0x1be42,0x13c50,0x19e2c,0x17cd0,0x13c48, // 730
419
-			0x19e26,0x17cc8,0x1be66,0x17cc4,0x13c42,0x17cc2,0x11c2c,0x13c6c,0x11c26,0x17cec, // 740
420
-			0x13c66,0x17ce6,0x1be28,0x1df16,0x1be24,0x1be22,0x13c28,0x19e16,0x17c68,0x13c24, // 750
421
-			0x17c64,0x13c22,0x17c62,0x11c16,0x13c36,0x17c76,0x1be14,0x1be12,0x13c14,0x17c34, // 760
422
-			0x13c12,0x17c32,0x102bc,0x1029e,0x106b8,0x1835e,0x1069c,0x1068e,0x1025e,0x106de, // 770
423
-			0x10eb0,0x1875c,0x10e98,0x1874e,0x10e8c,0x10e86,0x1065c,0x10edc,0x1064e,0x10ece, // 780
424
-			0x11ea0,0x18f58,0x1c7ae,0x11e90,0x18f4c,0x11e88,0x18f46,0x11e84,0x11e82,0x10e58, // 790
425
-			0x1872e,0x11ed8,0x18f6e,0x11ecc,0x10e46,0x11ec6,0x1062e,0x10e6e,0x11eee,0x19f50, // 800
426
-			0x1cfac,0x19f48,0x1cfa6,0x19f44,0x19f42,0x11e50,0x18f2c,0x13ed0,0x19f6c,0x18f26, // 810
427
-			0x13ec8,0x11e44,0x13ec4,0x11e42,0x13ec2,0x10e2c,0x11e6c,0x10e26,0x13eec,0x11e66, // 820
428
-			0x13ee6,0x1dfa8,0x1efd6,0x1dfa4,0x1dfa2,0x19f28,0x1cf96,0x1bf68,0x19f24,0x1bf64, // 830
429
-			0x19f22,0x1bf62,0x11e28,0x18f16,0x13e68,0x11e24,0x17ee8,0x13e64,0x11e22,0x17ee4, // 840
430
-			0x13e62,0x17ee2,0x10e16,0x11e36,0x13e76,0x17ef6,0x1df94,0x1df92,0x19f14,0x1bf34, // 850
431
-			0x19f12,0x1bf32,0x11e14,0x13e34,0x11e12,0x17e74,0x13e32,0x17e72,0x1df8a,0x19f0a, // 860
432
-			0x1bf1a,0x11e0a,0x13e1a,0x17e3a,0x1035c,0x1034e,0x10758,0x183ae,0x1074c,0x10746, // 870
433
-			0x1032e,0x1076e,0x10f50,0x187ac,0x10f48,0x187a6,0x10f44,0x10f42,0x1072c,0x10f6c, // 880
434
-			0x10726,0x10f66,0x18fa8,0x1c7d6,0x18fa4,0x18fa2,0x10f28,0x18796,0x11f68,0x18fb6, // 890
435
-			0x11f64,0x10f22,0x11f62,0x10716,0x10f36,0x11f76,0x1cfd4,0x1cfd2,0x18f94,0x19fb4, // 900
436
-			0x18f92,0x19fb2,0x10f14,0x11f34,0x10f12,0x13f74,0x11f32,0x13f72,0x1cfca,0x18f8a, // 910
437
-			0x19f9a,0x10f0a,0x11f1a,0x13f3a,0x103ac,0x103a6,0x107a8,0x183d6,0x107a4,0x107a2, // 920
438
-			0x10396,0x107b6,0x187d4,0x187d2,0x10794,0x10fb4,0x10792,0x10fb2,0x1c7ea)         // 929
346
+			0x1abe0, 0x1d5f8, 0x153c0, 0x1a9f0, 0x1d4fc, 0x151e0, 0x1a8f8, 0x1d47e, 0x150f0, 0x1a87c, //  10
347
+			0x15078, 0x1fad0, 0x15be0, 0x1adf8, 0x1fac8, 0x159f0, 0x1acfc, 0x1fac4, 0x158f8, 0x1ac7e, //  20
348
+			0x1fac2, 0x1587c, 0x1f5d0, 0x1faec, 0x15df8, 0x1f5c8, 0x1fae6, 0x15cfc, 0x1f5c4, 0x15c7e, //  30
349
+			0x1f5c2, 0x1ebd0, 0x1f5ec, 0x1ebc8, 0x1f5e6, 0x1ebc4, 0x1ebc2, 0x1d7d0, 0x1ebec, 0x1d7c8, //  40
350
+			0x1ebe6, 0x1d7c4, 0x1d7c2, 0x1afd0, 0x1d7ec, 0x1afc8, 0x1d7e6, 0x1afc4, 0x14bc0, 0x1a5f0, //  50
351
+			0x1d2fc, 0x149e0, 0x1a4f8, 0x1d27e, 0x148f0, 0x1a47c, 0x14878, 0x1a43e, 0x1483c, 0x1fa68, //  60
352
+			0x14df0, 0x1a6fc, 0x1fa64, 0x14cf8, 0x1a67e, 0x1fa62, 0x14c7c, 0x14c3e, 0x1f4e8, 0x1fa76, //  70
353
+			0x14efc, 0x1f4e4, 0x14e7e, 0x1f4e2, 0x1e9e8, 0x1f4f6, 0x1e9e4, 0x1e9e2, 0x1d3e8, 0x1e9f6, //  80
354
+			0x1d3e4, 0x1d3e2, 0x1a7e8, 0x1d3f6, 0x1a7e4, 0x1a7e2, 0x145e0, 0x1a2f8, 0x1d17e, 0x144f0, //  90
355
+			0x1a27c, 0x14478, 0x1a23e, 0x1443c, 0x1441e, 0x1fa34, 0x146f8, 0x1a37e, 0x1fa32, 0x1467c, // 100
356
+			0x1463e, 0x1f474, 0x1477e, 0x1f472, 0x1e8f4, 0x1e8f2, 0x1d1f4, 0x1d1f2, 0x1a3f4, 0x1a3f2, // 110
357
+			0x142f0, 0x1a17c, 0x14278, 0x1a13e, 0x1423c, 0x1421e, 0x1fa1a, 0x1437c, 0x1433e, 0x1f43a, // 120
358
+			0x1e87a, 0x1d0fa, 0x14178, 0x1a0be, 0x1413c, 0x1411e, 0x141be, 0x140bc, 0x1409e, 0x12bc0, // 130
359
+			0x195f0, 0x1cafc, 0x129e0, 0x194f8, 0x1ca7e, 0x128f0, 0x1947c, 0x12878, 0x1943e, 0x1283c, // 140
360
+			0x1f968, 0x12df0, 0x196fc, 0x1f964, 0x12cf8, 0x1967e, 0x1f962, 0x12c7c, 0x12c3e, 0x1f2e8, // 150
361
+			0x1f976, 0x12efc, 0x1f2e4, 0x12e7e, 0x1f2e2, 0x1e5e8, 0x1f2f6, 0x1e5e4, 0x1e5e2, 0x1cbe8, // 160
362
+			0x1e5f6, 0x1cbe4, 0x1cbe2, 0x197e8, 0x1cbf6, 0x197e4, 0x197e2, 0x1b5e0, 0x1daf8, 0x1ed7e, // 170
363
+			0x169c0, 0x1b4f0, 0x1da7c, 0x168e0, 0x1b478, 0x1da3e, 0x16870, 0x1b43c, 0x16838, 0x1b41e, // 180
364
+			0x1681c, 0x125e0, 0x192f8, 0x1c97e, 0x16de0, 0x124f0, 0x1927c, 0x16cf0, 0x1b67c, 0x1923e, // 190
365
+			0x16c78, 0x1243c, 0x16c3c, 0x1241e, 0x16c1e, 0x1f934, 0x126f8, 0x1937e, 0x1fb74, 0x1f932, // 200
366
+			0x16ef8, 0x1267c, 0x1fb72, 0x16e7c, 0x1263e, 0x16e3e, 0x1f274, 0x1277e, 0x1f6f4, 0x1f272, // 210
367
+			0x16f7e, 0x1f6f2, 0x1e4f4, 0x1edf4, 0x1e4f2, 0x1edf2, 0x1c9f4, 0x1dbf4, 0x1c9f2, 0x1dbf2, // 220
368
+			0x193f4, 0x193f2, 0x165c0, 0x1b2f0, 0x1d97c, 0x164e0, 0x1b278, 0x1d93e, 0x16470, 0x1b23c, // 230
369
+			0x16438, 0x1b21e, 0x1641c, 0x1640e, 0x122f0, 0x1917c, 0x166f0, 0x12278, 0x1913e, 0x16678, // 240
370
+			0x1b33e, 0x1663c, 0x1221e, 0x1661e, 0x1f91a, 0x1237c, 0x1fb3a, 0x1677c, 0x1233e, 0x1673e, // 250
371
+			0x1f23a, 0x1f67a, 0x1e47a, 0x1ecfa, 0x1c8fa, 0x1d9fa, 0x191fa, 0x162e0, 0x1b178, 0x1d8be, // 260
372
+			0x16270, 0x1b13c, 0x16238, 0x1b11e, 0x1621c, 0x1620e, 0x12178, 0x190be, 0x16378, 0x1213c, // 270
373
+			0x1633c, 0x1211e, 0x1631e, 0x121be, 0x163be, 0x16170, 0x1b0bc, 0x16138, 0x1b09e, 0x1611c, // 280
374
+			0x1610e, 0x120bc, 0x161bc, 0x1209e, 0x1619e, 0x160b8, 0x1b05e, 0x1609c, 0x1608e, 0x1205e, // 290
375
+			0x160de, 0x1605c, 0x1604e, 0x115e0, 0x18af8, 0x1c57e, 0x114f0, 0x18a7c, 0x11478, 0x18a3e, // 300
376
+			0x1143c, 0x1141e, 0x1f8b4, 0x116f8, 0x18b7e, 0x1f8b2, 0x1167c, 0x1163e, 0x1f174, 0x1177e, // 310
377
+			0x1f172, 0x1e2f4, 0x1e2f2, 0x1c5f4, 0x1c5f2, 0x18bf4, 0x18bf2, 0x135c0, 0x19af0, 0x1cd7c, // 320
378
+			0x134e0, 0x19a78, 0x1cd3e, 0x13470, 0x19a3c, 0x13438, 0x19a1e, 0x1341c, 0x1340e, 0x112f0, // 330
379
+			0x1897c, 0x136f0, 0x11278, 0x1893e, 0x13678, 0x19b3e, 0x1363c, 0x1121e, 0x1361e, 0x1f89a, // 340
380
+			0x1137c, 0x1f9ba, 0x1377c, 0x1133e, 0x1373e, 0x1f13a, 0x1f37a, 0x1e27a, 0x1e6fa, 0x1c4fa, // 350
381
+			0x1cdfa, 0x189fa, 0x1bae0, 0x1dd78, 0x1eebe, 0x174c0, 0x1ba70, 0x1dd3c, 0x17460, 0x1ba38, // 360
382
+			0x1dd1e, 0x17430, 0x1ba1c, 0x17418, 0x1ba0e, 0x1740c, 0x132e0, 0x19978, 0x1ccbe, 0x176e0, // 370
383
+			0x13270, 0x1993c, 0x17670, 0x1bb3c, 0x1991e, 0x17638, 0x1321c, 0x1761c, 0x1320e, 0x1760e, // 380
384
+			0x11178, 0x188be, 0x13378, 0x1113c, 0x17778, 0x1333c, 0x1111e, 0x1773c, 0x1331e, 0x1771e, // 390
385
+			0x111be, 0x133be, 0x177be, 0x172c0, 0x1b970, 0x1dcbc, 0x17260, 0x1b938, 0x1dc9e, 0x17230, // 400
386
+			0x1b91c, 0x17218, 0x1b90e, 0x1720c, 0x17206, 0x13170, 0x198bc, 0x17370, 0x13138, 0x1989e, // 410
387
+			0x17338, 0x1b99e, 0x1731c, 0x1310e, 0x1730e, 0x110bc, 0x131bc, 0x1109e, 0x173bc, 0x1319e, // 420
388
+			0x1739e, 0x17160, 0x1b8b8, 0x1dc5e, 0x17130, 0x1b89c, 0x17118, 0x1b88e, 0x1710c, 0x17106, // 430
389
+			0x130b8, 0x1985e, 0x171b8, 0x1309c, 0x1719c, 0x1308e, 0x1718e, 0x1105e, 0x130de, 0x171de, // 440
390
+			0x170b0, 0x1b85c, 0x17098, 0x1b84e, 0x1708c, 0x17086, 0x1305c, 0x170dc, 0x1304e, 0x170ce, // 450
391
+			0x17058, 0x1b82e, 0x1704c, 0x17046, 0x1302e, 0x1706e, 0x1702c, 0x17026, 0x10af0, 0x1857c, // 460
392
+			0x10a78, 0x1853e, 0x10a3c, 0x10a1e, 0x10b7c, 0x10b3e, 0x1f0ba, 0x1e17a, 0x1c2fa, 0x185fa, // 470
393
+			0x11ae0, 0x18d78, 0x1c6be, 0x11a70, 0x18d3c, 0x11a38, 0x18d1e, 0x11a1c, 0x11a0e, 0x10978, // 480
394
+			0x184be, 0x11b78, 0x1093c, 0x11b3c, 0x1091e, 0x11b1e, 0x109be, 0x11bbe, 0x13ac0, 0x19d70, // 490
395
+			0x1cebc, 0x13a60, 0x19d38, 0x1ce9e, 0x13a30, 0x19d1c, 0x13a18, 0x19d0e, 0x13a0c, 0x13a06, // 500
396
+			0x11970, 0x18cbc, 0x13b70, 0x11938, 0x18c9e, 0x13b38, 0x1191c, 0x13b1c, 0x1190e, 0x13b0e, // 510
397
+			0x108bc, 0x119bc, 0x1089e, 0x13bbc, 0x1199e, 0x13b9e, 0x1bd60, 0x1deb8, 0x1ef5e, 0x17a40, // 520
398
+			0x1bd30, 0x1de9c, 0x17a20, 0x1bd18, 0x1de8e, 0x17a10, 0x1bd0c, 0x17a08, 0x1bd06, 0x17a04, // 530
399
+			0x13960, 0x19cb8, 0x1ce5e, 0x17b60, 0x13930, 0x19c9c, 0x17b30, 0x1bd9c, 0x19c8e, 0x17b18, // 540
400
+			0x1390c, 0x17b0c, 0x13906, 0x17b06, 0x118b8, 0x18c5e, 0x139b8, 0x1189c, 0x17bb8, 0x1399c, // 550
401
+			0x1188e, 0x17b9c, 0x1398e, 0x17b8e, 0x1085e, 0x118de, 0x139de, 0x17bde, 0x17940, 0x1bcb0, // 560
402
+			0x1de5c, 0x17920, 0x1bc98, 0x1de4e, 0x17910, 0x1bc8c, 0x17908, 0x1bc86, 0x17904, 0x17902, // 570
403
+			0x138b0, 0x19c5c, 0x179b0, 0x13898, 0x19c4e, 0x17998, 0x1bcce, 0x1798c, 0x13886, 0x17986, // 580
404
+			0x1185c, 0x138dc, 0x1184e, 0x179dc, 0x138ce, 0x179ce, 0x178a0, 0x1bc58, 0x1de2e, 0x17890, // 590
405
+			0x1bc4c, 0x17888, 0x1bc46, 0x17884, 0x17882, 0x13858, 0x19c2e, 0x178d8, 0x1384c, 0x178cc, // 600
406
+			0x13846, 0x178c6, 0x1182e, 0x1386e, 0x178ee, 0x17850, 0x1bc2c, 0x17848, 0x1bc26, 0x17844, // 610
407
+			0x17842, 0x1382c, 0x1786c, 0x13826, 0x17866, 0x17828, 0x1bc16, 0x17824, 0x17822, 0x13816, // 620
408
+			0x17836, 0x10578, 0x182be, 0x1053c, 0x1051e, 0x105be, 0x10d70, 0x186bc, 0x10d38, 0x1869e, // 630
409
+			0x10d1c, 0x10d0e, 0x104bc, 0x10dbc, 0x1049e, 0x10d9e, 0x11d60, 0x18eb8, 0x1c75e, 0x11d30, // 640
410
+			0x18e9c, 0x11d18, 0x18e8e, 0x11d0c, 0x11d06, 0x10cb8, 0x1865e, 0x11db8, 0x10c9c, 0x11d9c, // 650
411
+			0x10c8e, 0x11d8e, 0x1045e, 0x10cde, 0x11dde, 0x13d40, 0x19eb0, 0x1cf5c, 0x13d20, 0x19e98, // 660
412
+			0x1cf4e, 0x13d10, 0x19e8c, 0x13d08, 0x19e86, 0x13d04, 0x13d02, 0x11cb0, 0x18e5c, 0x13db0, // 670
413
+			0x11c98, 0x18e4e, 0x13d98, 0x19ece, 0x13d8c, 0x11c86, 0x13d86, 0x10c5c, 0x11cdc, 0x10c4e, // 680
414
+			0x13ddc, 0x11cce, 0x13dce, 0x1bea0, 0x1df58, 0x1efae, 0x1be90, 0x1df4c, 0x1be88, 0x1df46, // 690
415
+			0x1be84, 0x1be82, 0x13ca0, 0x19e58, 0x1cf2e, 0x17da0, 0x13c90, 0x19e4c, 0x17d90, 0x1becc, // 700
416
+			0x19e46, 0x17d88, 0x13c84, 0x17d84, 0x13c82, 0x17d82, 0x11c58, 0x18e2e, 0x13cd8, 0x11c4c, // 710
417
+			0x17dd8, 0x13ccc, 0x11c46, 0x17dcc, 0x13cc6, 0x17dc6, 0x10c2e, 0x11c6e, 0x13cee, 0x17dee, // 720
418
+			0x1be50, 0x1df2c, 0x1be48, 0x1df26, 0x1be44, 0x1be42, 0x13c50, 0x19e2c, 0x17cd0, 0x13c48, // 730
419
+			0x19e26, 0x17cc8, 0x1be66, 0x17cc4, 0x13c42, 0x17cc2, 0x11c2c, 0x13c6c, 0x11c26, 0x17cec, // 740
420
+			0x13c66, 0x17ce6, 0x1be28, 0x1df16, 0x1be24, 0x1be22, 0x13c28, 0x19e16, 0x17c68, 0x13c24, // 750
421
+			0x17c64, 0x13c22, 0x17c62, 0x11c16, 0x13c36, 0x17c76, 0x1be14, 0x1be12, 0x13c14, 0x17c34, // 760
422
+			0x13c12, 0x17c32, 0x102bc, 0x1029e, 0x106b8, 0x1835e, 0x1069c, 0x1068e, 0x1025e, 0x106de, // 770
423
+			0x10eb0, 0x1875c, 0x10e98, 0x1874e, 0x10e8c, 0x10e86, 0x1065c, 0x10edc, 0x1064e, 0x10ece, // 780
424
+			0x11ea0, 0x18f58, 0x1c7ae, 0x11e90, 0x18f4c, 0x11e88, 0x18f46, 0x11e84, 0x11e82, 0x10e58, // 790
425
+			0x1872e, 0x11ed8, 0x18f6e, 0x11ecc, 0x10e46, 0x11ec6, 0x1062e, 0x10e6e, 0x11eee, 0x19f50, // 800
426
+			0x1cfac, 0x19f48, 0x1cfa6, 0x19f44, 0x19f42, 0x11e50, 0x18f2c, 0x13ed0, 0x19f6c, 0x18f26, // 810
427
+			0x13ec8, 0x11e44, 0x13ec4, 0x11e42, 0x13ec2, 0x10e2c, 0x11e6c, 0x10e26, 0x13eec, 0x11e66, // 820
428
+			0x13ee6, 0x1dfa8, 0x1efd6, 0x1dfa4, 0x1dfa2, 0x19f28, 0x1cf96, 0x1bf68, 0x19f24, 0x1bf64, // 830
429
+			0x19f22, 0x1bf62, 0x11e28, 0x18f16, 0x13e68, 0x11e24, 0x17ee8, 0x13e64, 0x11e22, 0x17ee4, // 840
430
+			0x13e62, 0x17ee2, 0x10e16, 0x11e36, 0x13e76, 0x17ef6, 0x1df94, 0x1df92, 0x19f14, 0x1bf34, // 850
431
+			0x19f12, 0x1bf32, 0x11e14, 0x13e34, 0x11e12, 0x17e74, 0x13e32, 0x17e72, 0x1df8a, 0x19f0a, // 860
432
+			0x1bf1a, 0x11e0a, 0x13e1a, 0x17e3a, 0x1035c, 0x1034e, 0x10758, 0x183ae, 0x1074c, 0x10746, // 870
433
+			0x1032e, 0x1076e, 0x10f50, 0x187ac, 0x10f48, 0x187a6, 0x10f44, 0x10f42, 0x1072c, 0x10f6c, // 880
434
+			0x10726, 0x10f66, 0x18fa8, 0x1c7d6, 0x18fa4, 0x18fa2, 0x10f28, 0x18796, 0x11f68, 0x18fb6, // 890
435
+			0x11f64, 0x10f22, 0x11f62, 0x10716, 0x10f36, 0x11f76, 0x1cfd4, 0x1cfd2, 0x18f94, 0x19fb4, // 900
436
+			0x18f92, 0x19fb2, 0x10f14, 0x11f34, 0x10f12, 0x13f74, 0x11f32, 0x13f72, 0x1cfca, 0x18f8a, // 910
437
+			0x19f9a, 0x10f0a, 0x11f1a, 0x13f3a, 0x103ac, 0x103a6, 0x107a8, 0x183d6, 0x107a4, 0x107a2, // 920
438
+			0x10396, 0x107b6, 0x187d4, 0x187d2, 0x10794, 0x10fb4, 0x10792, 0x10fb2, 0x1c7ea)         // 929
439 439
 	); // end of $clusters array
440 440
 
441 441
 	/**
@@ -444,80 +444,80 @@  discard block
 block discarded – undo
444 444
 	 */
445 445
 	protected $rsfactors = array(
446 446
 		array( // ECL 0 (2 factors) -------------------------------------------------------------------------------
447
-			0x01b,0x395),                                                                                    //   2
447
+			0x01b, 0x395), //   2
448 448
 		array( // ECL 1 (4 factors) -------------------------------------------------------------------------------
449
-			0x20a,0x238,0x2d3,0x329),                                                                        //   4
449
+			0x20a, 0x238, 0x2d3, 0x329), //   4
450 450
 		array( // ECL 2 (8 factors) -------------------------------------------------------------------------------
451
-			0x0ed,0x134,0x1b4,0x11c,0x286,0x28d,0x1ac,0x17b),                                                //   8
451
+			0x0ed, 0x134, 0x1b4, 0x11c, 0x286, 0x28d, 0x1ac, 0x17b), //   8
452 452
 		array( // ECL 3 (16 factors) ------------------------------------------------------------------------------
453
-			0x112,0x232,0x0e8,0x2f3,0x257,0x20c,0x321,0x084,0x127,0x074,0x1ba,0x1ac,0x127,0x02a,0x0b0,0x041),//  16
453
+			0x112, 0x232, 0x0e8, 0x2f3, 0x257, 0x20c, 0x321, 0x084, 0x127, 0x074, 0x1ba, 0x1ac, 0x127, 0x02a, 0x0b0, 0x041), //  16
454 454
 		array( // ECL 4 (32 factors) ------------------------------------------------------------------------------
455
-			0x169,0x23f,0x39a,0x20d,0x0b0,0x24a,0x280,0x141,0x218,0x2e6,0x2a5,0x2e6,0x2af,0x11c,0x0c1,0x205, //  16
456
-			0x111,0x1ee,0x107,0x093,0x251,0x320,0x23b,0x140,0x323,0x085,0x0e7,0x186,0x2ad,0x14a,0x03f,0x19a),//  32
455
+			0x169, 0x23f, 0x39a, 0x20d, 0x0b0, 0x24a, 0x280, 0x141, 0x218, 0x2e6, 0x2a5, 0x2e6, 0x2af, 0x11c, 0x0c1, 0x205, //  16
456
+			0x111, 0x1ee, 0x107, 0x093, 0x251, 0x320, 0x23b, 0x140, 0x323, 0x085, 0x0e7, 0x186, 0x2ad, 0x14a, 0x03f, 0x19a), //  32
457 457
 		array( // ECL 5 (64 factors) ------------------------------------------------------------------------------
458
-			0x21b,0x1a6,0x006,0x05d,0x35e,0x303,0x1c5,0x06a,0x262,0x11f,0x06b,0x1f9,0x2dd,0x36d,0x17d,0x264, //  16
459
-			0x2d3,0x1dc,0x1ce,0x0ac,0x1ae,0x261,0x35a,0x336,0x21f,0x178,0x1ff,0x190,0x2a0,0x2fa,0x11b,0x0b8, //  32
460
-			0x1b8,0x023,0x207,0x01f,0x1cc,0x252,0x0e1,0x217,0x205,0x160,0x25d,0x09e,0x28b,0x0c9,0x1e8,0x1f6, //  48
461
-			0x288,0x2dd,0x2cd,0x053,0x194,0x061,0x118,0x303,0x348,0x275,0x004,0x17d,0x34b,0x26f,0x108,0x21f),//  64
458
+			0x21b, 0x1a6, 0x006, 0x05d, 0x35e, 0x303, 0x1c5, 0x06a, 0x262, 0x11f, 0x06b, 0x1f9, 0x2dd, 0x36d, 0x17d, 0x264, //  16
459
+			0x2d3, 0x1dc, 0x1ce, 0x0ac, 0x1ae, 0x261, 0x35a, 0x336, 0x21f, 0x178, 0x1ff, 0x190, 0x2a0, 0x2fa, 0x11b, 0x0b8, //  32
460
+			0x1b8, 0x023, 0x207, 0x01f, 0x1cc, 0x252, 0x0e1, 0x217, 0x205, 0x160, 0x25d, 0x09e, 0x28b, 0x0c9, 0x1e8, 0x1f6, //  48
461
+			0x288, 0x2dd, 0x2cd, 0x053, 0x194, 0x061, 0x118, 0x303, 0x348, 0x275, 0x004, 0x17d, 0x34b, 0x26f, 0x108, 0x21f), //  64
462 462
 		array( // ECL 6 (128 factors) -----------------------------------------------------------------------------
463
-			0x209,0x136,0x360,0x223,0x35a,0x244,0x128,0x17b,0x035,0x30b,0x381,0x1bc,0x190,0x39d,0x2ed,0x19f, //  16
464
-			0x336,0x05d,0x0d9,0x0d0,0x3a0,0x0f4,0x247,0x26c,0x0f6,0x094,0x1bf,0x277,0x124,0x38c,0x1ea,0x2c0, //  32
465
-			0x204,0x102,0x1c9,0x38b,0x252,0x2d3,0x2a2,0x124,0x110,0x060,0x2ac,0x1b0,0x2ae,0x25e,0x35c,0x239, //  48
466
-			0x0c1,0x0db,0x081,0x0ba,0x0ec,0x11f,0x0c0,0x307,0x116,0x0ad,0x028,0x17b,0x2c8,0x1cf,0x286,0x308, //  64
467
-			0x0ab,0x1eb,0x129,0x2fb,0x09c,0x2dc,0x05f,0x10e,0x1bf,0x05a,0x1fb,0x030,0x0e4,0x335,0x328,0x382, //  80
468
-			0x310,0x297,0x273,0x17a,0x17e,0x106,0x17c,0x25a,0x2f2,0x150,0x059,0x266,0x057,0x1b0,0x29e,0x268, //  96
469
-			0x09d,0x176,0x0f2,0x2d6,0x258,0x10d,0x177,0x382,0x34d,0x1c6,0x162,0x082,0x32e,0x24b,0x324,0x022, // 112
470
-			0x0d3,0x14a,0x21b,0x129,0x33b,0x361,0x025,0x205,0x342,0x13b,0x226,0x056,0x321,0x004,0x06c,0x21b),// 128
463
+			0x209, 0x136, 0x360, 0x223, 0x35a, 0x244, 0x128, 0x17b, 0x035, 0x30b, 0x381, 0x1bc, 0x190, 0x39d, 0x2ed, 0x19f, //  16
464
+			0x336, 0x05d, 0x0d9, 0x0d0, 0x3a0, 0x0f4, 0x247, 0x26c, 0x0f6, 0x094, 0x1bf, 0x277, 0x124, 0x38c, 0x1ea, 0x2c0, //  32
465
+			0x204, 0x102, 0x1c9, 0x38b, 0x252, 0x2d3, 0x2a2, 0x124, 0x110, 0x060, 0x2ac, 0x1b0, 0x2ae, 0x25e, 0x35c, 0x239, //  48
466
+			0x0c1, 0x0db, 0x081, 0x0ba, 0x0ec, 0x11f, 0x0c0, 0x307, 0x116, 0x0ad, 0x028, 0x17b, 0x2c8, 0x1cf, 0x286, 0x308, //  64
467
+			0x0ab, 0x1eb, 0x129, 0x2fb, 0x09c, 0x2dc, 0x05f, 0x10e, 0x1bf, 0x05a, 0x1fb, 0x030, 0x0e4, 0x335, 0x328, 0x382, //  80
468
+			0x310, 0x297, 0x273, 0x17a, 0x17e, 0x106, 0x17c, 0x25a, 0x2f2, 0x150, 0x059, 0x266, 0x057, 0x1b0, 0x29e, 0x268, //  96
469
+			0x09d, 0x176, 0x0f2, 0x2d6, 0x258, 0x10d, 0x177, 0x382, 0x34d, 0x1c6, 0x162, 0x082, 0x32e, 0x24b, 0x324, 0x022, // 112
470
+			0x0d3, 0x14a, 0x21b, 0x129, 0x33b, 0x361, 0x025, 0x205, 0x342, 0x13b, 0x226, 0x056, 0x321, 0x004, 0x06c, 0x21b), // 128
471 471
 		array( // ECL 7 (256 factors) -----------------------------------------------------------------------------
472
-			0x20c,0x37e,0x04b,0x2fe,0x372,0x359,0x04a,0x0cc,0x052,0x24a,0x2c4,0x0fa,0x389,0x312,0x08a,0x2d0, //  16
473
-			0x35a,0x0c2,0x137,0x391,0x113,0x0be,0x177,0x352,0x1b6,0x2dd,0x0c2,0x118,0x0c9,0x118,0x33c,0x2f5, //  32
474
-			0x2c6,0x32e,0x397,0x059,0x044,0x239,0x00b,0x0cc,0x31c,0x25d,0x21c,0x391,0x321,0x2bc,0x31f,0x089, //  48
475
-			0x1b7,0x1a2,0x250,0x29c,0x161,0x35b,0x172,0x2b6,0x145,0x0f0,0x0d8,0x101,0x11c,0x225,0x0d1,0x374, //  64
476
-			0x13b,0x046,0x149,0x319,0x1ea,0x112,0x36d,0x0a2,0x2ed,0x32c,0x2ac,0x1cd,0x14e,0x178,0x351,0x209, //  80
477
-			0x133,0x123,0x323,0x2c8,0x013,0x166,0x18f,0x38c,0x067,0x1ff,0x033,0x008,0x205,0x0e1,0x121,0x1d6, //  96
478
-			0x27d,0x2db,0x042,0x0ff,0x395,0x10d,0x1cf,0x33e,0x2da,0x1b1,0x350,0x249,0x088,0x21a,0x38a,0x05a, // 112
479
-			0x002,0x122,0x2e7,0x0c7,0x28f,0x387,0x149,0x031,0x322,0x244,0x163,0x24c,0x0bc,0x1ce,0x00a,0x086, // 128
480
-			0x274,0x140,0x1df,0x082,0x2e3,0x047,0x107,0x13e,0x176,0x259,0x0c0,0x25d,0x08e,0x2a1,0x2af,0x0ea, // 144
481
-			0x2d2,0x180,0x0b1,0x2f0,0x25f,0x280,0x1c7,0x0c1,0x2b1,0x2c3,0x325,0x281,0x030,0x03c,0x2dc,0x26d, // 160
482
-			0x37f,0x220,0x105,0x354,0x28f,0x135,0x2b9,0x2f3,0x2f4,0x03c,0x0e7,0x305,0x1b2,0x1a5,0x2d6,0x210, // 176
483
-			0x1f7,0x076,0x031,0x31b,0x020,0x090,0x1f4,0x0ee,0x344,0x18a,0x118,0x236,0x13f,0x009,0x287,0x226, // 192
484
-			0x049,0x392,0x156,0x07e,0x020,0x2a9,0x14b,0x318,0x26c,0x03c,0x261,0x1b9,0x0b4,0x317,0x37d,0x2f2, // 208
485
-			0x25d,0x17f,0x0e4,0x2ed,0x2f8,0x0d5,0x036,0x129,0x086,0x036,0x342,0x12b,0x39a,0x0bf,0x38e,0x214, // 224
486
-			0x261,0x33d,0x0bd,0x014,0x0a7,0x01d,0x368,0x1c1,0x053,0x192,0x029,0x290,0x1f9,0x243,0x1e1,0x0ad, // 240
487
-			0x194,0x0fb,0x2b0,0x05f,0x1f1,0x22b,0x282,0x21f,0x133,0x09f,0x39c,0x22e,0x288,0x037,0x1f1,0x00a),// 256
472
+			0x20c, 0x37e, 0x04b, 0x2fe, 0x372, 0x359, 0x04a, 0x0cc, 0x052, 0x24a, 0x2c4, 0x0fa, 0x389, 0x312, 0x08a, 0x2d0, //  16
473
+			0x35a, 0x0c2, 0x137, 0x391, 0x113, 0x0be, 0x177, 0x352, 0x1b6, 0x2dd, 0x0c2, 0x118, 0x0c9, 0x118, 0x33c, 0x2f5, //  32
474
+			0x2c6, 0x32e, 0x397, 0x059, 0x044, 0x239, 0x00b, 0x0cc, 0x31c, 0x25d, 0x21c, 0x391, 0x321, 0x2bc, 0x31f, 0x089, //  48
475
+			0x1b7, 0x1a2, 0x250, 0x29c, 0x161, 0x35b, 0x172, 0x2b6, 0x145, 0x0f0, 0x0d8, 0x101, 0x11c, 0x225, 0x0d1, 0x374, //  64
476
+			0x13b, 0x046, 0x149, 0x319, 0x1ea, 0x112, 0x36d, 0x0a2, 0x2ed, 0x32c, 0x2ac, 0x1cd, 0x14e, 0x178, 0x351, 0x209, //  80
477
+			0x133, 0x123, 0x323, 0x2c8, 0x013, 0x166, 0x18f, 0x38c, 0x067, 0x1ff, 0x033, 0x008, 0x205, 0x0e1, 0x121, 0x1d6, //  96
478
+			0x27d, 0x2db, 0x042, 0x0ff, 0x395, 0x10d, 0x1cf, 0x33e, 0x2da, 0x1b1, 0x350, 0x249, 0x088, 0x21a, 0x38a, 0x05a, // 112
479
+			0x002, 0x122, 0x2e7, 0x0c7, 0x28f, 0x387, 0x149, 0x031, 0x322, 0x244, 0x163, 0x24c, 0x0bc, 0x1ce, 0x00a, 0x086, // 128
480
+			0x274, 0x140, 0x1df, 0x082, 0x2e3, 0x047, 0x107, 0x13e, 0x176, 0x259, 0x0c0, 0x25d, 0x08e, 0x2a1, 0x2af, 0x0ea, // 144
481
+			0x2d2, 0x180, 0x0b1, 0x2f0, 0x25f, 0x280, 0x1c7, 0x0c1, 0x2b1, 0x2c3, 0x325, 0x281, 0x030, 0x03c, 0x2dc, 0x26d, // 160
482
+			0x37f, 0x220, 0x105, 0x354, 0x28f, 0x135, 0x2b9, 0x2f3, 0x2f4, 0x03c, 0x0e7, 0x305, 0x1b2, 0x1a5, 0x2d6, 0x210, // 176
483
+			0x1f7, 0x076, 0x031, 0x31b, 0x020, 0x090, 0x1f4, 0x0ee, 0x344, 0x18a, 0x118, 0x236, 0x13f, 0x009, 0x287, 0x226, // 192
484
+			0x049, 0x392, 0x156, 0x07e, 0x020, 0x2a9, 0x14b, 0x318, 0x26c, 0x03c, 0x261, 0x1b9, 0x0b4, 0x317, 0x37d, 0x2f2, // 208
485
+			0x25d, 0x17f, 0x0e4, 0x2ed, 0x2f8, 0x0d5, 0x036, 0x129, 0x086, 0x036, 0x342, 0x12b, 0x39a, 0x0bf, 0x38e, 0x214, // 224
486
+			0x261, 0x33d, 0x0bd, 0x014, 0x0a7, 0x01d, 0x368, 0x1c1, 0x053, 0x192, 0x029, 0x290, 0x1f9, 0x243, 0x1e1, 0x0ad, // 240
487
+			0x194, 0x0fb, 0x2b0, 0x05f, 0x1f1, 0x22b, 0x282, 0x21f, 0x133, 0x09f, 0x39c, 0x22e, 0x288, 0x037, 0x1f1, 0x00a), // 256
488 488
 		array( // ECL 8 (512 factors) -----------------------------------------------------------------------------
489
-			0x160,0x04d,0x175,0x1f8,0x023,0x257,0x1ac,0x0cf,0x199,0x23e,0x076,0x1f2,0x11d,0x17c,0x15e,0x1ec, //  16
490
-			0x0c5,0x109,0x398,0x09b,0x392,0x12b,0x0e5,0x283,0x126,0x367,0x132,0x058,0x057,0x0c1,0x160,0x30d, //  32
491
-			0x34e,0x04b,0x147,0x208,0x1b3,0x21f,0x0cb,0x29a,0x0f9,0x15a,0x30d,0x26d,0x280,0x10c,0x31a,0x216, //  48
492
-			0x21b,0x30d,0x198,0x186,0x284,0x066,0x1dc,0x1f3,0x122,0x278,0x221,0x025,0x35a,0x394,0x228,0x029, //  64
493
-			0x21e,0x121,0x07a,0x110,0x17f,0x320,0x1e5,0x062,0x2f0,0x1d8,0x2f9,0x06b,0x310,0x35c,0x292,0x2e5, //  80
494
-			0x122,0x0cc,0x2a9,0x197,0x357,0x055,0x063,0x03e,0x1e2,0x0b4,0x014,0x129,0x1c3,0x251,0x391,0x08e, //  96
495
-			0x328,0x2ac,0x11f,0x218,0x231,0x04c,0x28d,0x383,0x2d9,0x237,0x2e8,0x186,0x201,0x0c0,0x204,0x102, // 112
496
-			0x0f0,0x206,0x31a,0x18b,0x300,0x350,0x033,0x262,0x180,0x0a8,0x0be,0x33a,0x148,0x254,0x312,0x12f, // 128
497
-			0x23a,0x17d,0x19f,0x281,0x09c,0x0ed,0x097,0x1ad,0x213,0x0cf,0x2a4,0x2c6,0x059,0x0a8,0x130,0x192, // 144
498
-			0x028,0x2c4,0x23f,0x0a2,0x360,0x0e5,0x041,0x35d,0x349,0x200,0x0a4,0x1dd,0x0dd,0x05c,0x166,0x311, // 160
499
-			0x120,0x165,0x352,0x344,0x33b,0x2e0,0x2c3,0x05e,0x008,0x1ee,0x072,0x209,0x002,0x1f3,0x353,0x21f, // 176
500
-			0x098,0x2d9,0x303,0x05f,0x0f8,0x169,0x242,0x143,0x358,0x31d,0x121,0x033,0x2ac,0x1d2,0x215,0x334, // 192
501
-			0x29d,0x02d,0x386,0x1c4,0x0a7,0x156,0x0f4,0x0ad,0x023,0x1cf,0x28b,0x033,0x2bb,0x24f,0x1c4,0x242, // 208
502
-			0x025,0x07c,0x12a,0x14c,0x228,0x02b,0x1ab,0x077,0x296,0x309,0x1db,0x352,0x2fc,0x16c,0x242,0x38f, // 224
503
-			0x11b,0x2c7,0x1d8,0x1a4,0x0f5,0x120,0x252,0x18a,0x1ff,0x147,0x24d,0x309,0x2bb,0x2b0,0x02b,0x198, // 240
504
-			0x34a,0x17f,0x2d1,0x209,0x230,0x284,0x2ca,0x22f,0x03e,0x091,0x369,0x297,0x2c9,0x09f,0x2a0,0x2d9, // 256
505
-			0x270,0x03b,0x0c1,0x1a1,0x09e,0x0d1,0x233,0x234,0x157,0x2b5,0x06d,0x260,0x233,0x16d,0x0b5,0x304, // 272
506
-			0x2a5,0x136,0x0f8,0x161,0x2c4,0x19a,0x243,0x366,0x269,0x349,0x278,0x35c,0x121,0x218,0x023,0x309, // 288
507
-			0x26a,0x24a,0x1a8,0x341,0x04d,0x255,0x15a,0x10d,0x2f5,0x278,0x2b7,0x2ef,0x14b,0x0f7,0x0b8,0x02d, // 304
508
-			0x313,0x2a8,0x012,0x042,0x197,0x171,0x036,0x1ec,0x0e4,0x265,0x33e,0x39a,0x1b5,0x207,0x284,0x389, // 320
509
-			0x315,0x1a4,0x131,0x1b9,0x0cf,0x12c,0x37c,0x33b,0x08d,0x219,0x17d,0x296,0x201,0x038,0x0fc,0x155, // 336
510
-			0x0f2,0x31d,0x346,0x345,0x2d0,0x0e0,0x133,0x277,0x03d,0x057,0x230,0x136,0x2f4,0x299,0x18d,0x328, // 352
511
-			0x353,0x135,0x1d9,0x31b,0x17a,0x01f,0x287,0x393,0x1cb,0x326,0x24e,0x2db,0x1a9,0x0d8,0x224,0x0f9, // 368
512
-			0x141,0x371,0x2bb,0x217,0x2a1,0x30e,0x0d2,0x32f,0x389,0x12f,0x34b,0x39a,0x119,0x049,0x1d5,0x317, // 384
513
-			0x294,0x0a2,0x1f2,0x134,0x09b,0x1a6,0x38b,0x331,0x0bb,0x03e,0x010,0x1a9,0x217,0x150,0x11e,0x1b5, // 400
514
-			0x177,0x111,0x262,0x128,0x0b7,0x39b,0x074,0x29b,0x2ef,0x161,0x03e,0x16e,0x2b3,0x17b,0x2af,0x34a, // 416
515
-			0x025,0x165,0x2d0,0x2e6,0x14a,0x005,0x027,0x39b,0x137,0x1a8,0x0f2,0x2ed,0x141,0x036,0x29d,0x13c, // 432
516
-			0x156,0x12b,0x216,0x069,0x29b,0x1e8,0x280,0x2a0,0x240,0x21c,0x13c,0x1e6,0x2d1,0x262,0x02e,0x290, // 448
517
-			0x1bf,0x0ab,0x268,0x1d0,0x0be,0x213,0x129,0x141,0x2fa,0x2f0,0x215,0x0af,0x086,0x00e,0x17d,0x1b1, // 464
518
-			0x2cd,0x02d,0x06f,0x014,0x254,0x11c,0x2e0,0x08a,0x286,0x19b,0x36d,0x29d,0x08d,0x397,0x02d,0x30c, // 480
519
-			0x197,0x0a4,0x14c,0x383,0x0a5,0x2d6,0x258,0x145,0x1f2,0x28f,0x165,0x2f0,0x300,0x0df,0x351,0x287, // 496
520
-			0x03f,0x136,0x35f,0x0fb,0x16e,0x130,0x11a,0x2e2,0x2a3,0x19a,0x185,0x0f4,0x01f,0x079,0x12f,0x107) // 512
489
+			0x160, 0x04d, 0x175, 0x1f8, 0x023, 0x257, 0x1ac, 0x0cf, 0x199, 0x23e, 0x076, 0x1f2, 0x11d, 0x17c, 0x15e, 0x1ec, //  16
490
+			0x0c5, 0x109, 0x398, 0x09b, 0x392, 0x12b, 0x0e5, 0x283, 0x126, 0x367, 0x132, 0x058, 0x057, 0x0c1, 0x160, 0x30d, //  32
491
+			0x34e, 0x04b, 0x147, 0x208, 0x1b3, 0x21f, 0x0cb, 0x29a, 0x0f9, 0x15a, 0x30d, 0x26d, 0x280, 0x10c, 0x31a, 0x216, //  48
492
+			0x21b, 0x30d, 0x198, 0x186, 0x284, 0x066, 0x1dc, 0x1f3, 0x122, 0x278, 0x221, 0x025, 0x35a, 0x394, 0x228, 0x029, //  64
493
+			0x21e, 0x121, 0x07a, 0x110, 0x17f, 0x320, 0x1e5, 0x062, 0x2f0, 0x1d8, 0x2f9, 0x06b, 0x310, 0x35c, 0x292, 0x2e5, //  80
494
+			0x122, 0x0cc, 0x2a9, 0x197, 0x357, 0x055, 0x063, 0x03e, 0x1e2, 0x0b4, 0x014, 0x129, 0x1c3, 0x251, 0x391, 0x08e, //  96
495
+			0x328, 0x2ac, 0x11f, 0x218, 0x231, 0x04c, 0x28d, 0x383, 0x2d9, 0x237, 0x2e8, 0x186, 0x201, 0x0c0, 0x204, 0x102, // 112
496
+			0x0f0, 0x206, 0x31a, 0x18b, 0x300, 0x350, 0x033, 0x262, 0x180, 0x0a8, 0x0be, 0x33a, 0x148, 0x254, 0x312, 0x12f, // 128
497
+			0x23a, 0x17d, 0x19f, 0x281, 0x09c, 0x0ed, 0x097, 0x1ad, 0x213, 0x0cf, 0x2a4, 0x2c6, 0x059, 0x0a8, 0x130, 0x192, // 144
498
+			0x028, 0x2c4, 0x23f, 0x0a2, 0x360, 0x0e5, 0x041, 0x35d, 0x349, 0x200, 0x0a4, 0x1dd, 0x0dd, 0x05c, 0x166, 0x311, // 160
499
+			0x120, 0x165, 0x352, 0x344, 0x33b, 0x2e0, 0x2c3, 0x05e, 0x008, 0x1ee, 0x072, 0x209, 0x002, 0x1f3, 0x353, 0x21f, // 176
500
+			0x098, 0x2d9, 0x303, 0x05f, 0x0f8, 0x169, 0x242, 0x143, 0x358, 0x31d, 0x121, 0x033, 0x2ac, 0x1d2, 0x215, 0x334, // 192
501
+			0x29d, 0x02d, 0x386, 0x1c4, 0x0a7, 0x156, 0x0f4, 0x0ad, 0x023, 0x1cf, 0x28b, 0x033, 0x2bb, 0x24f, 0x1c4, 0x242, // 208
502
+			0x025, 0x07c, 0x12a, 0x14c, 0x228, 0x02b, 0x1ab, 0x077, 0x296, 0x309, 0x1db, 0x352, 0x2fc, 0x16c, 0x242, 0x38f, // 224
503
+			0x11b, 0x2c7, 0x1d8, 0x1a4, 0x0f5, 0x120, 0x252, 0x18a, 0x1ff, 0x147, 0x24d, 0x309, 0x2bb, 0x2b0, 0x02b, 0x198, // 240
504
+			0x34a, 0x17f, 0x2d1, 0x209, 0x230, 0x284, 0x2ca, 0x22f, 0x03e, 0x091, 0x369, 0x297, 0x2c9, 0x09f, 0x2a0, 0x2d9, // 256
505
+			0x270, 0x03b, 0x0c1, 0x1a1, 0x09e, 0x0d1, 0x233, 0x234, 0x157, 0x2b5, 0x06d, 0x260, 0x233, 0x16d, 0x0b5, 0x304, // 272
506
+			0x2a5, 0x136, 0x0f8, 0x161, 0x2c4, 0x19a, 0x243, 0x366, 0x269, 0x349, 0x278, 0x35c, 0x121, 0x218, 0x023, 0x309, // 288
507
+			0x26a, 0x24a, 0x1a8, 0x341, 0x04d, 0x255, 0x15a, 0x10d, 0x2f5, 0x278, 0x2b7, 0x2ef, 0x14b, 0x0f7, 0x0b8, 0x02d, // 304
508
+			0x313, 0x2a8, 0x012, 0x042, 0x197, 0x171, 0x036, 0x1ec, 0x0e4, 0x265, 0x33e, 0x39a, 0x1b5, 0x207, 0x284, 0x389, // 320
509
+			0x315, 0x1a4, 0x131, 0x1b9, 0x0cf, 0x12c, 0x37c, 0x33b, 0x08d, 0x219, 0x17d, 0x296, 0x201, 0x038, 0x0fc, 0x155, // 336
510
+			0x0f2, 0x31d, 0x346, 0x345, 0x2d0, 0x0e0, 0x133, 0x277, 0x03d, 0x057, 0x230, 0x136, 0x2f4, 0x299, 0x18d, 0x328, // 352
511
+			0x353, 0x135, 0x1d9, 0x31b, 0x17a, 0x01f, 0x287, 0x393, 0x1cb, 0x326, 0x24e, 0x2db, 0x1a9, 0x0d8, 0x224, 0x0f9, // 368
512
+			0x141, 0x371, 0x2bb, 0x217, 0x2a1, 0x30e, 0x0d2, 0x32f, 0x389, 0x12f, 0x34b, 0x39a, 0x119, 0x049, 0x1d5, 0x317, // 384
513
+			0x294, 0x0a2, 0x1f2, 0x134, 0x09b, 0x1a6, 0x38b, 0x331, 0x0bb, 0x03e, 0x010, 0x1a9, 0x217, 0x150, 0x11e, 0x1b5, // 400
514
+			0x177, 0x111, 0x262, 0x128, 0x0b7, 0x39b, 0x074, 0x29b, 0x2ef, 0x161, 0x03e, 0x16e, 0x2b3, 0x17b, 0x2af, 0x34a, // 416
515
+			0x025, 0x165, 0x2d0, 0x2e6, 0x14a, 0x005, 0x027, 0x39b, 0x137, 0x1a8, 0x0f2, 0x2ed, 0x141, 0x036, 0x29d, 0x13c, // 432
516
+			0x156, 0x12b, 0x216, 0x069, 0x29b, 0x1e8, 0x280, 0x2a0, 0x240, 0x21c, 0x13c, 0x1e6, 0x2d1, 0x262, 0x02e, 0x290, // 448
517
+			0x1bf, 0x0ab, 0x268, 0x1d0, 0x0be, 0x213, 0x129, 0x141, 0x2fa, 0x2f0, 0x215, 0x0af, 0x086, 0x00e, 0x17d, 0x1b1, // 464
518
+			0x2cd, 0x02d, 0x06f, 0x014, 0x254, 0x11c, 0x2e0, 0x08a, 0x286, 0x19b, 0x36d, 0x29d, 0x08d, 0x397, 0x02d, 0x30c, // 480
519
+			0x197, 0x0a4, 0x14c, 0x383, 0x0a5, 0x2d6, 0x258, 0x145, 0x1f2, 0x28f, 0x165, 0x2f0, 0x300, 0x0df, 0x351, 0x287, // 496
520
+			0x03f, 0x136, 0x35f, 0x0fb, 0x16e, 0x130, 0x11a, 0x2e2, 0x2a3, 0x19a, 0x185, 0x0f4, 0x01f, 0x079, 0x12f, 0x107) // 512
521 521
 	);
522 522
 
523 523
 	/**
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 	 * @param array $macro information for macro block
530 530
 	 * @public
531 531
 	 */
532
-	public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
532
+	public function __construct($code, $ecl = -1, $aspectratio = 2, $macro = array()) {
533 533
 		$barcode_array = array();
534 534
 		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
535 535
 			return false;
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 		// get the input sequence array
538 538
 		$sequence = $this->getInputSequences($code);
539 539
 		$codewords = array(); // array of code-words
540
-		foreach($sequence as $seq) {
540
+		foreach ($sequence as $seq) {
541 541
 			$cw = $this->getCompaction($seq[0], $seq[1], true);
542 542
 			$codewords = array_merge($codewords, $cw);
543 543
 		}
@@ -563,8 +563,8 @@  discard block
 block discarded – undo
563 563
 			$cw = $this->getCompaction(900, $macro['file_id'], false);
564 564
 			$macrocw = array_merge($macrocw, $cw);
565 565
 			// optional fields
566
-			$optmodes = array(900,902,902,900,900,902,902);
567
-			$optsize = array(-1,2,4,-1,-1,-1,2);
566
+			$optmodes = array(900, 902, 902, 900, 900, 902, 902);
567
+			$optsize = array(-1, 2, 4, -1, -1, -1, 2);
568 568
 			foreach ($optmodes as $k => $omode) {
569 569
 				if (isset($macro['option_'.$k])) {
570 570
 					$macrocw[] = 923;
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
 		// initialize array of error correction codewords
788 788
 		$ecw = array_fill(0, $eclsize, 0);
789 789
 		// for each data codeword
790
-		foreach($cw as $k => $d) {
790
+		foreach ($cw as $k => $d) {
791 791
 			$t1 = ($d + $ecw[$eclmaxid]) % 929;
792 792
 			for ($j = $eclmaxid; $j > 0; --$j) {
793 793
 				$t2 = ($t1 * $ecc[$j]) % 929;
@@ -798,7 +798,7 @@  discard block
 block discarded – undo
798 798
 			$t3 = 929 - $t2;
799 799
 			$ecw[0] = $t3 % 929;
800 800
 		}
801
-		foreach($ecw as $j => $e) {
801
+		foreach ($ecw as $j => $e) {
802 802
 			if ($e != 0) {
803 803
 				$ecw[$j] = 929 - $e;
804 804
 			}
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 		preg_match_all('/([0-9]{13,44})/', $code, $numseq, PREG_OFFSET_CAPTURE);
821 821
 		$numseq[1][] = array('', strlen($code));
822 822
 		$offset = 0;
823
-		foreach($numseq[1] as $seq) {
823
+		foreach ($numseq[1] as $seq) {
824 824
 			$seqlen = strlen($seq[0]);
825 825
 			if ($seq[1] > 0) {
826 826
 				// extract text sequence before the number sequence
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
830 830
 				preg_match_all('/([\x09\x0a\x0d\x20-\x7e]{5,})/', $prevseq, $textseq, PREG_OFFSET_CAPTURE);
831 831
 				$textseq[1][] = array('', strlen($prevseq));
832 832
 				$txtoffset = 0;
833
-				foreach($textseq[1] as $txtseq) {
833
+				foreach ($textseq[1] as $txtseq) {
834 834
 					$txtseqlen = strlen($txtseq[0]);
835 835
 					if ($txtseq[1] > 0) {
836 836
 						// extract byte sequence before the text sequence
@@ -870,9 +870,9 @@  discard block
 block discarded – undo
870 870
 	 * @return array of codewords
871 871
 	 * @protected
872 872
 	 */
873
-	protected function getCompaction($mode, $code, $addmode=true) {
873
+	protected function getCompaction($mode, $code, $addmode = true) {
874 874
 		$cw = array(); // array of codewords to return
875
-		switch($mode) {
875
+		switch ($mode) {
876 876
 			case 900: { // Text Compaction mode latch
877 877
 				$submode = 0; // default Alpha sub-mode
878 878
 				$txtarr = array(); // array of characters and sub-mode switching characters
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 									}
900 900
 								} else {
901 901
 									// latch
902
-									$txtarr	= array_merge($txtarr, $this->textlatch[''.$submode.$s]);
902
+									$txtarr = array_merge($txtarr, $this->textlatch[''.$submode.$s]);
903 903
 									// set new submode
904 904
 									$submode = $s;
905 905
 								}
Please login to merge, or discard this patch.
Upper-Lower-Casing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 	 */
532 532
 	public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
533 533
 		$barcode_array = array();
534
-		if ((is_null($code)) OR ($code == '\0') OR ($code == '')) {
534
+		if ((is_null($code)) or ($code == '\0') or ($code == '')) {
535 535
 			return false;
536 536
 		}
537 537
 		// get the input sequence array
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
 		$rows = ceil($nce / $cols);
602 602
 		$size = ($cols * $rows);
603 603
 		// adjust rows
604
-		if (($rows < 3) OR ($rows > 90)) {
604
+		if (($rows < 3) or ($rows > 90)) {
605 605
 			if ($rows < 3) {
606 606
 				$rows = 3;
607 607
 			} elseif ($rows > 90) {
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
 	protected function getErrorCorrectionLevel($ecl, $numcw) {
743 743
 		$maxecl = 8; // starting error level
744 744
 		// check for automatic levels
745
-		if (($ecl < 0) OR ($ecl > 8)) {
745
+		if (($ecl < 0) or ($ecl > 8)) {
746 746
 			if ($numcw < 41) {
747 747
 				$ecl = 2;
748 748
 			} elseif ($numcw < 161) {
@@ -837,7 +837,7 @@  discard block
 block discarded – undo
837 837
 						$prevtxtseq = substr($prevseq, $txtoffset, ($txtseq[1] - $txtoffset));
838 838
 						if (strlen($prevtxtseq) > 0) {
839 839
 							// add BYTE sequence
840
-							if ((strlen($prevtxtseq) == 1) AND ((count($sequence_array) > 0) AND ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
840
+							if ((strlen($prevtxtseq) == 1) and ((count($sequence_array) > 0) and ($sequence_array[(count($sequence_array) - 1)][0] == 900))) {
841 841
 								$sequence_array[] = array(913, $prevtxtseq);
842 842
 							} elseif ((strlen($prevtxtseq) % 6) == 0) {
843 843
 								$sequence_array[] = array(924, $prevtxtseq);
@@ -886,9 +886,9 @@  discard block
 block discarded – undo
886 886
 						// the sub-mode is changed
887 887
 						for ($s = 0; $s < 4; ++$s) {
888 888
 							// search new sub-mode
889
-							if (($s != $submode) AND (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) {
889
+							if (($s != $submode) and (($k = array_search($chval, $this->textsubmodes[$s])) !== false)) {
890 890
 								// $s is the new submode
891
-								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)))) {
891
+								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)))) {
892 892
 									// shift (temporary change only for this char)
893 893
 									if ($s == 3) {
894 894
 										// shift to puntuaction
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php 2 patches
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	 * @since 5.9.123 (2010-09-30)
70 70
 	 * @public static
71 71
 	 */
72
-	public static function addTTFfont($fontfile, $fonttype='', $enc='', $flags=32, $outpath='', $platid=3, $encid=1, $addcbbox=false, $link=false) {
72
+	public static function addTTFfont($fontfile, $fonttype = '', $enc = '', $flags = 32, $outpath = '', $platid = 3, $encid = 1, $addcbbox = false, $link = false) {
73 73
 		if (!TCPDF_STATIC::file_exists($fontfile)) {
74 74
 			// Could not find file
75 75
 			return false;
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 			fclose($fp);
192 192
 			// get font info
193 193
 			$fmetric['Flags'] = $flags;
194
-			preg_match ('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
194
+			preg_match('#/FullName[\s]*\(([^\)]*)#', $font, $matches);
195 195
 			$fmetric['name'] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $matches[1]);
196 196
 			preg_match('#/FontBBox[\s]*{([^}]*)#', $font, $matches);
197 197
 			$fmetric['bbox'] = trim($matches[1]);
@@ -720,7 +720,7 @@  discard block
 block discarded – undo
720 720
 										// convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
721 721
 										//LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
722 722
 										//SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
723
-										$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
723
+										$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) - 56613888;
724 724
 									}
725 725
 									$ctg[$c] = 0;
726 726
 									++$startGlyphID;
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
 			// ceate widths array
792 792
 			$cw = array();
793 793
 			$offset = $table['hmtx']['offset'];
794
-			for ($i = 0 ; $i < $numberOfHMetrics; ++$i) {
794
+			for ($i = 0; $i < $numberOfHMetrics; ++$i) {
795 795
 				$cw[$i] = round(TCPDF_STATIC::_getUFWORD($font, $offset) * $urk);
796 796
 				$offset += 4; // skip lsb
797 797
 			}
@@ -1194,7 +1194,7 @@  discard block
 block discarded – undo
1194 1194
 								// convert to decimal (http://www.unicode.org/faq//utf_bom.html#utf16-4)
1195 1195
 								//LEAD_OFFSET = (0xD800 - (0x10000 >> 10)) = 55232
1196 1196
 								//SURROGATE_OFFSET = (0x10000 - (0xD800 << 10) - 0xDC00) = -56613888
1197
-								$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) -56613888;
1197
+								$c = ((55232 + ($k >> 10)) << 10) + (0xDC00 + ($k & 0x3FF)) - 56613888;
1198 1198
 							}
1199 1199
 							if (isset($subsetchars[$c])) {
1200 1200
 								$subsetglyphs[$startGlyphID] = true;
@@ -1313,7 +1313,7 @@  discard block
 block discarded – undo
1313 1313
 		}
1314 1314
 		// array of table names to preserve (loca and glyf tables will be added later)
1315 1315
 		// the cmap table is not needed and shall not be present, since the mapping from character codes to glyph descriptions is provided separately
1316
-		$table_names = array ('head', 'hhea', 'hmtx', 'maxp', 'cvt ', 'fpgm', 'prep'); // minimum required table names
1316
+		$table_names = array('head', 'hhea', 'hmtx', 'maxp', 'cvt ', 'fpgm', 'prep'); // minimum required table names
1317 1317
 		// get the tables to preserve
1318 1318
 		$offset = 12;
1319 1319
 		foreach ($table as $tag => $val) {
@@ -1326,7 +1326,7 @@  discard block
 block discarded – undo
1326 1326
 				$table[$tag]['offset'] = $offset;
1327 1327
 				$offset += $table[$tag]['length'];
1328 1328
 				$numPad = ($offset + 3 & ~3) - $offset;
1329
-				if($numPad > 0) {
1329
+				if ($numPad > 0) {
1330 1330
 					$table[$tag]['data'] .= str_repeat("\x0", $numPad);
1331 1331
 					$offset += $numPad;
1332 1332
 				}
@@ -1343,7 +1343,7 @@  discard block
 block discarded – undo
1343 1343
 		$table['loca']['offset'] = $offset;
1344 1344
 		$offset += $table['loca']['length'];
1345 1345
 		$numPad = ($offset + 3 & ~3) - $offset;
1346
-		if($numPad > 0) {
1346
+		if ($numPad > 0) {
1347 1347
 			$table['loca']['data'] .= str_repeat("\x0", $numPad);
1348 1348
 			$offset += $numPad;
1349 1349
 		}
@@ -1355,7 +1355,7 @@  discard block
 block discarded – undo
1355 1355
 		$table['glyf']['offset'] = $offset;
1356 1356
 		$offset += $table['glyf']['length'];
1357 1357
 		$numPad = ($offset + 3 & ~3) - $offset;
1358
-		if($numPad > 0) {
1358
+		if ($numPad > 0) {
1359 1359
 			$table['glyf']['data'] .= str_repeat("\x0", $numPad);
1360 1360
 			$offset += $numPad;
1361 1361
 		}
@@ -1396,7 +1396,7 @@  discard block
 block discarded – undo
1396 1396
 	 * @since 4.4.000 (2008-12-07)
1397 1397
 	 * @public static
1398 1398
 	 */
1399
-	public static function _putfontwidths($font, $cidoffset=0) {
1399
+	public static function _putfontwidths($font, $cidoffset = 0) {
1400 1400
 		ksort($font['cw']);
1401 1401
 		$rangeid = 0;
1402 1402
 		$range = array();
@@ -1542,7 +1542,7 @@  discard block
 block discarded – undo
1542 1542
 	 * @since 6.0.025
1543 1543
 	 * @public static
1544 1544
 	 */
1545
-	public static function getFontFullPath($file, $fontdir=false) {
1545
+	public static function getFontFullPath($file, $fontdir = false) {
1546 1546
 		$fontfile = '';
1547 1547
 		// search files on various directories
1548 1548
 		if (($fontdir !== false) AND @TCPDF_STATIC::file_exists($fontdir.$file)) {
@@ -1565,7 +1565,7 @@  discard block
 block discarded – undo
1565 1565
 	 * @return float value in points
1566 1566
 	 * @public static
1567 1567
 	 */
1568
-	public static function getFontRefSize($size, $refsize=12) {
1568
+	public static function getFontRefSize($size, $refsize = 12) {
1569 1569
 		switch ($size) {
1570 1570
 			case 'xx-small': {
1571 1571
 				$size = ($refsize - 4);
@@ -1665,7 +1665,7 @@  discard block
 block discarded – undo
1665 1665
 	 * @since 2.3.000 (2008-03-05)
1666 1666
 	 * @public static
1667 1667
 	 */
1668
-	public static function unichr($c, $unicode=true) {
1668
+	public static function unichr($c, $unicode = true) {
1669 1669
 		$c = intval($c);
1670 1670
 		if (!$unicode) {
1671 1671
 			return chr($c);
@@ -1744,7 +1744,7 @@  discard block
 block discarded – undo
1744 1744
 	 * @since 2.1.000 (2008-01-08)
1745 1745
 	 * @public static
1746 1746
 	 */
1747
-	public static function arrUTF8ToUTF16BE($unicode, $setbom=false) {
1747
+	public static function arrUTF8ToUTF16BE($unicode, $setbom = false) {
1748 1748
 		$outstr = ''; // string to be returned
1749 1749
 		if ($setbom) {
1750 1750
 			$outstr .= "\xFE\xFF"; // Byte Order Mark (BOM)
@@ -1778,7 +1778,7 @@  discard block
 block discarded – undo
1778 1778
 	 * @since 4.5.037 (2009-04-07)
1779 1779
 	 * @public static
1780 1780
 	 */
1781
-	public static function UTF8ArrayToUniArray($ta, $isunicode=true) {
1781
+	public static function UTF8ArrayToUniArray($ta, $isunicode = true) {
1782 1782
 		if ($isunicode) {
1783 1783
 			return array_map(get_called_class().'::unichrUnicode', $ta);
1784 1784
 		}
@@ -1794,7 +1794,7 @@  discard block
 block discarded – undo
1794 1794
 	 * @return string Return part of a string
1795 1795
 	 * @public static
1796 1796
 	 */
1797
-	public static function UTF8ArrSubString($strarr, $start='', $end='', $unicode=true) {
1797
+	public static function UTF8ArrSubString($strarr, $start = '', $end = '', $unicode = true) {
1798 1798
 		if (strlen($start) == 0) {
1799 1799
 			$start = 0;
1800 1800
 		}
@@ -1817,7 +1817,7 @@  discard block
 block discarded – undo
1817 1817
 	 * @since 4.5.037 (2009-04-07)
1818 1818
 	 * @public static
1819 1819
 	 */
1820
-	public static function UniArrSubString($uniarr, $start='', $end='') {
1820
+	public static function UniArrSubString($uniarr, $start = '', $end = '') {
1821 1821
 		if (strlen($start) == 0) {
1822 1822
 			$start = 0;
1823 1823
 		}
@@ -1825,7 +1825,7 @@  discard block
 block discarded – undo
1825 1825
 			$end = count($uniarr);
1826 1826
 		}
1827 1827
 		$string = '';
1828
-		for ($i=$start; $i < $end; ++$i) {
1828
+		for ($i = $start; $i < $end; ++$i) {
1829 1829
 			$string .= $uniarr[$i];
1830 1830
 		}
1831 1831
 		return $string;
@@ -2001,7 +2001,7 @@  discard block
 block discarded – undo
2001 2001
 		$str = is_null($str) ? '' : $str;
2002 2002
 		if ($isunicode) {
2003 2003
 			// requires PCRE unicode support turned on
2004
-			$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
2004
+			$chars = TCPDF_STATIC::pregSplit('//', 'u', $str, -1, PREG_SPLIT_NO_EMPTY);
2005 2005
 			$carr = array_map(get_called_class().'::uniord', $chars);
2006 2006
 		} else {
2007 2007
 			$chars = str_split($str);
@@ -2123,7 +2123,7 @@  discard block
 block discarded – undo
2123 2123
 		} else {
2124 2124
 			// P2. In each paragraph, find the first character of type L, AL, or R.
2125 2125
 			// 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.
2126
-			for ($i=0; $i < $numchars; ++$i) {
2126
+			for ($i = 0; $i < $numchars; ++$i) {
2127 2127
 				$type = TCPDF_FONT_DATA::$uni_type[$ta[$i]];
2128 2128
 				if ($type == 'L') {
2129 2129
 					$pel = 0;
@@ -2149,7 +2149,7 @@  discard block
 block discarded – undo
2149 2149
 
2150 2150
 		// 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.
2151 2151
 		// In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
2152
-		for ($i=0; $i < $numchars; ++$i) {
2152
+		for ($i = 0; $i < $numchars; ++$i) {
2153 2153
 			if ($ta[$i] == TCPDF_FONT_DATA::$uni_RLE) {
2154 2154
 				// X2. With each RLE, compute the least greater odd embedding level.
2155 2155
 				//	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 @@  discard block
 block discarded – undo
2167 2167
 				//	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.
2168 2168
 				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
2169 2169
 				$next_level = $cel + 2 - ($cel % 2);
2170
-				if ( $next_level < 62 ) {
2170
+				if ($next_level < 62) {
2171 2171
 					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_LRE, 'cel' => $cel, 'dos' => $dos);
2172 2172
 					$cel = $next_level;
2173 2173
 					$dos = 'N';
@@ -2191,7 +2191,7 @@  discard block
 block discarded – undo
2191 2191
 				//	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.
2192 2192
 				//	b. If the new level would not be valid, then this code is invalid. Do not change the current level or override status.
2193 2193
 				$next_level = $cel + 2 - ($cel % 2);
2194
-				if ( $next_level < 62 ) {
2194
+				if ($next_level < 62) {
2195 2195
 					$remember[] = array('num' => TCPDF_FONT_DATA::$uni_LRO, 'cel' => $cel, 'dos' => $dos);
2196 2196
 					$cel = $next_level;
2197 2197
 					$dos = 'L';
@@ -2201,7 +2201,7 @@  discard block
 block discarded – undo
2201 2201
 			} elseif ($ta[$i] == TCPDF_FONT_DATA::$uni_PDF) {
2202 2202
 				// 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.
2203 2203
 				if (count($remember)) {
2204
-					$last = count($remember ) - 1;
2204
+					$last = count($remember) - 1;
2205 2205
 					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) OR
2206 2206
 						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) OR
2207 2207
 						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) OR
@@ -2247,12 +2247,12 @@  discard block
 block discarded – undo
2247 2247
 		// 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.
2248 2248
 		$prevlevel = -1; // track level changes
2249 2249
 		$levcount = 0; // counts consecutive chars at the same level
2250
-		for ($i=0; $i < $numchars; ++$i) {
2250
+		for ($i = 0; $i < $numchars; ++$i) {
2251 2251
 			if ($chardata[$i]['type'] == 'NSM') {
2252 2252
 				if ($levcount) {
2253 2253
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
2254 2254
 				} elseif ($i > 0) {
2255
-					$chardata[$i]['type'] = $chardata[($i-1)]['type'];
2255
+					$chardata[$i]['type'] = $chardata[($i - 1)]['type'];
2256 2256
 				}
2257 2257
 			}
2258 2258
 			if ($chardata[$i]['level'] != $prevlevel) {
@@ -2266,9 +2266,9 @@  discard block
 block discarded – undo
2266 2266
 		// 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.
2267 2267
 		$prevlevel = -1;
2268 2268
 		$levcount = 0;
2269
-		for ($i=0; $i < $numchars; ++$i) {
2269
+		for ($i = 0; $i < $numchars; ++$i) {
2270 2270
 			if ($chardata[$i]['char'] == 'EN') {
2271
-				for ($j=$levcount; $j >= 0; $j--) {
2271
+				for ($j = $levcount; $j >= 0; $j--) {
2272 2272
 					if ($chardata[$j]['type'] == 'AL') {
2273 2273
 						$chardata[$i]['type'] = 'AN';
2274 2274
 					} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
@@ -2285,7 +2285,7 @@  discard block
 block discarded – undo
2285 2285
 		}
2286 2286
 
2287 2287
 		// W3. Change all ALs to R.
2288
-		for ($i=0; $i < $numchars; ++$i) {
2288
+		for ($i = 0; $i < $numchars; ++$i) {
2289 2289
 			if ($chardata[$i]['type'] == 'AL') {
2290 2290
 				$chardata[$i]['type'] = 'R';
2291 2291
 			}
@@ -2294,13 +2294,13 @@  discard block
 block discarded – undo
2294 2294
 		// 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.
2295 2295
 		$prevlevel = -1;
2296 2296
 		$levcount = 0;
2297
-		for ($i=0; $i < $numchars; ++$i) {
2298
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
2299
-				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
2297
+		for ($i = 0; $i < $numchars; ++$i) {
2298
+			if (($levcount > 0) AND (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] == $prevlevel)) {
2299
+				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i - 1)]['type'] == 'EN') AND ($chardata[($i + 1)]['type'] == 'EN')) {
2300 2300
 					$chardata[$i]['type'] = 'EN';
2301
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
2301
+				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i - 1)]['type'] == 'EN') AND ($chardata[($i + 1)]['type'] == 'EN')) {
2302 2302
 					$chardata[$i]['type'] = 'EN';
2303
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
2303
+				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i - 1)]['type'] == 'AN') AND ($chardata[($i + 1)]['type'] == 'AN')) {
2304 2304
 					$chardata[$i]['type'] = 'AN';
2305 2305
 				}
2306 2306
 			}
@@ -2315,12 +2315,12 @@  discard block
 block discarded – undo
2315 2315
 		// W5. A sequence of European terminators adjacent to European numbers changes to all European numbers.
2316 2316
 		$prevlevel = -1;
2317 2317
 		$levcount = 0;
2318
-		for ($i=0; $i < $numchars; ++$i) {
2318
+		for ($i = 0; $i < $numchars; ++$i) {
2319 2319
 			if ($chardata[$i]['type'] == 'ET') {
2320
-				if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
2320
+				if (($levcount > 0) AND ($chardata[($i - 1)]['type'] == 'EN')) {
2321 2321
 					$chardata[$i]['type'] = 'EN';
2322 2322
 				} else {
2323
-					$j = $i+1;
2323
+					$j = $i + 1;
2324 2324
 					while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
2325 2325
 						if ($chardata[$j]['type'] == 'EN') {
2326 2326
 							$chardata[$i]['type'] = 'EN';
@@ -2343,7 +2343,7 @@  discard block
 block discarded – undo
2343 2343
 		// W6. Otherwise, separators and terminators change to Other Neutral.
2344 2344
 		$prevlevel = -1;
2345 2345
 		$levcount = 0;
2346
-		for ($i=0; $i < $numchars; ++$i) {
2346
+		for ($i = 0; $i < $numchars; ++$i) {
2347 2347
 			if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
2348 2348
 				$chardata[$i]['type'] = 'ON';
2349 2349
 			}
@@ -2358,9 +2358,9 @@  discard block
 block discarded – undo
2358 2358
 		//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.
2359 2359
 		$prevlevel = -1;
2360 2360
 		$levcount = 0;
2361
-		for ($i=0; $i < $numchars; ++$i) {
2361
+		for ($i = 0; $i < $numchars; ++$i) {
2362 2362
 			if ($chardata[$i]['char'] == 'EN') {
2363
-				for ($j=$levcount; $j >= 0; $j--) {
2363
+				for ($j = $levcount; $j >= 0; $j--) {
2364 2364
 					if ($chardata[$j]['type'] == 'L') {
2365 2365
 						$chardata[$i]['type'] = 'L';
2366 2366
 					} elseif ($chardata[$j]['type'] == 'R') {
@@ -2379,36 +2379,36 @@  discard block
 block discarded – undo
2379 2379
 		// 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.
2380 2380
 		$prevlevel = -1;
2381 2381
 		$levcount = 0;
2382
-		for ($i=0; $i < $numchars; ++$i) {
2383
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
2384
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
2382
+		for ($i = 0; $i < $numchars; ++$i) {
2383
+			if (($levcount > 0) AND (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] == $prevlevel)) {
2384
+				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i - 1)]['type'] == 'L') AND ($chardata[($i + 1)]['type'] == 'L')) {
2385 2385
 					$chardata[$i]['type'] = 'L';
2386 2386
 				} elseif (($chardata[$i]['type'] == 'N') AND
2387
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
2388
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
2387
+				 (($chardata[($i - 1)]['type'] == 'R') OR ($chardata[($i - 1)]['type'] == 'EN') OR ($chardata[($i - 1)]['type'] == 'AN')) AND
2388
+				 (($chardata[($i + 1)]['type'] == 'R') OR ($chardata[($i + 1)]['type'] == 'EN') OR ($chardata[($i + 1)]['type'] == 'AN'))) {
2389 2389
 					$chardata[$i]['type'] = 'R';
2390 2390
 				} elseif ($chardata[$i]['type'] == 'N') {
2391 2391
 					// N2. Any remaining neutrals take the embedding direction
2392 2392
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
2393 2393
 				}
2394
-			} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
2394
+			} elseif (($levcount == 0) AND (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] == $prevlevel)) {
2395 2395
 				// first char
2396
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
2396
+				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i + 1)]['type'] == 'L')) {
2397 2397
 					$chardata[$i]['type'] = 'L';
2398 2398
 				} elseif (($chardata[$i]['type'] == 'N') AND
2399 2399
 				 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
2400
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
2400
+				 (($chardata[($i + 1)]['type'] == 'R') OR ($chardata[($i + 1)]['type'] == 'EN') OR ($chardata[($i + 1)]['type'] == 'AN'))) {
2401 2401
 					$chardata[$i]['type'] = 'R';
2402 2402
 				} elseif ($chardata[$i]['type'] == 'N') {
2403 2403
 					// N2. Any remaining neutrals take the embedding direction
2404 2404
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
2405 2405
 				}
2406
-			} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
2406
+			} elseif (($levcount > 0) AND ((($i + 1) == $numchars) OR (($i + 1) < $numchars) AND ($chardata[($i + 1)]['level'] != $prevlevel))) {
2407 2407
 				//last char
2408
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
2408
+				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i - 1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
2409 2409
 					$chardata[$i]['type'] = 'L';
2410 2410
 				} elseif (($chardata[$i]['type'] == 'N') AND
2411
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
2411
+				 (($chardata[($i - 1)]['type'] == 'R') OR ($chardata[($i - 1)]['type'] == 'EN') OR ($chardata[($i - 1)]['type'] == 'AN')) AND
2412 2412
 				 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
2413 2413
 					$chardata[$i]['type'] = 'R';
2414 2414
 				} elseif ($chardata[$i]['type'] == 'N') {
@@ -2429,7 +2429,7 @@  discard block
 block discarded – undo
2429 2429
 
2430 2430
 		// 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.
2431 2431
 		// I2. For all characters with an odd (right-to-left) embedding direction, those of type L, EN or AN go up one level.
2432
-		for ($i=0; $i < $numchars; ++$i) {
2432
+		for ($i = 0; $i < $numchars; ++$i) {
2433 2433
 			$odd = $chardata[$i]['level'] % 2;
2434 2434
 			if ($odd) {
2435 2435
 				if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
@@ -2442,7 +2442,7 @@  discard block
 block discarded – undo
2442 2442
 					$chardata[$i]['level'] += 2;
2443 2443
 				}
2444 2444
 			}
2445
-			$maxlevel = max($chardata[$i]['level'],$maxlevel);
2445
+			$maxlevel = max($chardata[$i]['level'], $maxlevel);
2446 2446
 		}
2447 2447
 
2448 2448
 		// L1. On each line, reset the embedding level of the following characters to the paragraph embedding level:
@@ -2450,14 +2450,14 @@  discard block
 block discarded – undo
2450 2450
 		//	2. Paragraph separators,
2451 2451
 		//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
2452 2452
 		//	4. Any sequence of white space characters at the end of the line.
2453
-		for ($i=0; $i < $numchars; ++$i) {
2453
+		for ($i = 0; $i < $numchars; ++$i) {
2454 2454
 			if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
2455 2455
 				$chardata[$i]['level'] = $pel;
2456 2456
 			} elseif ($chardata[$i]['type'] == 'WS') {
2457
-				$j = $i+1;
2457
+				$j = $i + 1;
2458 2458
 				while ($j < $numchars) {
2459 2459
 					if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
2460
-						(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
2460
+						(($j == ($numchars - 1)) AND ($chardata[$j]['type'] == 'WS'))) {
2461 2461
 						$chardata[$i]['level'] = $pel;
2462 2462
 						break;
2463 2463
 					} elseif ($chardata[$j]['type'] != 'WS') {
@@ -2471,13 +2471,13 @@  discard block
 block discarded – undo
2471 2471
 		// Arabic Shaping
2472 2472
 		// 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.
2473 2473
 		if ($arabic) {
2474
-			$endedletter = array(1569,1570,1571,1572,1573,1575,1577,1583,1584,1585,1586,1608,1688);
2475
-			$alfletter = array(1570,1571,1573,1575);
2474
+			$endedletter = array(1569, 1570, 1571, 1572, 1573, 1575, 1577, 1583, 1584, 1585, 1586, 1608, 1688);
2475
+			$alfletter = array(1570, 1571, 1573, 1575);
2476 2476
 			$chardata2 = $chardata;
2477 2477
 			$laaletter = false;
2478 2478
 			$charAL = array();
2479 2479
 			$x = 0;
2480
-			for ($i=0; $i < $numchars; ++$i) {
2480
+			for ($i = 0; $i < $numchars; ++$i) {
2481 2481
 				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
2482 2482
 					$charAL[$x] = $chardata[$i];
2483 2483
 					$charAL[$x]['i'] = $i;
@@ -2486,27 +2486,27 @@  discard block
 block discarded – undo
2486 2486
 				}
2487 2487
 			}
2488 2488
 			$numAL = $x;
2489
-			for ($i=0; $i < $numchars; ++$i) {
2489
+			for ($i = 0; $i < $numchars; ++$i) {
2490 2490
 				$thischar = $chardata[$i];
2491 2491
 				if ($i > 0) {
2492
-					$prevchar = $chardata[($i-1)];
2492
+					$prevchar = $chardata[($i - 1)];
2493 2493
 				} else {
2494 2494
 					$prevchar = false;
2495 2495
 				}
2496
-				if (($i+1) < $numchars) {
2497
-					$nextchar = $chardata[($i+1)];
2496
+				if (($i + 1) < $numchars) {
2497
+					$nextchar = $chardata[($i + 1)];
2498 2498
 				} else {
2499 2499
 					$nextchar = false;
2500 2500
 				}
2501 2501
 				if (TCPDF_FONT_DATA::$uni_type[$thischar['char']] == 'AL') {
2502 2502
 					$x = $thischar['x'];
2503 2503
 					if ($x > 0) {
2504
-						$prevchar = $charAL[($x-1)];
2504
+						$prevchar = $charAL[($x - 1)];
2505 2505
 					} else {
2506 2506
 						$prevchar = false;
2507 2507
 					}
2508
-					if (($x+1) < $numAL) {
2509
-						$nextchar = $charAL[($x+1)];
2508
+					if (($x + 1) < $numAL) {
2509
+						$nextchar = $charAL[($x + 1)];
2510 2510
 					} else {
2511 2511
 						$nextchar = false;
2512 2512
 					}
@@ -2515,7 +2515,7 @@  discard block
 block discarded – undo
2515 2515
 						$arabicarr = TCPDF_FONT_DATA::$uni_laa_array;
2516 2516
 						$laaletter = true;
2517 2517
 						if ($x > 1) {
2518
-							$prevchar = $charAL[($x-2)];
2518
+							$prevchar = $charAL[($x - 2)];
2519 2519
 						} else {
2520 2520
 							$prevchar = false;
2521 2521
 						}
@@ -2554,12 +2554,12 @@  discard block
 block discarded – undo
2554 2554
 						(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
2555 2555
 						// final
2556 2556
 						if (($i > 1) AND ($thischar['char'] == 1607) AND
2557
-							($chardata[$i-1]['char'] == 1604) AND
2558
-							($chardata[$i-2]['char'] == 1604)) {
2557
+							($chardata[$i - 1]['char'] == 1604) AND
2558
+							($chardata[$i - 2]['char'] == 1604)) {
2559 2559
 							//Allah Word
2560 2560
 							// mark characters to delete with false
2561
-							$chardata2[$i-2]['char'] = false;
2562
-							$chardata2[$i-1]['char'] = false;
2561
+							$chardata2[$i - 2]['char'] = false;
2562
+							$chardata2[$i - 1]['char'] = false;
2563 2563
 							$chardata2[$i]['char'] = 65010;
2564 2564
 						} else {
2565 2565
 							if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
@@ -2581,7 +2581,7 @@  discard block
 block discarded – undo
2581 2581
 					// if laa letter
2582 2582
 					if ($laaletter) {
2583 2583
 						// mark characters to delete with false
2584
-						$chardata2[($charAL[($x-1)]['i'])]['char'] = false;
2584
+						$chardata2[($charAL[($x - 1)]['i'])]['char'] = false;
2585 2585
 					}
2586 2586
 				} // end if AL (Arabic Letter)
2587 2587
 			} // end for each char
@@ -2589,12 +2589,12 @@  discard block
 block discarded – undo
2589 2589
 			 * Combining characters that can occur with Arabic Shadda (0651 HEX, 1617 DEC) are replaced.
2590 2590
 			 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
2591 2591
 			 */
2592
-			for ($i = 0; $i < ($numchars-1); ++$i) {
2593
-				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
2592
+			for ($i = 0; $i < ($numchars - 1); ++$i) {
2593
+				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i + 1]['char'])]))) {
2594 2594
 					// check if the subtitution font is defined on current font
2595
-					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])])])) {
2595
+					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i + 1]['char'])])])) {
2596 2596
 						$chardata2[$i]['char'] = false;
2597
-						$chardata2[$i+1]['char'] = TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])];
2597
+						$chardata2[$i + 1]['char'] = TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i + 1]['char'])];
2598 2598
 					}
2599 2599
 				}
2600 2600
 			}
@@ -2613,11 +2613,11 @@  discard block
 block discarded – undo
2613 2613
 		}
2614 2614
 
2615 2615
 		// 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.
2616
-		for ($j=$maxlevel; $j > 0; $j--) {
2616
+		for ($j = $maxlevel; $j > 0; $j--) {
2617 2617
 			$ordarray = Array();
2618 2618
 			$revarr = Array();
2619 2619
 			$onlevel = false;
2620
-			for ($i=0; $i < $numchars; ++$i) {
2620
+			for ($i = 0; $i < $numchars; ++$i) {
2621 2621
 				if ($chardata[$i]['level'] >= $j) {
2622 2622
 					$onlevel = true;
2623 2623
 					if (isset(TCPDF_FONT_DATA::$uni_mirror[$chardata[$i]['char']])) {
Please login to merge, or discard this patch.
Upper-Lower-Casing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 			}
130 130
 			case 'Type1': {
131 131
 				$fmetric['type'] = 'Type1';
132
-				if (empty($enc) AND (($flags & 4) == 0)) {
132
+				if (empty($enc) and (($flags & 4) == 0)) {
133 133
 					$enc = 'cp1252';
134 134
 				}
135 135
 				break;
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 		// set encoding maps (if any)
148 148
 		$fmetric['enc'] = preg_replace('/[^A-Za-z0-9_\-]/', '', $enc);
149 149
 		$fmetric['diff'] = '';
150
-		if (($fmetric['type'] == 'TrueType') OR ($fmetric['type'] == 'Type1')) {
151
-			if (!empty($enc) AND ($enc != 'cp1252') AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
150
+		if (($fmetric['type'] == 'TrueType') or ($fmetric['type'] == 'Type1')) {
151
+			if (!empty($enc) and ($enc != 'cp1252') and isset(TCPDF_FONT_DATA::$encmap[$enc])) {
152 152
 				// build differences from reference encoding
153 153
 				$enc_ref = TCPDF_FONT_DATA::$encmap['cp1252'];
154 154
 				$enc_target = TCPDF_FONT_DATA::$encmap[$enc];
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 			// get charstring data
275 275
 			$eplain = substr($eplain, (strpos($eplain, '/CharStrings') + 1));
276 276
 			preg_match_all('#/([A-Za-z0-9\.]*)[\s][0-9]+[\s]RD[\s](.*)[\s]ND#sU', $eplain, $matches, PREG_SET_ORDER);
277
-			if (!empty($enc) AND isset(TCPDF_FONT_DATA::$encmap[$enc])) {
277
+			if (!empty($enc) and isset(TCPDF_FONT_DATA::$encmap[$enc])) {
278 278
 				$enc_map = TCPDF_FONT_DATA::$encmap[$enc];
279 279
 			} else {
280 280
 				$enc_map = false;
@@ -313,18 +313,18 @@  discard block
 block discarded – undo
313 313
 				while ($i < $clen) {
314 314
 					if ($ccom[$i] < 32) {
315 315
 						$cdec[$ck] = $ccom[$i];
316
-						if (($ck > 0) AND ($cdec[$ck] == 13)) {
316
+						if (($ck > 0) and ($cdec[$ck] == 13)) {
317 317
 							// hsbw command: update width
318 318
 							$cwidths[$cid] = $cdec[($ck - 1)];
319 319
 						}
320 320
 						++$i;
321
-					} elseif (($ccom[$i] >= 32) AND ($ccom[$i] <= 246)) {
321
+					} elseif (($ccom[$i] >= 32) and ($ccom[$i] <= 246)) {
322 322
 						$cdec[$ck] = ($ccom[$i] - 139);
323 323
 						++$i;
324
-					} elseif (($ccom[$i] >= 247) AND ($ccom[$i] <= 250)) {
324
+					} elseif (($ccom[$i] >= 247) and ($ccom[$i] <= 250)) {
325 325
 						$cdec[$ck] = ((($ccom[$i] - 247) * 256) + $ccom[($i + 1)] + 108);
326 326
 						$i += 2;
327
-					} elseif (($ccom[$i] >= 251) AND ($ccom[$i] <= 254)) {
327
+					} elseif (($ccom[$i] >= 251) and ($ccom[$i] <= 254)) {
328 328
 						$cdec[$ck] = ((-($ccom[$i] - 251) * 256) - $ccom[($i + 1)] - 108);
329 329
 						$i += 2;
330 330
 					} elseif ($ccom[$i] == 255) {
@@ -560,7 +560,7 @@  discard block
 block discarded – undo
560 560
 			$c = 0;
561 561
 			foreach ($encodingTables as $enctable) {
562 562
 				// get only specified Platform ID and Encoding ID
563
-				if (($enctable['platformID'] == $platid) AND ($enctable['encodingID'] == $encid)) {
563
+				if (($enctable['platformID'] == $platid) and ($enctable['encodingID'] == $encid)) {
564 564
 					$offset = $table['cmap']['offset'] + $enctable['offset'];
565 565
 					$format = TCPDF_STATIC::_getUSHORT($font, $offset);
566 566
 					$offset += 2;
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
 								$offset += 4;
714 714
 								for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
715 715
 									$is32idx = floor($c / 8);
716
-									if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
716
+									if ((isset($is32[$is32idx])) and (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
717 717
 										$c = $k;
718 718
 									} else {
719 719
 										// 32 bit format
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
 					if (isset($cw[$ctg[$cid]])) {
808 808
 						$fmetric['cw'] .= ','.$cid.'=>'.$cw[$ctg[$cid]];
809 809
 					}
810
-					if ($addcbbox AND isset($indexToLoc[$ctg[$cid]])) {
810
+					if ($addcbbox and isset($indexToLoc[$ctg[$cid]])) {
811 811
 						$offset = ($table['glyf']['offset'] + $indexToLoc[$ctg[$cid]]);
812 812
 						$xMin = round(TCPDF_STATIC::_getFWORD($font, $offset + 2) * $urk);
813 813
 						$yMin = round(TCPDF_STATIC::_getFWORD($font, $offset + 4) * $urk);
@@ -818,7 +818,7 @@  discard block
 block discarded – undo
818 818
 				}
819 819
 			}
820 820
 		} // end of true type
821
-		if (($fmetric['type'] == 'TrueTypeUnicode') AND (count($ctg) == 256)) {
821
+		if (($fmetric['type'] == 'TrueTypeUnicode') and (count($ctg) == 256)) {
822 822
 			$fmetric['type'] = 'TrueType';
823 823
 		}
824 824
 		// ---------- create php font file ----------
@@ -1187,7 +1187,7 @@  discard block
 block discarded – undo
1187 1187
 						$offset += 4;
1188 1188
 						for ($k = $startCharCode; $k <= $endCharCode; ++$k) {
1189 1189
 							$is32idx = floor($c / 8);
1190
-							if ((isset($is32[$is32idx])) AND (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
1190
+							if ((isset($is32[$is32idx])) and (($is32[$is32idx] & (1 << (7 - ($c % 8)))) == 0)) {
1191 1191
 								$c = $k;
1192 1192
 							} else {
1193 1193
 								// 32 bit format
@@ -1406,7 +1406,7 @@  discard block
 block discarded – undo
1406 1406
 		// for each character
1407 1407
 		foreach ($font['cw'] as $cid => $width) {
1408 1408
 			$cid -= $cidoffset;
1409
-			if ($font['subset'] AND (!isset($font['subsetchars'][$cid]))) {
1409
+			if ($font['subset'] and (!isset($font['subsetchars'][$cid]))) {
1410 1410
 				// ignore the unused characters (font subsetting)
1411 1411
 				continue;
1412 1412
 			}
@@ -1454,7 +1454,7 @@  discard block
 block discarded – undo
1454 1454
 		$prevint = false;
1455 1455
 		foreach ($range as $k => $ws) {
1456 1456
 			$cws = count($ws);
1457
-			if (($k == $nextk) AND (!$prevint) AND ((!isset($ws['interval'])) OR ($cws < 4))) {
1457
+			if (($k == $nextk) and (!$prevint) and ((!isset($ws['interval'])) or ($cws < 4))) {
1458 1458
 				if (isset($range[$k]['interval'])) {
1459 1459
 					unset($range[$k]['interval']);
1460 1460
 				}
@@ -1506,7 +1506,7 @@  discard block
 block discarded – undo
1506 1506
 	 * @public static
1507 1507
 	 */
1508 1508
 	public static function updateCIDtoGIDmap($map, $cid, $gid) {
1509
-		if (($cid >= 0) AND ($cid <= 0xFFFF) AND ($gid >= 0)) {
1509
+		if (($cid >= 0) and ($cid <= 0xFFFF) and ($gid >= 0)) {
1510 1510
 			if ($gid > 0xFFFF) {
1511 1511
 				$gid -= 0x10000;
1512 1512
 			}
@@ -1522,7 +1522,7 @@  discard block
 block discarded – undo
1522 1522
 	 * @public static
1523 1523
 	 */
1524 1524
 	public static function _getfontpath() {
1525
-		if (!defined('K_PATH_FONTS') AND is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
1525
+		if (!defined('K_PATH_FONTS') and is_dir($fdir = realpath(dirname(__FILE__).'/../fonts'))) {
1526 1526
 			if (substr($fdir, -1) != '/') {
1527 1527
 				$fdir .= '/';
1528 1528
 			}
@@ -1545,7 +1545,7 @@  discard block
 block discarded – undo
1545 1545
 	public static function getFontFullPath($file, $fontdir=false) {
1546 1546
 		$fontfile = '';
1547 1547
 		// search files on various directories
1548
-		if (($fontdir !== false) AND @TCPDF_STATIC::file_exists($fontdir.$file)) {
1548
+		if (($fontdir !== false) and @TCPDF_STATIC::file_exists($fontdir.$file)) {
1549 1549
 			$fontfile = $fontdir.$file;
1550 1550
 		} elseif (@TCPDF_STATIC::file_exists(self::_getfontpath().$file)) {
1551 1551
 			$fontfile = self::_getfontpath().$file;
@@ -1969,7 +1969,7 @@  discard block
 block discarded – undo
1969 1969
 					for ($j = 1; $j < $numbytes; ++$j) {
1970 1970
 						$char += ($bytes[$j] << (($numbytes - $j - 1) * 0x06));
1971 1971
 					}
1972
-					if ((($char >= 0xD800) AND ($char <= 0xDFFF)) OR ($char >= 0x10FFFF)) {
1972
+					if ((($char >= 0xD800) and ($char <= 0xDFFF)) or ($char >= 0x10FFFF)) {
1973 1973
 						// The definition of UTF-8 prohibits encoding character numbers between
1974 1974
 						// U+D800 and U+DFFF, which are reserved for use with the UTF-16
1975 1975
 						// encoding form (as surrogate pairs) and do not directly represent
@@ -2109,7 +2109,7 @@  discard block
 block discarded – undo
2109 2109
 			$arabic = false;
2110 2110
 		}
2111 2111
 		// check if string contains RTL text
2112
-		if (!($forcertl OR $arabic OR preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $str))) {
2112
+		if (!($forcertl or $arabic or preg_match(TCPDF_FONT_DATA::$uni_RE_PATTERN_RTL, $str))) {
2113 2113
 			return $ta;
2114 2114
 		}
2115 2115
 
@@ -2128,7 +2128,7 @@  discard block
 block discarded – undo
2128 2128
 				if ($type == 'L') {
2129 2129
 					$pel = 0;
2130 2130
 					break;
2131
-				} elseif (($type == 'AL') OR ($type == 'R')) {
2131
+				} elseif (($type == 'AL') or ($type == 'R')) {
2132 2132
 					$pel = 1;
2133 2133
 					break;
2134 2134
 				}
@@ -2145,7 +2145,7 @@  discard block
 block discarded – undo
2145 2145
 		$eor = $sor;
2146 2146
 
2147 2147
 		// Array of characters data
2148
-		$chardata = Array();
2148
+		$chardata = array();
2149 2149
 
2150 2150
 		// 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.
2151 2151
 		// In the resolution of levels in rules I1 and I2, the maximum embedding level of 62 can be reached.
@@ -2202,9 +2202,9 @@  discard block
 block discarded – undo
2202 2202
 				// 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.
2203 2203
 				if (count($remember)) {
2204 2204
 					$last = count($remember ) - 1;
2205
-					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) OR
2206
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) OR
2207
-						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) OR
2205
+					if (($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLE) or
2206
+						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRE) or
2207
+						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_RLO) or
2208 2208
 						($remember[$last]['num'] == TCPDF_FONT_DATA::$uni_LRO)) {
2209 2209
 						$match = array_pop($remember);
2210 2210
 						$cel = $match['cel'];
@@ -2213,10 +2213,10 @@  discard block
 block discarded – undo
2213 2213
 						$eor = ($cel > $match['cel'] ? $cel : $match['cel']) % 2 ? 'R' : 'L';
2214 2214
 					}
2215 2215
 				}
2216
-			} elseif (($ta[$i] != TCPDF_FONT_DATA::$uni_RLE) AND
2217
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRE) AND
2218
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_RLO) AND
2219
-							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRO) AND
2216
+			} elseif (($ta[$i] != TCPDF_FONT_DATA::$uni_RLE) and
2217
+							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRE) and
2218
+							 ($ta[$i] != TCPDF_FONT_DATA::$uni_RLO) and
2219
+							 ($ta[$i] != TCPDF_FONT_DATA::$uni_LRO) and
2220 2220
 							 ($ta[$i] != TCPDF_FONT_DATA::$uni_PDF)) {
2221 2221
 				// X6. For all types besides RLE, LRE, RLO, LRO, and PDF:
2222 2222
 				//	a. Set the level of the current character to the current embedding level.
@@ -2271,7 +2271,7 @@  discard block
 block discarded – undo
2271 2271
 				for ($j=$levcount; $j >= 0; $j--) {
2272 2272
 					if ($chardata[$j]['type'] == 'AL') {
2273 2273
 						$chardata[$i]['type'] = 'AN';
2274
-					} elseif (($chardata[$j]['type'] == 'L') OR ($chardata[$j]['type'] == 'R')) {
2274
+					} elseif (($chardata[$j]['type'] == 'L') or ($chardata[$j]['type'] == 'R')) {
2275 2275
 						break;
2276 2276
 					}
2277 2277
 				}
@@ -2295,12 +2295,12 @@  discard block
 block discarded – undo
2295 2295
 		$prevlevel = -1;
2296 2296
 		$levcount = 0;
2297 2297
 		for ($i=0; $i < $numchars; ++$i) {
2298
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
2299
-				if (($chardata[$i]['type'] == 'ES') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
2298
+			if (($levcount > 0) and (($i+1) < $numchars) and ($chardata[($i+1)]['level'] == $prevlevel)) {
2299
+				if (($chardata[$i]['type'] == 'ES') and ($chardata[($i-1)]['type'] == 'EN') and ($chardata[($i+1)]['type'] == 'EN')) {
2300 2300
 					$chardata[$i]['type'] = 'EN';
2301
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'EN') AND ($chardata[($i+1)]['type'] == 'EN')) {
2301
+				} elseif (($chardata[$i]['type'] == 'CS') and ($chardata[($i-1)]['type'] == 'EN') and ($chardata[($i+1)]['type'] == 'EN')) {
2302 2302
 					$chardata[$i]['type'] = 'EN';
2303
-				} elseif (($chardata[$i]['type'] == 'CS') AND ($chardata[($i-1)]['type'] == 'AN') AND ($chardata[($i+1)]['type'] == 'AN')) {
2303
+				} elseif (($chardata[$i]['type'] == 'CS') and ($chardata[($i-1)]['type'] == 'AN') and ($chardata[($i+1)]['type'] == 'AN')) {
2304 2304
 					$chardata[$i]['type'] = 'AN';
2305 2305
 				}
2306 2306
 			}
@@ -2317,11 +2317,11 @@  discard block
 block discarded – undo
2317 2317
 		$levcount = 0;
2318 2318
 		for ($i=0; $i < $numchars; ++$i) {
2319 2319
 			if ($chardata[$i]['type'] == 'ET') {
2320
-				if (($levcount > 0) AND ($chardata[($i-1)]['type'] == 'EN')) {
2320
+				if (($levcount > 0) and ($chardata[($i-1)]['type'] == 'EN')) {
2321 2321
 					$chardata[$i]['type'] = 'EN';
2322 2322
 				} else {
2323 2323
 					$j = $i+1;
2324
-					while (($j < $numchars) AND ($chardata[$j]['level'] == $prevlevel)) {
2324
+					while (($j < $numchars) and ($chardata[$j]['level'] == $prevlevel)) {
2325 2325
 						if ($chardata[$j]['type'] == 'EN') {
2326 2326
 							$chardata[$i]['type'] = 'EN';
2327 2327
 							break;
@@ -2344,7 +2344,7 @@  discard block
 block discarded – undo
2344 2344
 		$prevlevel = -1;
2345 2345
 		$levcount = 0;
2346 2346
 		for ($i=0; $i < $numchars; ++$i) {
2347
-			if (($chardata[$i]['type'] == 'ET') OR ($chardata[$i]['type'] == 'ES') OR ($chardata[$i]['type'] == 'CS')) {
2347
+			if (($chardata[$i]['type'] == 'ET') or ($chardata[$i]['type'] == 'ES') or ($chardata[$i]['type'] == 'CS')) {
2348 2348
 				$chardata[$i]['type'] = 'ON';
2349 2349
 			}
2350 2350
 			if ($chardata[$i]['level'] != $prevlevel) {
@@ -2380,36 +2380,36 @@  discard block
 block discarded – undo
2380 2380
 		$prevlevel = -1;
2381 2381
 		$levcount = 0;
2382 2382
 		for ($i=0; $i < $numchars; ++$i) {
2383
-			if (($levcount > 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
2384
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
2383
+			if (($levcount > 0) and (($i+1) < $numchars) and ($chardata[($i+1)]['level'] == $prevlevel)) {
2384
+				if (($chardata[$i]['type'] == 'N') and ($chardata[($i-1)]['type'] == 'L') and ($chardata[($i+1)]['type'] == 'L')) {
2385 2385
 					$chardata[$i]['type'] = 'L';
2386
-				} elseif (($chardata[$i]['type'] == 'N') AND
2387
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
2388
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
2386
+				} elseif (($chardata[$i]['type'] == 'N') and
2387
+				 (($chardata[($i-1)]['type'] == 'R') or ($chardata[($i-1)]['type'] == 'EN') or ($chardata[($i-1)]['type'] == 'AN')) and
2388
+				 (($chardata[($i+1)]['type'] == 'R') or ($chardata[($i+1)]['type'] == 'EN') or ($chardata[($i+1)]['type'] == 'AN'))) {
2389 2389
 					$chardata[$i]['type'] = 'R';
2390 2390
 				} elseif ($chardata[$i]['type'] == 'N') {
2391 2391
 					// N2. Any remaining neutrals take the embedding direction
2392 2392
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
2393 2393
 				}
2394
-			} elseif (($levcount == 0) AND (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] == $prevlevel)) {
2394
+			} elseif (($levcount == 0) and (($i+1) < $numchars) and ($chardata[($i+1)]['level'] == $prevlevel)) {
2395 2395
 				// first char
2396
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[$i]['sor'] == 'L') AND ($chardata[($i+1)]['type'] == 'L')) {
2396
+				if (($chardata[$i]['type'] == 'N') and ($chardata[$i]['sor'] == 'L') and ($chardata[($i+1)]['type'] == 'L')) {
2397 2397
 					$chardata[$i]['type'] = 'L';
2398
-				} elseif (($chardata[$i]['type'] == 'N') AND
2399
-				 (($chardata[$i]['sor'] == 'R') OR ($chardata[$i]['sor'] == 'EN') OR ($chardata[$i]['sor'] == 'AN')) AND
2400
-				 (($chardata[($i+1)]['type'] == 'R') OR ($chardata[($i+1)]['type'] == 'EN') OR ($chardata[($i+1)]['type'] == 'AN'))) {
2398
+				} elseif (($chardata[$i]['type'] == 'N') and
2399
+				 (($chardata[$i]['sor'] == 'R') or ($chardata[$i]['sor'] == 'EN') or ($chardata[$i]['sor'] == 'AN')) and
2400
+				 (($chardata[($i+1)]['type'] == 'R') or ($chardata[($i+1)]['type'] == 'EN') or ($chardata[($i+1)]['type'] == 'AN'))) {
2401 2401
 					$chardata[$i]['type'] = 'R';
2402 2402
 				} elseif ($chardata[$i]['type'] == 'N') {
2403 2403
 					// N2. Any remaining neutrals take the embedding direction
2404 2404
 					$chardata[$i]['type'] = $chardata[$i]['sor'];
2405 2405
 				}
2406
-			} elseif (($levcount > 0) AND ((($i+1) == $numchars) OR (($i+1) < $numchars) AND ($chardata[($i+1)]['level'] != $prevlevel))) {
2406
+			} elseif (($levcount > 0) and ((($i+1) == $numchars) or (($i+1) < $numchars) and ($chardata[($i+1)]['level'] != $prevlevel))) {
2407 2407
 				//last char
2408
-				if (($chardata[$i]['type'] == 'N') AND ($chardata[($i-1)]['type'] == 'L') AND ($chardata[$i]['eor'] == 'L')) {
2408
+				if (($chardata[$i]['type'] == 'N') and ($chardata[($i-1)]['type'] == 'L') and ($chardata[$i]['eor'] == 'L')) {
2409 2409
 					$chardata[$i]['type'] = 'L';
2410
-				} elseif (($chardata[$i]['type'] == 'N') AND
2411
-				 (($chardata[($i-1)]['type'] == 'R') OR ($chardata[($i-1)]['type'] == 'EN') OR ($chardata[($i-1)]['type'] == 'AN')) AND
2412
-				 (($chardata[$i]['eor'] == 'R') OR ($chardata[$i]['eor'] == 'EN') OR ($chardata[$i]['eor'] == 'AN'))) {
2410
+				} elseif (($chardata[$i]['type'] == 'N') and
2411
+				 (($chardata[($i-1)]['type'] == 'R') or ($chardata[($i-1)]['type'] == 'EN') or ($chardata[($i-1)]['type'] == 'AN')) and
2412
+				 (($chardata[$i]['eor'] == 'R') or ($chardata[$i]['eor'] == 'EN') or ($chardata[$i]['eor'] == 'AN'))) {
2413 2413
 					$chardata[$i]['type'] = 'R';
2414 2414
 				} elseif ($chardata[$i]['type'] == 'N') {
2415 2415
 					// N2. Any remaining neutrals take the embedding direction
@@ -2432,13 +2432,13 @@  discard block
 block discarded – undo
2432 2432
 		for ($i=0; $i < $numchars; ++$i) {
2433 2433
 			$odd = $chardata[$i]['level'] % 2;
2434 2434
 			if ($odd) {
2435
-				if (($chardata[$i]['type'] == 'L') OR ($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
2435
+				if (($chardata[$i]['type'] == 'L') or ($chardata[$i]['type'] == 'AN') or ($chardata[$i]['type'] == 'EN')) {
2436 2436
 					$chardata[$i]['level'] += 1;
2437 2437
 				}
2438 2438
 			} else {
2439 2439
 				if ($chardata[$i]['type'] == 'R') {
2440 2440
 					$chardata[$i]['level'] += 1;
2441
-				} elseif (($chardata[$i]['type'] == 'AN') OR ($chardata[$i]['type'] == 'EN')) {
2441
+				} elseif (($chardata[$i]['type'] == 'AN') or ($chardata[$i]['type'] == 'EN')) {
2442 2442
 					$chardata[$i]['level'] += 2;
2443 2443
 				}
2444 2444
 			}
@@ -2451,13 +2451,13 @@  discard block
 block discarded – undo
2451 2451
 		//	3. Any sequence of whitespace characters preceding a segment separator or paragraph separator, and
2452 2452
 		//	4. Any sequence of white space characters at the end of the line.
2453 2453
 		for ($i=0; $i < $numchars; ++$i) {
2454
-			if (($chardata[$i]['type'] == 'B') OR ($chardata[$i]['type'] == 'S')) {
2454
+			if (($chardata[$i]['type'] == 'B') or ($chardata[$i]['type'] == 'S')) {
2455 2455
 				$chardata[$i]['level'] = $pel;
2456 2456
 			} elseif ($chardata[$i]['type'] == 'WS') {
2457 2457
 				$j = $i+1;
2458 2458
 				while ($j < $numchars) {
2459
-					if ((($chardata[$j]['type'] == 'B') OR ($chardata[$j]['type'] == 'S')) OR
2460
-						(($j == ($numchars-1)) AND ($chardata[$j]['type'] == 'WS'))) {
2459
+					if ((($chardata[$j]['type'] == 'B') or ($chardata[$j]['type'] == 'S')) or
2460
+						(($j == ($numchars-1)) and ($chardata[$j]['type'] == 'WS'))) {
2461 2461
 						$chardata[$i]['level'] = $pel;
2462 2462
 						break;
2463 2463
 					} elseif ($chardata[$j]['type'] != 'WS') {
@@ -2478,7 +2478,7 @@  discard block
 block discarded – undo
2478 2478
 			$charAL = array();
2479 2479
 			$x = 0;
2480 2480
 			for ($i=0; $i < $numchars; ++$i) {
2481
-				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') OR ($chardata[$i]['char'] == 32) OR ($chardata[$i]['char'] == 8204)) {
2481
+				if ((TCPDF_FONT_DATA::$uni_type[$chardata[$i]['char']] == 'AL') or ($chardata[$i]['char'] == 32) or ($chardata[$i]['char'] == 8204)) {
2482 2482
 					$charAL[$x] = $chardata[$i];
2483 2483
 					$charAL[$x]['i'] = $i;
2484 2484
 					$chardata[$i]['x'] = $x;
@@ -2511,7 +2511,7 @@  discard block
 block discarded – undo
2511 2511
 						$nextchar = false;
2512 2512
 					}
2513 2513
 					// if laa letter
2514
-					if (($prevchar !== false) AND ($prevchar['char'] == 1604) AND (in_array($thischar['char'], $alfletter))) {
2514
+					if (($prevchar !== false) and ($prevchar['char'] == 1604) and (in_array($thischar['char'], $alfletter))) {
2515 2515
 						$arabicarr = TCPDF_FONT_DATA::$uni_laa_array;
2516 2516
 						$laaletter = true;
2517 2517
 						if ($x > 1) {
@@ -2523,11 +2523,11 @@  discard block
 block discarded – undo
2523 2523
 						$arabicarr = TCPDF_FONT_DATA::$uni_arabicsubst;
2524 2524
 						$laaletter = false;
2525 2525
 					}
2526
-					if (($prevchar !== false) AND ($nextchar !== false) AND
2527
-						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) AND
2528
-						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) AND
2529
-						($prevchar['type'] == $thischar['type']) AND
2530
-						($nextchar['type'] == $thischar['type']) AND
2526
+					if (($prevchar !== false) and ($nextchar !== false) and
2527
+						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) and
2528
+						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) and
2529
+						($prevchar['type'] == $thischar['type']) and
2530
+						($nextchar['type'] == $thischar['type']) and
2531 2531
 						($nextchar['char'] != 1567)) {
2532 2532
 						if (in_array($prevchar['char'], $endedletter)) {
2533 2533
 							if (isset($arabicarr[$thischar['char']][2])) {
@@ -2540,21 +2540,21 @@  discard block
 block discarded – undo
2540 2540
 								$chardata2[$i]['char'] = $arabicarr[$thischar['char']][3];
2541 2541
 							}
2542 2542
 						}
2543
-					} elseif (($nextchar !== false) AND
2544
-						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) AND
2545
-						($nextchar['type'] == $thischar['type']) AND
2543
+					} elseif (($nextchar !== false) and
2544
+						((TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$nextchar['char']] == 'NSM')) and
2545
+						($nextchar['type'] == $thischar['type']) and
2546 2546
 						($nextchar['char'] != 1567)) {
2547 2547
 						if (isset($arabicarr[$chardata[$i]['char']][2])) {
2548 2548
 							// initial
2549 2549
 							$chardata2[$i]['char'] = $arabicarr[$thischar['char']][2];
2550 2550
 						}
2551
-					} elseif ((($prevchar !== false) AND
2552
-						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') OR (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) AND
2553
-						($prevchar['type'] == $thischar['type'])) OR
2554
-						(($nextchar !== false) AND ($nextchar['char'] == 1567))) {
2551
+					} elseif ((($prevchar !== false) and
2552
+						((TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'AL') or (TCPDF_FONT_DATA::$uni_type[$prevchar['char']] == 'NSM')) and
2553
+						($prevchar['type'] == $thischar['type'])) or
2554
+						(($nextchar !== false) and ($nextchar['char'] == 1567))) {
2555 2555
 						// final
2556
-						if (($i > 1) AND ($thischar['char'] == 1607) AND
2557
-							($chardata[$i-1]['char'] == 1604) AND
2556
+						if (($i > 1) and ($thischar['char'] == 1607) and
2557
+							($chardata[$i-1]['char'] == 1604) and
2558 2558
 							($chardata[$i-2]['char'] == 1604)) {
2559 2559
 							//Allah Word
2560 2560
 							// mark characters to delete with false
@@ -2562,7 +2562,7 @@  discard block
 block discarded – undo
2562 2562
 							$chardata2[$i-1]['char'] = false;
2563 2563
 							$chardata2[$i]['char'] = 65010;
2564 2564
 						} else {
2565
-							if (($prevchar !== false) AND in_array($prevchar['char'], $endedletter)) {
2565
+							if (($prevchar !== false) and in_array($prevchar['char'], $endedletter)) {
2566 2566
 								if (isset($arabicarr[$thischar['char']][0])) {
2567 2567
 									// isolated
2568 2568
 									$chardata2[$i]['char'] = $arabicarr[$thischar['char']][0];
@@ -2590,7 +2590,7 @@  discard block
 block discarded – undo
2590 2590
 			 * Putting the combining mark and shadda in the same glyph allows us to avoid the two marks overlapping each other in an illegible manner.
2591 2591
 			 */
2592 2592
 			for ($i = 0; $i < ($numchars-1); ++$i) {
2593
-				if (($chardata2[$i]['char'] == 1617) AND (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
2593
+				if (($chardata2[$i]['char'] == 1617) and (isset(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])]))) {
2594 2594
 					// check if the subtitution font is defined on current font
2595 2595
 					if (isset($currentfont['cw'][(TCPDF_FONT_DATA::$uni_diacritics[($chardata2[$i+1]['char'])])])) {
2596 2596
 						$chardata2[$i]['char'] = false;
@@ -2614,8 +2614,8 @@  discard block
 block discarded – undo
2614 2614
 
2615 2615
 		// 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.
2616 2616
 		for ($j=$maxlevel; $j > 0; $j--) {
2617
-			$ordarray = Array();
2618
-			$revarr = Array();
2617
+			$ordarray = array();
2618
+			$revarr = array();
2619 2619
 			$onlevel = false;
2620 2620
 			for ($i=0; $i < $numchars; ++$i) {
2621 2621
 				if ($chardata[$i]['level'] >= $j) {
@@ -2629,7 +2629,7 @@  discard block
 block discarded – undo
2629 2629
 					if ($onlevel) {
2630 2630
 						$revarr = array_reverse($revarr);
2631 2631
 						$ordarray = array_merge($ordarray, $revarr);
2632
-						$revarr = Array();
2632
+						$revarr = array();
2633 2633
 						$onlevel = false;
2634 2634
 					}
2635 2635
 					$ordarray[] = $chardata[$i];
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/tcpdf_colors.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	 * Array of WEB safe colors
52 52
 	 * @public static
53 53
 	 */
54
-	public static $webcolor = array (
54
+	public static $webcolor = array(
55 55
 		'aliceblue' => 'f0f8ff',
56 56
 		'antiquewhite' => 'faebd7',
57 57
 		'aqua' => '00ffff',
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 	 * Array of valid JavaScript color names
208 208
 	 * @public static
209 209
 	 */
210
-	public static $jscolor = array ('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
210
+	public static $jscolor = array('transparent', 'black', 'white', 'red', 'green', 'blue', 'cyan', 'magenta', 'yellow', 'dkGray', 'gray', 'ltGray');
211 211
 
212 212
 	/**
213 213
 	 * Array of Spot colors (C,M,Y,K,name)
@@ -216,22 +216,22 @@  discard block
 block discarded – undo
216 216
 	 * Common industry standard spot colors are: ANPA-COLOR, DIC, FOCOLTONE, GCMI, HKS, PANTONE, TOYO, TRUMATCH.
217 217
 	 * @public static
218 218
 	 */
219
-	public static $spotcolor = array (
219
+	public static $spotcolor = array(
220 220
 		// special registration colors
221
-		'none'    => array(  0,   0,   0,   0, 'None'),
221
+		'none'    => array(0, 0, 0, 0, 'None'),
222 222
 		'all'     => array(100, 100, 100, 100, 'All'),
223 223
 		// standard CMYK colors
224
-		'cyan'    => array(100,   0,   0,   0, 'Cyan'),
225
-		'magenta' => array(  0, 100,   0,   0, 'Magenta'),
226
-		'yellow'  => array(  0,   0, 100,   0, 'Yellow'),
227
-		'key'     => array(  0,   0,   0, 100, 'Key'),
224
+		'cyan'    => array(100, 0, 0, 0, 'Cyan'),
225
+		'magenta' => array(0, 100, 0, 0, 'Magenta'),
226
+		'yellow'  => array(0, 0, 100, 0, 'Yellow'),
227
+		'key'     => array(0, 0, 0, 100, 'Key'),
228 228
 		// alias
229
-		'white'   => array(  0,   0,   0,   0, 'White'),
230
-		'black'   => array(  0,   0,   0, 100, 'Black'),
229
+		'white'   => array(0, 0, 0, 0, 'White'),
230
+		'black'   => array(0, 0, 0, 100, 'Black'),
231 231
 		// standard RGB colors
232
-		'red'     => array(  0, 100, 100,   0, 'Red'),
233
-		'green'   => array(100,   0, 100,   0, 'Green'),
234
-		'blue'    => array(100, 100,   0,   0, 'Blue'),
232
+		'red'     => array(0, 100, 100, 0, 'Red'),
233
+		'green'   => array(100, 0, 100, 0, 'Green'),
234
+		'blue'    => array(100, 100, 0, 0, 'Blue'),
235 235
 		// Add here standard spot colors or dynamically define them with AddSpotColor()
236 236
 		// ...
237 237
 	); // end of spot colors
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 * @return array|false RGB or CMYK color, or false in case of error.
271 271
 	 * @public static
272 272
 	 */
273
-	public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'=>128,'G'=>128,'B'=>128)) {
273
+	public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol = array('R'=>128, 'G'=>128, 'B'=>128)) {
274 274
 		$color = preg_replace('/[\s]*/', '', $hcolor); // remove extra spaces
275 275
 		$color = strtolower($color);
276 276
 		// check for javascript color array syntax
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php 3 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 		if ($headers === false) {
141 141
 			return false;
142 142
 		}
143
-    	return (strpos($headers[0], '200') !== false);
143
+		return (strpos($headers[0], '200') !== false);
144 144
 	}
145 145
 
146 146
 	/**
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
278 278
 	}
279 279
 
280 280
 	/**
281
-	* Escape some special characters (&lt; &gt; &amp;) for XML output.
282
-	* @param string $str Input string to convert.
283
-	* @return string converted string
284
-	* @since 5.9.121 (2011-09-28)
281
+	 * Escape some special characters (&lt; &gt; &amp;) for XML output.
282
+	 * @param string $str Input string to convert.
283
+	 * @return string converted string
284
+	 * @since 5.9.121 (2011-09-28)
285 285
 	 * @public static
286 286
 	 */
287 287
 	public static function _escapeXML($str) {
@@ -1841,7 +1841,7 @@  discard block
 block discarded – undo
1841 1841
 		curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
1842 1842
 		curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
1843 1843
 		if (defined('CURLOPT_PROTOCOLS')) {
1844
-		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
1844
+			curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
1845 1845
 		}
1846 1846
 		curl_exec($crs);
1847 1847
 		$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
@@ -1901,20 +1901,20 @@  discard block
 block discarded – undo
1901 1901
 		$alt = array($file);
1902 1902
 		//
1903 1903
 		if ((strlen($file) > 1)
1904
-		    && ($file[0] === '/')
1905
-		    && ($file[1] !== '/')
1906
-		    && !empty($_SERVER['DOCUMENT_ROOT'])
1907
-		    && ($_SERVER['DOCUMENT_ROOT'] !== '/')
1904
+			&& ($file[0] === '/')
1905
+			&& ($file[1] !== '/')
1906
+			&& !empty($_SERVER['DOCUMENT_ROOT'])
1907
+			&& ($_SERVER['DOCUMENT_ROOT'] !== '/')
1908 1908
 		) {
1909
-		    $findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
1910
-		    if (($findroot === false) || ($findroot > 1)) {
1909
+			$findroot = strpos($file, $_SERVER['DOCUMENT_ROOT']);
1910
+			if (($findroot === false) || ($findroot > 1)) {
1911 1911
 			$alt[] = htmlspecialchars_decode(urldecode($_SERVER['DOCUMENT_ROOT'].$file));
1912
-		    }
1912
+			}
1913 1913
 		}
1914 1914
 		//
1915 1915
 		$protocol = 'http';
1916 1916
 		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off')) {
1917
-		    $protocol .= 's';
1917
+			$protocol .= 's';
1918 1918
 		}
1919 1919
 		//
1920 1920
 		$url = $file;
@@ -1925,26 +1925,26 @@  discard block
 block discarded – undo
1925 1925
 		$alt[] = $url;
1926 1926
 		//
1927 1927
 		if (preg_match('%^(https?)://%', $url)
1928
-		    && empty($_SERVER['HTTP_HOST'])
1929
-		    && empty($_SERVER['DOCUMENT_ROOT'])
1928
+			&& empty($_SERVER['HTTP_HOST'])
1929
+			&& empty($_SERVER['DOCUMENT_ROOT'])
1930 1930
 		) {
1931 1931
 			$urldata = parse_url($url);
1932 1932
 			if (empty($urldata['query'])) {
1933 1933
 				$host = $protocol.'://'.$_SERVER['HTTP_HOST'];
1934 1934
 				if (strpos($url, $host) === 0) {
1935
-				    // convert URL to full server path
1936
-				    $tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
1937
-				    $alt[] = htmlspecialchars_decode(urldecode($tmp));
1935
+					// convert URL to full server path
1936
+					$tmp = str_replace($host, $_SERVER['DOCUMENT_ROOT'], $url);
1937
+					$alt[] = htmlspecialchars_decode(urldecode($tmp));
1938 1938
 				}
1939 1939
 			}
1940 1940
 		}
1941 1941
 		//
1942 1942
 		if (isset($_SERVER['SCRIPT_URI'])
1943
-		    && !preg_match('%^(https?|ftp)://%', $file)
1944
-		    && !preg_match('%^//%', $file)
1943
+			&& !preg_match('%^(https?|ftp)://%', $file)
1944
+			&& !preg_match('%^//%', $file)
1945 1945
 		) {
1946
-		    $urldata = @parse_url($_SERVER['SCRIPT_URI']);
1947
-		    $alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
1946
+			$urldata = @parse_url($_SERVER['SCRIPT_URI']);
1947
+			$alt[] = $urldata['scheme'].'://'.$urldata['host'].(($file[0] == '/') ? '' : '/').$file;
1948 1948
 		}
1949 1949
 		//
1950 1950
 		$alt = array_unique($alt);
@@ -1954,7 +1954,7 @@  discard block
 block discarded – undo
1954 1954
 			}
1955 1955
 			$ret = @file_get_contents($path);
1956 1956
 			if ( $ret != false ) {
1957
-			    return $ret;
1957
+				return $ret;
1958 1958
 			}
1959 1959
 			// try to use CURL for URLs
1960 1960
 			if (!ini_get('allow_url_fopen')
@@ -1968,7 +1968,7 @@  discard block
 block discarded – undo
1968 1968
 				curl_setopt($crs, CURLOPT_FAILONERROR, true);
1969 1969
 				curl_setopt($crs, CURLOPT_RETURNTRANSFER, true);
1970 1970
 				if ((ini_get('open_basedir') == '') && (!ini_get('safe_mode'))) {
1971
-				    curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
1971
+					curl_setopt($crs, CURLOPT_FOLLOWLOCATION, true);
1972 1972
 				}
1973 1973
 				curl_setopt($crs, CURLOPT_CONNECTTIMEOUT, 5);
1974 1974
 				curl_setopt($crs, CURLOPT_TIMEOUT, 30);
@@ -1977,7 +1977,7 @@  discard block
 block discarded – undo
1977 1977
 				curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
1978 1978
 				curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
1979 1979
 				if (defined('CURLOPT_PROTOCOLS')) {
1980
-				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
1980
+					curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
1981 1981
 				}
1982 1982
 				$ret = curl_exec($crs);
1983 1983
 				curl_close($crs);
@@ -2131,7 +2131,7 @@  discard block
 block discarded – undo
2131 2131
 	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
2132 2132
 	 * @public static
2133 2133
 	 *
2134
-     * @var array<string,float[]>
2134
+	 * @var array<string,float[]>
2135 2135
 	 */
2136 2136
 	public static $page_formats = array(
2137 2137
 		// ISO 216 A Series + 2 SIS 014711 extensions
Please login to merge, or discard this patch.
Spacing   +346 added lines, -346 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	 * @since (4.5.019) 2009-02-28
161 161
 	 * @public static
162 162
 	 */
163
-	public static function removeSHY($txt='', $unicode=true) {
163
+	public static function removeSHY($txt = '', $unicode = true) {
164 164
 		$txt = preg_replace('/([\\xc2]{1}[\\xad]{1})/', '', $txt);
165 165
 		if (!$unicode) {
166 166
 			$txt = preg_replace('/([\\xad]{1})/', '', $txt);
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 	 * @since 4.4.002 (2008-12-09)
179 179
 	 * @public static
180 180
 	 */
181
-	public static function getBorderMode($brd, $position='start', $opencell=true) {
181
+	public static function getBorderMode($brd, $position = 'start', $opencell = true) {
182 182
 		if ((!$opencell) OR empty($brd)) {
183 183
 			return $brd;
184 184
 		}
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 	 * @since 4.5.000 (2008-12-31)
263 263
 	 * @public static
264 264
 	 */
265
-	public static function getObjFilename($type='tmp', $file_id='') {
265
+	public static function getObjFilename($type = 'tmp', $file_id = '') {
266 266
 		return tempnam(K_PATH_CACHE, '__tcpdf_'.$file_id.'_'.$type.'_'.md5(TCPDF_STATIC::getRandomSeed()).'_');
267 267
 	}
268 268
 
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 	 * @return array replaced page content and updated $diff parameter as array.
329 329
 	 * @public static
330 330
 	 */
331
-	public static function replacePageNumAliases($page, $replace, $diff=0) {
331
+	public static function replacePageNumAliases($page, $replace, $diff = 0) {
332 332
 		foreach ($replace as $rep) {
333 333
 			foreach ($rep[3] as $a) {
334 334
 				if (strpos($page, $a) !== false) {
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 	 * @since 5.9.006 (2010-10-19)
375 375
 	 * @public static
376 376
 	 */
377
-	public static function getRandomSeed($seed='') {
377
+	public static function getRandomSeed($seed = '') {
378 378
 		$rnd = uniqid(rand().microtime(true), true);
379 379
 		if (function_exists('posix_getpid')) {
380 380
 			$rnd .= posix_getpid();
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
 	 * @author Nicola Asuni
512 512
 	 * @public static
513 513
 	 */
514
-	public static function getUserPermissionCode($permissions, $mode=0) {
514
+	public static function getUserPermissionCode($permissions, $mode = 0) {
515 515
 		$options = array(
516 516
 			'owner' => 2, // bit 2 -- inverted logic: cleared by default
517 517
 			'print' => 4, // bit 3
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 			'annot-forms' => 32, // bit 6
521 521
 			'fill-forms' => 256, // bit 9
522 522
 			'extract' => 512, // bit 10
523
-			'assemble' => 1024,// bit 11
523
+			'assemble' => 1024, // bit 11
524 524
 			'print-high' => 2048 // bit 12
525 525
 			);
526 526
 		$protection = 2147422012; // 32 bit: (01111111 11111111 00001111 00111100)
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 	 * @since 4.8.000 (2009-09-06)
629 629
 	 * @public static
630 630
 	 */
631
-	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
631
+	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl = false) {
632 632
 		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
633 633
 			// the annotation options are already defined
634 634
 			return $prop['aopt'];
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
650 650
 					break;
651 651
 				}
652 652
 				default: {
653
-					$opt['q'] = ($rtl)?2:0;
653
+					$opt['q'] = ($rtl) ? 2 : 0;
654 654
 					break;
655 655
 				}
656 656
 			}
@@ -994,7 +994,7 @@  discard block
 block discarded – undo
994 994
 	 * @public static
995 995
 	 */
996 996
 	public static function formatPageNumber($num) {
997
-		return number_format((float)$num, 0, '', '.');
997
+		return number_format((float) $num, 0, '', '.');
998 998
 	}
999 999
 
1000 1000
 	/**
@@ -1007,7 +1007,7 @@  discard block
 block discarded – undo
1007 1007
 	 * @public static
1008 1008
 	 */
1009 1009
 	public static function formatTOCPageNumber($num) {
1010
-		return number_format((float)$num, 0, '', '.');
1010
+		return number_format((float) $num, 0, '', '.');
1011 1011
 	}
1012 1012
 
1013 1013
 	/**
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
 	public static function fixHTMLCode($html, $default_css, $tagvs, $tidy_options, &$tagvspaces) {
1118 1118
 		// configure parameters for HTML Tidy
1119 1119
 		if (TCPDF_STATIC::empty_string($tidy_options)) {
1120
-			$tidy_options = array (
1120
+			$tidy_options = array(
1121 1121
 				'clean' => 1,
1122 1122
 				'drop-empty-paras' => 0,
1123 1123
 				'drop-proprietary-attributes' => 1,
@@ -1348,7 +1348,7 @@  discard block
 block discarded – undo
1348 1348
 			$selectors = $dom[($dom[$key]['parent'])]['csssel'];
1349 1349
 		}
1350 1350
 		// get all styles that apply
1351
-		foreach($css as $selector => $style) {
1351
+		foreach ($css as $selector => $style) {
1352 1352
 			$pos = strpos($selector, ' ');
1353 1353
 			// get specificity
1354 1354
 			$specificity = substr($selector, 0, $pos);
@@ -1488,9 +1488,9 @@  discard block
 block discarded – undo
1488 1488
 	 */
1489 1489
 	public static function revstrpos($haystack, $needle, $offset = 0) {
1490 1490
 		$length = strlen($haystack);
1491
-		$offset = ($offset > 0)?($length - $offset):abs($offset);
1491
+		$offset = ($offset > 0) ? ($length - $offset) : abs($offset);
1492 1492
 		$pos = strpos(strrev($haystack), strrev($needle), $offset);
1493
-		return ($pos === false)?false:($length - $pos - strlen($needle));
1493
+		return ($pos === false) ?false:($length - $pos - strlen($needle));
1494 1494
 	}
1495 1495
 
1496 1496
 	/**
@@ -1515,7 +1515,7 @@  discard block
 block discarded – undo
1515 1515
 		$patterns_array = preg_split('/[\s]+/', $data);
1516 1516
 		// create new language array of patterns
1517 1517
 		$patterns = array();
1518
-		foreach($patterns_array as $val) {
1518
+		foreach ($patterns_array as $val) {
1519 1519
 			if (!TCPDF_STATIC::empty_string($val)) {
1520 1520
 				$val = trim($val);
1521 1521
 				$val = str_replace('\'', '\\\'', $val);
@@ -1548,9 +1548,9 @@  discard block
 block discarded – undo
1548 1548
 	 * @since 5.0.000 (2010-04-30)
1549 1549
 	 * @public static
1550 1550
 	 */
1551
-	public static function getPathPaintOperator($style, $default='S') {
1551
+	public static function getPathPaintOperator($style, $default = 'S') {
1552 1552
 		$op = '';
1553
-		switch($style) {
1553
+		switch ($style) {
1554 1554
 			case 'S':
1555 1555
 			case 'D': {
1556 1556
 				$op = 'S';
@@ -1770,7 +1770,7 @@  discard block
 block discarded – undo
1770 1770
 	 * @since 6.0.023
1771 1771
 	 * @public static
1772 1772
 	 */
1773
-	public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
1773
+	public static function pregSplit($pattern, $modifiers, $subject, $limit = NULL, $flags = NULL) {
1774 1774
 		// PHP 8.1 deprecates nulls for $limit and $flags
1775 1775
 		$limit = $limit === null ? -1 : $limit;
1776 1776
 		$flags = $flags === null ? 0 : $flags;
@@ -1841,7 +1841,7 @@  discard block
 block discarded – undo
1841 1841
 		curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
1842 1842
 		curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
1843 1843
 		if (defined('CURLOPT_PROTOCOLS')) {
1844
-		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
1844
+		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS);
1845 1845
 		}
1846 1846
 		curl_exec($crs);
1847 1847
 		$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
@@ -1953,7 +1953,7 @@  discard block
 block discarded – undo
1953 1953
 				continue;
1954 1954
 			}
1955 1955
 			$ret = @file_get_contents($path);
1956
-			if ( $ret != false ) {
1956
+			if ($ret != false) {
1957 1957
 			    return $ret;
1958 1958
 			}
1959 1959
 			// try to use CURL for URLs
@@ -1977,7 +1977,7 @@  discard block
 block discarded – undo
1977 1977
 				curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
1978 1978
 				curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
1979 1979
 				if (defined('CURLOPT_PROTOCOLS')) {
1980
-				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
1980
+				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP | CURLPROTO_FTP | CURLPROTO_FTPS);
1981 1981
 				}
1982 1982
 				$ret = curl_exec($crs);
1983 1983
 				curl_close($crs);
@@ -2135,353 +2135,353 @@  discard block
 block discarded – undo
2135 2135
 	 */
2136 2136
 	public static $page_formats = array(
2137 2137
 		// ISO 216 A Series + 2 SIS 014711 extensions
2138
-		'A0'                     => array( 2383.937,  3370.394), // = (  841 x 1189 ) mm  = ( 33.11 x 46.81 ) in
2139
-		'A1'                     => array( 1683.780,  2383.937), // = (  594 x 841  ) mm  = ( 23.39 x 33.11 ) in
2140
-		'A2'                     => array( 1190.551,  1683.780), // = (  420 x 594  ) mm  = ( 16.54 x 23.39 ) in
2141
-		'A3'                     => array(  841.890,  1190.551), // = (  297 x 420  ) mm  = ( 11.69 x 16.54 ) in
2142
-		'A4'                     => array(  595.276,   841.890), // = (  210 x 297  ) mm  = (  8.27 x 11.69 ) in
2143
-		'A5'                     => array(  419.528,   595.276), // = (  148 x 210  ) mm  = (  5.83 x 8.27  ) in
2144
-		'A6'                     => array(  297.638,   419.528), // = (  105 x 148  ) mm  = (  4.13 x 5.83  ) in
2145
-		'A7'                     => array(  209.764,   297.638), // = (   74 x 105  ) mm  = (  2.91 x 4.13  ) in
2146
-		'A8'                     => array(  147.402,   209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
2147
-		'A9'                     => array(  104.882,   147.402), // = (   37 x 52   ) mm  = (  1.46 x 2.05  ) in
2148
-		'A10'                    => array(   73.701,   104.882), // = (   26 x 37   ) mm  = (  1.02 x 1.46  ) in
2149
-		'A11'                    => array(   51.024,    73.701), // = (   18 x 26   ) mm  = (  0.71 x 1.02  ) in
2150
-		'A12'                    => array(   36.850,    51.024), // = (   13 x 18   ) mm  = (  0.51 x 0.71  ) in
2138
+		'A0'                     => array(2383.937, 3370.394), // = (  841 x 1189 ) mm  = ( 33.11 x 46.81 ) in
2139
+		'A1'                     => array(1683.780, 2383.937), // = (  594 x 841  ) mm  = ( 23.39 x 33.11 ) in
2140
+		'A2'                     => array(1190.551, 1683.780), // = (  420 x 594  ) mm  = ( 16.54 x 23.39 ) in
2141
+		'A3'                     => array(841.890, 1190.551), // = (  297 x 420  ) mm  = ( 11.69 x 16.54 ) in
2142
+		'A4'                     => array(595.276, 841.890), // = (  210 x 297  ) mm  = (  8.27 x 11.69 ) in
2143
+		'A5'                     => array(419.528, 595.276), // = (  148 x 210  ) mm  = (  5.83 x 8.27  ) in
2144
+		'A6'                     => array(297.638, 419.528), // = (  105 x 148  ) mm  = (  4.13 x 5.83  ) in
2145
+		'A7'                     => array(209.764, 297.638), // = (   74 x 105  ) mm  = (  2.91 x 4.13  ) in
2146
+		'A8'                     => array(147.402, 209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
2147
+		'A9'                     => array(104.882, 147.402), // = (   37 x 52   ) mm  = (  1.46 x 2.05  ) in
2148
+		'A10'                    => array(73.701, 104.882), // = (   26 x 37   ) mm  = (  1.02 x 1.46  ) in
2149
+		'A11'                    => array(51.024, 73.701), // = (   18 x 26   ) mm  = (  0.71 x 1.02  ) in
2150
+		'A12'                    => array(36.850, 51.024), // = (   13 x 18   ) mm  = (  0.51 x 0.71  ) in
2151 2151
 		// ISO 216 B Series + 2 SIS 014711 extensions
2152
-		'B0'                     => array( 2834.646,  4008.189), // = ( 1000 x 1414 ) mm  = ( 39.37 x 55.67 ) in
2153
-		'B1'                     => array( 2004.094,  2834.646), // = (  707 x 1000 ) mm  = ( 27.83 x 39.37 ) in
2154
-		'B2'                     => array( 1417.323,  2004.094), // = (  500 x 707  ) mm  = ( 19.69 x 27.83 ) in
2155
-		'B3'                     => array( 1000.630,  1417.323), // = (  353 x 500  ) mm  = ( 13.90 x 19.69 ) in
2156
-		'B4'                     => array(  708.661,  1000.630), // = (  250 x 353  ) mm  = (  9.84 x 13.90 ) in
2157
-		'B5'                     => array(  498.898,   708.661), // = (  176 x 250  ) mm  = (  6.93 x 9.84  ) in
2158
-		'B6'                     => array(  354.331,   498.898), // = (  125 x 176  ) mm  = (  4.92 x 6.93  ) in
2159
-		'B7'                     => array(  249.449,   354.331), // = (   88 x 125  ) mm  = (  3.46 x 4.92  ) in
2160
-		'B8'                     => array(  175.748,   249.449), // = (   62 x 88   ) mm  = (  2.44 x 3.46  ) in
2161
-		'B9'                     => array(  124.724,   175.748), // = (   44 x 62   ) mm  = (  1.73 x 2.44  ) in
2162
-		'B10'                    => array(   87.874,   124.724), // = (   31 x 44   ) mm  = (  1.22 x 1.73  ) in
2163
-		'B11'                    => array(   62.362,    87.874), // = (   22 x 31   ) mm  = (  0.87 x 1.22  ) in
2164
-		'B12'                    => array(   42.520,    62.362), // = (   15 x 22   ) mm  = (  0.59 x 0.87  ) in
2152
+		'B0'                     => array(2834.646, 4008.189), // = ( 1000 x 1414 ) mm  = ( 39.37 x 55.67 ) in
2153
+		'B1'                     => array(2004.094, 2834.646), // = (  707 x 1000 ) mm  = ( 27.83 x 39.37 ) in
2154
+		'B2'                     => array(1417.323, 2004.094), // = (  500 x 707  ) mm  = ( 19.69 x 27.83 ) in
2155
+		'B3'                     => array(1000.630, 1417.323), // = (  353 x 500  ) mm  = ( 13.90 x 19.69 ) in
2156
+		'B4'                     => array(708.661, 1000.630), // = (  250 x 353  ) mm  = (  9.84 x 13.90 ) in
2157
+		'B5'                     => array(498.898, 708.661), // = (  176 x 250  ) mm  = (  6.93 x 9.84  ) in
2158
+		'B6'                     => array(354.331, 498.898), // = (  125 x 176  ) mm  = (  4.92 x 6.93  ) in
2159
+		'B7'                     => array(249.449, 354.331), // = (   88 x 125  ) mm  = (  3.46 x 4.92  ) in
2160
+		'B8'                     => array(175.748, 249.449), // = (   62 x 88   ) mm  = (  2.44 x 3.46  ) in
2161
+		'B9'                     => array(124.724, 175.748), // = (   44 x 62   ) mm  = (  1.73 x 2.44  ) in
2162
+		'B10'                    => array(87.874, 124.724), // = (   31 x 44   ) mm  = (  1.22 x 1.73  ) in
2163
+		'B11'                    => array(62.362, 87.874), // = (   22 x 31   ) mm  = (  0.87 x 1.22  ) in
2164
+		'B12'                    => array(42.520, 62.362), // = (   15 x 22   ) mm  = (  0.59 x 0.87  ) in
2165 2165
 		// ISO 216 C Series + 2 SIS 014711 extensions + 5 EXTENSION
2166
-		'C0'                     => array( 2599.370,  3676.535), // = (  917 x 1297 ) mm  = ( 36.10 x 51.06 ) in
2167
-		'C1'                     => array( 1836.850,  2599.370), // = (  648 x 917  ) mm  = ( 25.51 x 36.10 ) in
2168
-		'C2'                     => array( 1298.268,  1836.850), // = (  458 x 648  ) mm  = ( 18.03 x 25.51 ) in
2169
-		'C3'                     => array(  918.425,  1298.268), // = (  324 x 458  ) mm  = ( 12.76 x 18.03 ) in
2170
-		'C4'                     => array(  649.134,   918.425), // = (  229 x 324  ) mm  = (  9.02 x 12.76 ) in
2171
-		'C5'                     => array(  459.213,   649.134), // = (  162 x 229  ) mm  = (  6.38 x 9.02  ) in
2172
-		'C6'                     => array(  323.150,   459.213), // = (  114 x 162  ) mm  = (  4.49 x 6.38  ) in
2173
-		'C7'                     => array(  229.606,   323.150), // = (   81 x 114  ) mm  = (  3.19 x 4.49  ) in
2174
-		'C8'                     => array(  161.575,   229.606), // = (   57 x 81   ) mm  = (  2.24 x 3.19  ) in
2175
-		'C9'                     => array(  113.386,   161.575), // = (   40 x 57   ) mm  = (  1.57 x 2.24  ) in
2176
-		'C10'                    => array(   79.370,   113.386), // = (   28 x 40   ) mm  = (  1.10 x 1.57  ) in
2177
-		'C11'                    => array(   56.693,    79.370), // = (   20 x 28   ) mm  = (  0.79 x 1.10  ) in
2178
-		'C12'                    => array(   39.685,    56.693), // = (   14 x 20   ) mm  = (  0.55 x 0.79  ) in
2179
-		'C76'                    => array(  229.606,   459.213), // = (   81 x 162  ) mm  = (  3.19 x 6.38  ) in
2180
-		'DL'                     => array(  311.811,   623.622), // = (  110 x 220  ) mm  = (  4.33 x 8.66  ) in
2181
-		'DLE'                    => array(  323.150,   637.795), // = (  114 x 225  ) mm  = (  4.49 x 8.86  ) in
2182
-		'DLX'                    => array(  340.158,   666.142), // = (  120 x 235  ) mm  = (  4.72 x 9.25  ) in
2183
-		'DLP'                    => array(  280.630,   595.276), // = (   99 x 210  ) mm  = (  3.90 x 8.27  ) in (1/3 A4)
2166
+		'C0'                     => array(2599.370, 3676.535), // = (  917 x 1297 ) mm  = ( 36.10 x 51.06 ) in
2167
+		'C1'                     => array(1836.850, 2599.370), // = (  648 x 917  ) mm  = ( 25.51 x 36.10 ) in
2168
+		'C2'                     => array(1298.268, 1836.850), // = (  458 x 648  ) mm  = ( 18.03 x 25.51 ) in
2169
+		'C3'                     => array(918.425, 1298.268), // = (  324 x 458  ) mm  = ( 12.76 x 18.03 ) in
2170
+		'C4'                     => array(649.134, 918.425), // = (  229 x 324  ) mm  = (  9.02 x 12.76 ) in
2171
+		'C5'                     => array(459.213, 649.134), // = (  162 x 229  ) mm  = (  6.38 x 9.02  ) in
2172
+		'C6'                     => array(323.150, 459.213), // = (  114 x 162  ) mm  = (  4.49 x 6.38  ) in
2173
+		'C7'                     => array(229.606, 323.150), // = (   81 x 114  ) mm  = (  3.19 x 4.49  ) in
2174
+		'C8'                     => array(161.575, 229.606), // = (   57 x 81   ) mm  = (  2.24 x 3.19  ) in
2175
+		'C9'                     => array(113.386, 161.575), // = (   40 x 57   ) mm  = (  1.57 x 2.24  ) in
2176
+		'C10'                    => array(79.370, 113.386), // = (   28 x 40   ) mm  = (  1.10 x 1.57  ) in
2177
+		'C11'                    => array(56.693, 79.370), // = (   20 x 28   ) mm  = (  0.79 x 1.10  ) in
2178
+		'C12'                    => array(39.685, 56.693), // = (   14 x 20   ) mm  = (  0.55 x 0.79  ) in
2179
+		'C76'                    => array(229.606, 459.213), // = (   81 x 162  ) mm  = (  3.19 x 6.38  ) in
2180
+		'DL'                     => array(311.811, 623.622), // = (  110 x 220  ) mm  = (  4.33 x 8.66  ) in
2181
+		'DLE'                    => array(323.150, 637.795), // = (  114 x 225  ) mm  = (  4.49 x 8.86  ) in
2182
+		'DLX'                    => array(340.158, 666.142), // = (  120 x 235  ) mm  = (  4.72 x 9.25  ) in
2183
+		'DLP'                    => array(280.630, 595.276), // = (   99 x 210  ) mm  = (  3.90 x 8.27  ) in (1/3 A4)
2184 2184
 		// SIS 014711 E Series
2185
-		'E0'                     => array( 2491.654,  3517.795), // = (  879 x 1241 ) mm  = ( 34.61 x 48.86 ) in
2186
-		'E1'                     => array( 1757.480,  2491.654), // = (  620 x 879  ) mm  = ( 24.41 x 34.61 ) in
2187
-		'E2'                     => array( 1247.244,  1757.480), // = (  440 x 620  ) mm  = ( 17.32 x 24.41 ) in
2188
-		'E3'                     => array(  878.740,  1247.244), // = (  310 x 440  ) mm  = ( 12.20 x 17.32 ) in
2189
-		'E4'                     => array(  623.622,   878.740), // = (  220 x 310  ) mm  = (  8.66 x 12.20 ) in
2190
-		'E5'                     => array(  439.370,   623.622), // = (  155 x 220  ) mm  = (  6.10 x 8.66  ) in
2191
-		'E6'                     => array(  311.811,   439.370), // = (  110 x 155  ) mm  = (  4.33 x 6.10  ) in
2192
-		'E7'                     => array(  221.102,   311.811), // = (   78 x 110  ) mm  = (  3.07 x 4.33  ) in
2193
-		'E8'                     => array(  155.906,   221.102), // = (   55 x 78   ) mm  = (  2.17 x 3.07  ) in
2194
-		'E9'                     => array(  110.551,   155.906), // = (   39 x 55   ) mm  = (  1.54 x 2.17  ) in
2195
-		'E10'                    => array(   76.535,   110.551), // = (   27 x 39   ) mm  = (  1.06 x 1.54  ) in
2196
-		'E11'                    => array(   53.858,    76.535), // = (   19 x 27   ) mm  = (  0.75 x 1.06  ) in
2197
-		'E12'                    => array(   36.850,    53.858), // = (   13 x 19   ) mm  = (  0.51 x 0.75  ) in
2185
+		'E0'                     => array(2491.654, 3517.795), // = (  879 x 1241 ) mm  = ( 34.61 x 48.86 ) in
2186
+		'E1'                     => array(1757.480, 2491.654), // = (  620 x 879  ) mm  = ( 24.41 x 34.61 ) in
2187
+		'E2'                     => array(1247.244, 1757.480), // = (  440 x 620  ) mm  = ( 17.32 x 24.41 ) in
2188
+		'E3'                     => array(878.740, 1247.244), // = (  310 x 440  ) mm  = ( 12.20 x 17.32 ) in
2189
+		'E4'                     => array(623.622, 878.740), // = (  220 x 310  ) mm  = (  8.66 x 12.20 ) in
2190
+		'E5'                     => array(439.370, 623.622), // = (  155 x 220  ) mm  = (  6.10 x 8.66  ) in
2191
+		'E6'                     => array(311.811, 439.370), // = (  110 x 155  ) mm  = (  4.33 x 6.10  ) in
2192
+		'E7'                     => array(221.102, 311.811), // = (   78 x 110  ) mm  = (  3.07 x 4.33  ) in
2193
+		'E8'                     => array(155.906, 221.102), // = (   55 x 78   ) mm  = (  2.17 x 3.07  ) in
2194
+		'E9'                     => array(110.551, 155.906), // = (   39 x 55   ) mm  = (  1.54 x 2.17  ) in
2195
+		'E10'                    => array(76.535, 110.551), // = (   27 x 39   ) mm  = (  1.06 x 1.54  ) in
2196
+		'E11'                    => array(53.858, 76.535), // = (   19 x 27   ) mm  = (  0.75 x 1.06  ) in
2197
+		'E12'                    => array(36.850, 53.858), // = (   13 x 19   ) mm  = (  0.51 x 0.75  ) in
2198 2198
 		// SIS 014711 G Series
2199
-		'G0'                     => array( 2715.591,  3838.110), // = (  958 x 1354 ) mm  = ( 37.72 x 53.31 ) in
2200
-		'G1'                     => array( 1919.055,  2715.591), // = (  677 x 958  ) mm  = ( 26.65 x 37.72 ) in
2201
-		'G2'                     => array( 1357.795,  1919.055), // = (  479 x 677  ) mm  = ( 18.86 x 26.65 ) in
2202
-		'G3'                     => array(  958.110,  1357.795), // = (  338 x 479  ) mm  = ( 13.31 x 18.86 ) in
2203
-		'G4'                     => array(  677.480,   958.110), // = (  239 x 338  ) mm  = (  9.41 x 13.31 ) in
2204
-		'G5'                     => array(  479.055,   677.480), // = (  169 x 239  ) mm  = (  6.65 x 9.41  ) in
2205
-		'G6'                     => array(  337.323,   479.055), // = (  119 x 169  ) mm  = (  4.69 x 6.65  ) in
2206
-		'G7'                     => array(  238.110,   337.323), // = (   84 x 119  ) mm  = (  3.31 x 4.69  ) in
2207
-		'G8'                     => array(  167.244,   238.110), // = (   59 x 84   ) mm  = (  2.32 x 3.31  ) in
2208
-		'G9'                     => array(  119.055,   167.244), // = (   42 x 59   ) mm  = (  1.65 x 2.32  ) in
2209
-		'G10'                    => array(   82.205,   119.055), // = (   29 x 42   ) mm  = (  1.14 x 1.65  ) in
2210
-		'G11'                    => array(   59.528,    82.205), // = (   21 x 29   ) mm  = (  0.83 x 1.14  ) in
2211
-		'G12'                    => array(   39.685,    59.528), // = (   14 x 21   ) mm  = (  0.55 x 0.83  ) in
2199
+		'G0'                     => array(2715.591, 3838.110), // = (  958 x 1354 ) mm  = ( 37.72 x 53.31 ) in
2200
+		'G1'                     => array(1919.055, 2715.591), // = (  677 x 958  ) mm  = ( 26.65 x 37.72 ) in
2201
+		'G2'                     => array(1357.795, 1919.055), // = (  479 x 677  ) mm  = ( 18.86 x 26.65 ) in
2202
+		'G3'                     => array(958.110, 1357.795), // = (  338 x 479  ) mm  = ( 13.31 x 18.86 ) in
2203
+		'G4'                     => array(677.480, 958.110), // = (  239 x 338  ) mm  = (  9.41 x 13.31 ) in
2204
+		'G5'                     => array(479.055, 677.480), // = (  169 x 239  ) mm  = (  6.65 x 9.41  ) in
2205
+		'G6'                     => array(337.323, 479.055), // = (  119 x 169  ) mm  = (  4.69 x 6.65  ) in
2206
+		'G7'                     => array(238.110, 337.323), // = (   84 x 119  ) mm  = (  3.31 x 4.69  ) in
2207
+		'G8'                     => array(167.244, 238.110), // = (   59 x 84   ) mm  = (  2.32 x 3.31  ) in
2208
+		'G9'                     => array(119.055, 167.244), // = (   42 x 59   ) mm  = (  1.65 x 2.32  ) in
2209
+		'G10'                    => array(82.205, 119.055), // = (   29 x 42   ) mm  = (  1.14 x 1.65  ) in
2210
+		'G11'                    => array(59.528, 82.205), // = (   21 x 29   ) mm  = (  0.83 x 1.14  ) in
2211
+		'G12'                    => array(39.685, 59.528), // = (   14 x 21   ) mm  = (  0.55 x 0.83  ) in
2212 2212
 		// ISO Press
2213
-		'RA0'                    => array( 2437.795,  3458.268), // = (  860 x 1220 ) mm  = ( 33.86 x 48.03 ) in
2214
-		'RA1'                    => array( 1729.134,  2437.795), // = (  610 x 860  ) mm  = ( 24.02 x 33.86 ) in
2215
-		'RA2'                    => array( 1218.898,  1729.134), // = (  430 x 610  ) mm  = ( 16.93 x 24.02 ) in
2216
-		'RA3'                    => array(  864.567,  1218.898), // = (  305 x 430  ) mm  = ( 12.01 x 16.93 ) in
2217
-		'RA4'                    => array(  609.449,   864.567), // = (  215 x 305  ) mm  = (  8.46 x 12.01 ) in
2218
-		'SRA0'                   => array( 2551.181,  3628.346), // = (  900 x 1280 ) mm  = ( 35.43 x 50.39 ) in
2219
-		'SRA1'                   => array( 1814.173,  2551.181), // = (  640 x 900  ) mm  = ( 25.20 x 35.43 ) in
2220
-		'SRA2'                   => array( 1275.591,  1814.173), // = (  450 x 640  ) mm  = ( 17.72 x 25.20 ) in
2221
-		'SRA3'                   => array(  907.087,  1275.591), // = (  320 x 450  ) mm  = ( 12.60 x 17.72 ) in
2222
-		'SRA4'                   => array(  637.795,   907.087), // = (  225 x 320  ) mm  = (  8.86 x 12.60 ) in
2213
+		'RA0'                    => array(2437.795, 3458.268), // = (  860 x 1220 ) mm  = ( 33.86 x 48.03 ) in
2214
+		'RA1'                    => array(1729.134, 2437.795), // = (  610 x 860  ) mm  = ( 24.02 x 33.86 ) in
2215
+		'RA2'                    => array(1218.898, 1729.134), // = (  430 x 610  ) mm  = ( 16.93 x 24.02 ) in
2216
+		'RA3'                    => array(864.567, 1218.898), // = (  305 x 430  ) mm  = ( 12.01 x 16.93 ) in
2217
+		'RA4'                    => array(609.449, 864.567), // = (  215 x 305  ) mm  = (  8.46 x 12.01 ) in
2218
+		'SRA0'                   => array(2551.181, 3628.346), // = (  900 x 1280 ) mm  = ( 35.43 x 50.39 ) in
2219
+		'SRA1'                   => array(1814.173, 2551.181), // = (  640 x 900  ) mm  = ( 25.20 x 35.43 ) in
2220
+		'SRA2'                   => array(1275.591, 1814.173), // = (  450 x 640  ) mm  = ( 17.72 x 25.20 ) in
2221
+		'SRA3'                   => array(907.087, 1275.591), // = (  320 x 450  ) mm  = ( 12.60 x 17.72 ) in
2222
+		'SRA4'                   => array(637.795, 907.087), // = (  225 x 320  ) mm  = (  8.86 x 12.60 ) in
2223 2223
 		// German DIN 476
2224
-		'4A0'                    => array( 4767.874,  6740.787), // = ( 1682 x 2378 ) mm  = ( 66.22 x 93.62 ) in
2225
-		'2A0'                    => array( 3370.394,  4767.874), // = ( 1189 x 1682 ) mm  = ( 46.81 x 66.22 ) in
2224
+		'4A0'                    => array(4767.874, 6740.787), // = ( 1682 x 2378 ) mm  = ( 66.22 x 93.62 ) in
2225
+		'2A0'                    => array(3370.394, 4767.874), // = ( 1189 x 1682 ) mm  = ( 46.81 x 66.22 ) in
2226 2226
 		// Variations on the ISO Standard
2227
-		'A2_EXTRA'               => array( 1261.417,  1754.646), // = (  445 x 619  ) mm  = ( 17.52 x 24.37 ) in
2228
-		'A3+'                    => array(  932.598,  1369.134), // = (  329 x 483  ) mm  = ( 12.95 x 19.02 ) in
2229
-		'A3_EXTRA'               => array(  912.756,  1261.417), // = (  322 x 445  ) mm  = ( 12.68 x 17.52 ) in
2230
-		'A3_SUPER'               => array(  864.567,  1440.000), // = (  305 x 508  ) mm  = ( 12.01 x 20.00 ) in
2231
-		'SUPER_A3'               => array(  864.567,  1380.472), // = (  305 x 487  ) mm  = ( 12.01 x 19.17 ) in
2232
-		'A4_EXTRA'               => array(  666.142,   912.756), // = (  235 x 322  ) mm  = (  9.25 x 12.68 ) in
2233
-		'A4_SUPER'               => array(  649.134,   912.756), // = (  229 x 322  ) mm  = (  9.02 x 12.68 ) in
2234
-		'SUPER_A4'               => array(  643.465,  1009.134), // = (  227 x 356  ) mm  = (  8.94 x 14.02 ) in
2235
-		'A4_LONG'                => array(  595.276,   986.457), // = (  210 x 348  ) mm  = (  8.27 x 13.70 ) in
2236
-		'F4'                     => array(  595.276,   935.433), // = (  210 x 330  ) mm  = (  8.27 x 12.99 ) in
2237
-		'SO_B5_EXTRA'            => array(  572.598,   782.362), // = (  202 x 276  ) mm  = (  7.95 x 10.87 ) in
2238
-		'A5_EXTRA'               => array(  490.394,   666.142), // = (  173 x 235  ) mm  = (  6.81 x 9.25  ) in
2227
+		'A2_EXTRA'               => array(1261.417, 1754.646), // = (  445 x 619  ) mm  = ( 17.52 x 24.37 ) in
2228
+		'A3+'                    => array(932.598, 1369.134), // = (  329 x 483  ) mm  = ( 12.95 x 19.02 ) in
2229
+		'A3_EXTRA'               => array(912.756, 1261.417), // = (  322 x 445  ) mm  = ( 12.68 x 17.52 ) in
2230
+		'A3_SUPER'               => array(864.567, 1440.000), // = (  305 x 508  ) mm  = ( 12.01 x 20.00 ) in
2231
+		'SUPER_A3'               => array(864.567, 1380.472), // = (  305 x 487  ) mm  = ( 12.01 x 19.17 ) in
2232
+		'A4_EXTRA'               => array(666.142, 912.756), // = (  235 x 322  ) mm  = (  9.25 x 12.68 ) in
2233
+		'A4_SUPER'               => array(649.134, 912.756), // = (  229 x 322  ) mm  = (  9.02 x 12.68 ) in
2234
+		'SUPER_A4'               => array(643.465, 1009.134), // = (  227 x 356  ) mm  = (  8.94 x 14.02 ) in
2235
+		'A4_LONG'                => array(595.276, 986.457), // = (  210 x 348  ) mm  = (  8.27 x 13.70 ) in
2236
+		'F4'                     => array(595.276, 935.433), // = (  210 x 330  ) mm  = (  8.27 x 12.99 ) in
2237
+		'SO_B5_EXTRA'            => array(572.598, 782.362), // = (  202 x 276  ) mm  = (  7.95 x 10.87 ) in
2238
+		'A5_EXTRA'               => array(490.394, 666.142), // = (  173 x 235  ) mm  = (  6.81 x 9.25  ) in
2239 2239
 		// ANSI Series
2240
-		'ANSI_E'                 => array( 2448.000,  3168.000), // = (  864 x 1118 ) mm  = ( 34.00 x 44.00 ) in
2241
-		'ANSI_D'                 => array( 1584.000,  2448.000), // = (  559 x 864  ) mm  = ( 22.00 x 34.00 ) in
2242
-		'ANSI_C'                 => array( 1224.000,  1584.000), // = (  432 x 559  ) mm  = ( 17.00 x 22.00 ) in
2243
-		'ANSI_B'                 => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2244
-		'ANSI_A'                 => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2240
+		'ANSI_E'                 => array(2448.000, 3168.000), // = (  864 x 1118 ) mm  = ( 34.00 x 44.00 ) in
2241
+		'ANSI_D'                 => array(1584.000, 2448.000), // = (  559 x 864  ) mm  = ( 22.00 x 34.00 ) in
2242
+		'ANSI_C'                 => array(1224.000, 1584.000), // = (  432 x 559  ) mm  = ( 17.00 x 22.00 ) in
2243
+		'ANSI_B'                 => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2244
+		'ANSI_A'                 => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2245 2245
 		// Traditional 'Loose' North American Paper Sizes
2246
-		'USLEDGER'               => array( 1224.000,   792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
2247
-		'LEDGER'                 => array( 1224.000,   792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
2248
-		'ORGANIZERK'             => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2249
-		'BIBLE'                  => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2250
-		'USTABLOID'              => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2251
-		'TABLOID'                => array(  792.000,  1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2252
-		'ORGANIZERM'             => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2253
-		'USLETTER'               => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2254
-		'LETTER'                 => array(  612.000,   792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2255
-		'USLEGAL'                => array(  612.000,  1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
2256
-		'LEGAL'                  => array(  612.000,  1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
2257
-		'GOVERNMENTLETTER'       => array(  576.000,   756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
2258
-		'GLETTER'                => array(  576.000,   756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
2259
-		'JUNIORLEGAL'            => array(  576.000,   360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
2260
-		'JLEGAL'                 => array(  576.000,   360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
2246
+		'USLEDGER'               => array(1224.000, 792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
2247
+		'LEDGER'                 => array(1224.000, 792.000), // = (  432 x 279  ) mm  = ( 17.00 x 11.00 ) in
2248
+		'ORGANIZERK'             => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2249
+		'BIBLE'                  => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2250
+		'USTABLOID'              => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2251
+		'TABLOID'                => array(792.000, 1224.000), // = (  279 x 432  ) mm  = ( 11.00 x 17.00 ) in
2252
+		'ORGANIZERM'             => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2253
+		'USLETTER'               => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2254
+		'LETTER'                 => array(612.000, 792.000), // = (  216 x 279  ) mm  = (  8.50 x 11.00 ) in
2255
+		'USLEGAL'                => array(612.000, 1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
2256
+		'LEGAL'                  => array(612.000, 1008.000), // = (  216 x 356  ) mm  = (  8.50 x 14.00 ) in
2257
+		'GOVERNMENTLETTER'       => array(576.000, 756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
2258
+		'GLETTER'                => array(576.000, 756.000), // = (  203 x 267  ) mm  = (  8.00 x 10.50 ) in
2259
+		'JUNIORLEGAL'            => array(576.000, 360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
2260
+		'JLEGAL'                 => array(576.000, 360.000), // = (  203 x 127  ) mm  = (  8.00 x 5.00  ) in
2261 2261
 		// Other North American Paper Sizes
2262
-		'QUADDEMY'               => array( 2520.000,  3240.000), // = (  889 x 1143 ) mm  = ( 35.00 x 45.00 ) in
2263
-		'SUPER_B'                => array(  936.000,  1368.000), // = (  330 x 483  ) mm  = ( 13.00 x 19.00 ) in
2264
-		'QUARTO'                 => array(  648.000,   792.000), // = (  229 x 279  ) mm  = (  9.00 x 11.00 ) in
2265
-		'GOVERNMENTLEGAL'        => array(  612.000,   936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
2266
-		'FOLIO'                  => array(  612.000,   936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
2267
-		'MONARCH'                => array(  522.000,   756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
2268
-		'EXECUTIVE'              => array(  522.000,   756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
2269
-		'ORGANIZERL'             => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
2270
-		'STATEMENT'              => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
2271
-		'MEMO'                   => array(  396.000,   612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
2272
-		'FOOLSCAP'               => array(  595.440,   936.000), // = (  210 x 330  ) mm  = (  8.27 x 13.00 ) in
2273
-		'COMPACT'                => array(  306.000,   486.000), // = (  108 x 171  ) mm  = (  4.25 x 6.75  ) in
2274
-		'ORGANIZERJ'             => array(  198.000,   360.000), // = (   70 x 127  ) mm  = (  2.75 x 5.00  ) in
2262
+		'QUADDEMY'               => array(2520.000, 3240.000), // = (  889 x 1143 ) mm  = ( 35.00 x 45.00 ) in
2263
+		'SUPER_B'                => array(936.000, 1368.000), // = (  330 x 483  ) mm  = ( 13.00 x 19.00 ) in
2264
+		'QUARTO'                 => array(648.000, 792.000), // = (  229 x 279  ) mm  = (  9.00 x 11.00 ) in
2265
+		'GOVERNMENTLEGAL'        => array(612.000, 936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
2266
+		'FOLIO'                  => array(612.000, 936.000), // = (  216 x 330  ) mm  = (  8.50 x 13.00 ) in
2267
+		'MONARCH'                => array(522.000, 756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
2268
+		'EXECUTIVE'              => array(522.000, 756.000), // = (  184 x 267  ) mm  = (  7.25 x 10.50 ) in
2269
+		'ORGANIZERL'             => array(396.000, 612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
2270
+		'STATEMENT'              => array(396.000, 612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
2271
+		'MEMO'                   => array(396.000, 612.000), // = (  140 x 216  ) mm  = (  5.50 x 8.50  ) in
2272
+		'FOOLSCAP'               => array(595.440, 936.000), // = (  210 x 330  ) mm  = (  8.27 x 13.00 ) in
2273
+		'COMPACT'                => array(306.000, 486.000), // = (  108 x 171  ) mm  = (  4.25 x 6.75  ) in
2274
+		'ORGANIZERJ'             => array(198.000, 360.000), // = (   70 x 127  ) mm  = (  2.75 x 5.00  ) in
2275 2275
 		// Canadian standard CAN 2-9.60M
2276
-		'P1'                     => array( 1587.402,  2437.795), // = (  560 x 860  ) mm  = ( 22.05 x 33.86 ) in
2277
-		'P2'                     => array( 1218.898,  1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
2278
-		'P3'                     => array(  793.701,  1218.898), // = (  280 x 430  ) mm  = ( 11.02 x 16.93 ) in
2279
-		'P4'                     => array(  609.449,   793.701), // = (  215 x 280  ) mm  = (  8.46 x 11.02 ) in
2280
-		'P5'                     => array(  396.850,   609.449), // = (  140 x 215  ) mm  = (  5.51 x 8.46  ) in
2281
-		'P6'                     => array(  303.307,   396.850), // = (  107 x 140  ) mm  = (  4.21 x 5.51  ) in
2276
+		'P1'                     => array(1587.402, 2437.795), // = (  560 x 860  ) mm  = ( 22.05 x 33.86 ) in
2277
+		'P2'                     => array(1218.898, 1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
2278
+		'P3'                     => array(793.701, 1218.898), // = (  280 x 430  ) mm  = ( 11.02 x 16.93 ) in
2279
+		'P4'                     => array(609.449, 793.701), // = (  215 x 280  ) mm  = (  8.46 x 11.02 ) in
2280
+		'P5'                     => array(396.850, 609.449), // = (  140 x 215  ) mm  = (  5.51 x 8.46  ) in
2281
+		'P6'                     => array(303.307, 396.850), // = (  107 x 140  ) mm  = (  4.21 x 5.51  ) in
2282 2282
 		// North American Architectural Sizes
2283
-		'ARCH_E'                 => array( 2592.000,  3456.000), // = (  914 x 1219 ) mm  = ( 36.00 x 48.00 ) in
2284
-		'ARCH_E1'                => array( 2160.000,  3024.000), // = (  762 x 1067 ) mm  = ( 30.00 x 42.00 ) in
2285
-		'ARCH_D'                 => array( 1728.000,  2592.000), // = (  610 x 914  ) mm  = ( 24.00 x 36.00 ) in
2286
-		'BROADSHEET'             => array( 1296.000,  1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
2287
-		'ARCH_C'                 => array( 1296.000,  1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
2288
-		'ARCH_B'                 => array(  864.000,  1296.000), // = (  305 x 457  ) mm  = ( 12.00 x 18.00 ) in
2289
-		'ARCH_A'                 => array(  648.000,   864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
2283
+		'ARCH_E'                 => array(2592.000, 3456.000), // = (  914 x 1219 ) mm  = ( 36.00 x 48.00 ) in
2284
+		'ARCH_E1'                => array(2160.000, 3024.000), // = (  762 x 1067 ) mm  = ( 30.00 x 42.00 ) in
2285
+		'ARCH_D'                 => array(1728.000, 2592.000), // = (  610 x 914  ) mm  = ( 24.00 x 36.00 ) in
2286
+		'BROADSHEET'             => array(1296.000, 1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
2287
+		'ARCH_C'                 => array(1296.000, 1728.000), // = (  457 x 610  ) mm  = ( 18.00 x 24.00 ) in
2288
+		'ARCH_B'                 => array(864.000, 1296.000), // = (  305 x 457  ) mm  = ( 12.00 x 18.00 ) in
2289
+		'ARCH_A'                 => array(648.000, 864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
2290 2290
 		// -- North American Envelope Sizes
2291 2291
 		// - Announcement Envelopes
2292
-		'ANNENV_A2'              => array(  314.640,   414.000), // = (  111 x 146  ) mm  = (  4.37 x 5.75  ) in
2293
-		'ANNENV_A6'              => array(  342.000,   468.000), // = (  121 x 165  ) mm  = (  4.75 x 6.50  ) in
2294
-		'ANNENV_A7'              => array(  378.000,   522.000), // = (  133 x 184  ) mm  = (  5.25 x 7.25  ) in
2295
-		'ANNENV_A8'              => array(  396.000,   584.640), // = (  140 x 206  ) mm  = (  5.50 x 8.12  ) in
2296
-		'ANNENV_A10'             => array(  450.000,   692.640), // = (  159 x 244  ) mm  = (  6.25 x 9.62  ) in
2297
-		'ANNENV_SLIM'            => array(  278.640,   638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
2292
+		'ANNENV_A2'              => array(314.640, 414.000), // = (  111 x 146  ) mm  = (  4.37 x 5.75  ) in
2293
+		'ANNENV_A6'              => array(342.000, 468.000), // = (  121 x 165  ) mm  = (  4.75 x 6.50  ) in
2294
+		'ANNENV_A7'              => array(378.000, 522.000), // = (  133 x 184  ) mm  = (  5.25 x 7.25  ) in
2295
+		'ANNENV_A8'              => array(396.000, 584.640), // = (  140 x 206  ) mm  = (  5.50 x 8.12  ) in
2296
+		'ANNENV_A10'             => array(450.000, 692.640), // = (  159 x 244  ) mm  = (  6.25 x 9.62  ) in
2297
+		'ANNENV_SLIM'            => array(278.640, 638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
2298 2298
 		// - Commercial Envelopes
2299
-		'COMMENV_N6_1/4'         => array(  252.000,   432.000), // = (   89 x 152  ) mm  = (  3.50 x 6.00  ) in
2300
-		'COMMENV_N6_3/4'         => array(  260.640,   468.000), // = (   92 x 165  ) mm  = (  3.62 x 6.50  ) in
2301
-		'COMMENV_N8'             => array(  278.640,   540.000), // = (   98 x 191  ) mm  = (  3.87 x 7.50  ) in
2302
-		'COMMENV_N9'             => array(  278.640,   638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
2303
-		'COMMENV_N10'            => array(  296.640,   684.000), // = (  105 x 241  ) mm  = (  4.12 x 9.50  ) in
2304
-		'COMMENV_N11'            => array(  324.000,   746.640), // = (  114 x 263  ) mm  = (  4.50 x 10.37 ) in
2305
-		'COMMENV_N12'            => array(  342.000,   792.000), // = (  121 x 279  ) mm  = (  4.75 x 11.00 ) in
2306
-		'COMMENV_N14'            => array(  360.000,   828.000), // = (  127 x 292  ) mm  = (  5.00 x 11.50 ) in
2299
+		'COMMENV_N6_1/4'         => array(252.000, 432.000), // = (   89 x 152  ) mm  = (  3.50 x 6.00  ) in
2300
+		'COMMENV_N6_3/4'         => array(260.640, 468.000), // = (   92 x 165  ) mm  = (  3.62 x 6.50  ) in
2301
+		'COMMENV_N8'             => array(278.640, 540.000), // = (   98 x 191  ) mm  = (  3.87 x 7.50  ) in
2302
+		'COMMENV_N9'             => array(278.640, 638.640), // = (   98 x 225  ) mm  = (  3.87 x 8.87  ) in
2303
+		'COMMENV_N10'            => array(296.640, 684.000), // = (  105 x 241  ) mm  = (  4.12 x 9.50  ) in
2304
+		'COMMENV_N11'            => array(324.000, 746.640), // = (  114 x 263  ) mm  = (  4.50 x 10.37 ) in
2305
+		'COMMENV_N12'            => array(342.000, 792.000), // = (  121 x 279  ) mm  = (  4.75 x 11.00 ) in
2306
+		'COMMENV_N14'            => array(360.000, 828.000), // = (  127 x 292  ) mm  = (  5.00 x 11.50 ) in
2307 2307
 		// - Catalogue Envelopes
2308
-		'CATENV_N1'              => array(  432.000,   648.000), // = (  152 x 229  ) mm  = (  6.00 x 9.00  ) in
2309
-		'CATENV_N1_3/4'          => array(  468.000,   684.000), // = (  165 x 241  ) mm  = (  6.50 x 9.50  ) in
2310
-		'CATENV_N2'              => array(  468.000,   720.000), // = (  165 x 254  ) mm  = (  6.50 x 10.00 ) in
2311
-		'CATENV_N3'              => array(  504.000,   720.000), // = (  178 x 254  ) mm  = (  7.00 x 10.00 ) in
2312
-		'CATENV_N6'              => array(  540.000,   756.000), // = (  191 x 267  ) mm  = (  7.50 x 10.50 ) in
2313
-		'CATENV_N7'              => array(  576.000,   792.000), // = (  203 x 279  ) mm  = (  8.00 x 11.00 ) in
2314
-		'CATENV_N8'              => array(  594.000,   810.000), // = (  210 x 286  ) mm  = (  8.25 x 11.25 ) in
2315
-		'CATENV_N9_1/2'          => array(  612.000,   756.000), // = (  216 x 267  ) mm  = (  8.50 x 10.50 ) in
2316
-		'CATENV_N9_3/4'          => array(  630.000,   810.000), // = (  222 x 286  ) mm  = (  8.75 x 11.25 ) in
2317
-		'CATENV_N10_1/2'         => array(  648.000,   864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
2318
-		'CATENV_N12_1/2'         => array(  684.000,   900.000), // = (  241 x 318  ) mm  = (  9.50 x 12.50 ) in
2319
-		'CATENV_N13_1/2'         => array(  720.000,   936.000), // = (  254 x 330  ) mm  = ( 10.00 x 13.00 ) in
2320
-		'CATENV_N14_1/4'         => array(  810.000,   882.000), // = (  286 x 311  ) mm  = ( 11.25 x 12.25 ) in
2321
-		'CATENV_N14_1/2'         => array(  828.000,  1044.000), // = (  292 x 368  ) mm  = ( 11.50 x 14.50 ) in
2308
+		'CATENV_N1'              => array(432.000, 648.000), // = (  152 x 229  ) mm  = (  6.00 x 9.00  ) in
2309
+		'CATENV_N1_3/4'          => array(468.000, 684.000), // = (  165 x 241  ) mm  = (  6.50 x 9.50  ) in
2310
+		'CATENV_N2'              => array(468.000, 720.000), // = (  165 x 254  ) mm  = (  6.50 x 10.00 ) in
2311
+		'CATENV_N3'              => array(504.000, 720.000), // = (  178 x 254  ) mm  = (  7.00 x 10.00 ) in
2312
+		'CATENV_N6'              => array(540.000, 756.000), // = (  191 x 267  ) mm  = (  7.50 x 10.50 ) in
2313
+		'CATENV_N7'              => array(576.000, 792.000), // = (  203 x 279  ) mm  = (  8.00 x 11.00 ) in
2314
+		'CATENV_N8'              => array(594.000, 810.000), // = (  210 x 286  ) mm  = (  8.25 x 11.25 ) in
2315
+		'CATENV_N9_1/2'          => array(612.000, 756.000), // = (  216 x 267  ) mm  = (  8.50 x 10.50 ) in
2316
+		'CATENV_N9_3/4'          => array(630.000, 810.000), // = (  222 x 286  ) mm  = (  8.75 x 11.25 ) in
2317
+		'CATENV_N10_1/2'         => array(648.000, 864.000), // = (  229 x 305  ) mm  = (  9.00 x 12.00 ) in
2318
+		'CATENV_N12_1/2'         => array(684.000, 900.000), // = (  241 x 318  ) mm  = (  9.50 x 12.50 ) in
2319
+		'CATENV_N13_1/2'         => array(720.000, 936.000), // = (  254 x 330  ) mm  = ( 10.00 x 13.00 ) in
2320
+		'CATENV_N14_1/4'         => array(810.000, 882.000), // = (  286 x 311  ) mm  = ( 11.25 x 12.25 ) in
2321
+		'CATENV_N14_1/2'         => array(828.000, 1044.000), // = (  292 x 368  ) mm  = ( 11.50 x 14.50 ) in
2322 2322
 		// Japanese (JIS P 0138-61) Standard B-Series
2323
-		'JIS_B0'                 => array( 2919.685,  4127.244), // = ( 1030 x 1456 ) mm  = ( 40.55 x 57.32 ) in
2324
-		'JIS_B1'                 => array( 2063.622,  2919.685), // = (  728 x 1030 ) mm  = ( 28.66 x 40.55 ) in
2325
-		'JIS_B2'                 => array( 1459.843,  2063.622), // = (  515 x 728  ) mm  = ( 20.28 x 28.66 ) in
2326
-		'JIS_B3'                 => array( 1031.811,  1459.843), // = (  364 x 515  ) mm  = ( 14.33 x 20.28 ) in
2327
-		'JIS_B4'                 => array(  728.504,  1031.811), // = (  257 x 364  ) mm  = ( 10.12 x 14.33 ) in
2328
-		'JIS_B5'                 => array(  515.906,   728.504), // = (  182 x 257  ) mm  = (  7.17 x 10.12 ) in
2329
-		'JIS_B6'                 => array(  362.835,   515.906), // = (  128 x 182  ) mm  = (  5.04 x 7.17  ) in
2330
-		'JIS_B7'                 => array(  257.953,   362.835), // = (   91 x 128  ) mm  = (  3.58 x 5.04  ) in
2331
-		'JIS_B8'                 => array(  181.417,   257.953), // = (   64 x 91   ) mm  = (  2.52 x 3.58  ) in
2332
-		'JIS_B9'                 => array(  127.559,   181.417), // = (   45 x 64   ) mm  = (  1.77 x 2.52  ) in
2333
-		'JIS_B10'                => array(   90.709,   127.559), // = (   32 x 45   ) mm  = (  1.26 x 1.77  ) in
2334
-		'JIS_B11'                => array(   62.362,    90.709), // = (   22 x 32   ) mm  = (  0.87 x 1.26  ) in
2335
-		'JIS_B12'                => array(   45.354,    62.362), // = (   16 x 22   ) mm  = (  0.63 x 0.87  ) in
2323
+		'JIS_B0'                 => array(2919.685, 4127.244), // = ( 1030 x 1456 ) mm  = ( 40.55 x 57.32 ) in
2324
+		'JIS_B1'                 => array(2063.622, 2919.685), // = (  728 x 1030 ) mm  = ( 28.66 x 40.55 ) in
2325
+		'JIS_B2'                 => array(1459.843, 2063.622), // = (  515 x 728  ) mm  = ( 20.28 x 28.66 ) in
2326
+		'JIS_B3'                 => array(1031.811, 1459.843), // = (  364 x 515  ) mm  = ( 14.33 x 20.28 ) in
2327
+		'JIS_B4'                 => array(728.504, 1031.811), // = (  257 x 364  ) mm  = ( 10.12 x 14.33 ) in
2328
+		'JIS_B5'                 => array(515.906, 728.504), // = (  182 x 257  ) mm  = (  7.17 x 10.12 ) in
2329
+		'JIS_B6'                 => array(362.835, 515.906), // = (  128 x 182  ) mm  = (  5.04 x 7.17  ) in
2330
+		'JIS_B7'                 => array(257.953, 362.835), // = (   91 x 128  ) mm  = (  3.58 x 5.04  ) in
2331
+		'JIS_B8'                 => array(181.417, 257.953), // = (   64 x 91   ) mm  = (  2.52 x 3.58  ) in
2332
+		'JIS_B9'                 => array(127.559, 181.417), // = (   45 x 64   ) mm  = (  1.77 x 2.52  ) in
2333
+		'JIS_B10'                => array(90.709, 127.559), // = (   32 x 45   ) mm  = (  1.26 x 1.77  ) in
2334
+		'JIS_B11'                => array(62.362, 90.709), // = (   22 x 32   ) mm  = (  0.87 x 1.26  ) in
2335
+		'JIS_B12'                => array(45.354, 62.362), // = (   16 x 22   ) mm  = (  0.63 x 0.87  ) in
2336 2336
 		// PA Series
2337
-		'PA0'                    => array( 2381.102,  3174.803), // = (  840 x 1120 ) mm  = ( 33.07 x 44.09 ) in
2338
-		'PA1'                    => array( 1587.402,  2381.102), // = (  560 x 840  ) mm  = ( 22.05 x 33.07 ) in
2339
-		'PA2'                    => array( 1190.551,  1587.402), // = (  420 x 560  ) mm  = ( 16.54 x 22.05 ) in
2340
-		'PA3'                    => array(  793.701,  1190.551), // = (  280 x 420  ) mm  = ( 11.02 x 16.54 ) in
2341
-		'PA4'                    => array(  595.276,   793.701), // = (  210 x 280  ) mm  = (  8.27 x 11.02 ) in
2342
-		'PA5'                    => array(  396.850,   595.276), // = (  140 x 210  ) mm  = (  5.51 x 8.27  ) in
2343
-		'PA6'                    => array(  297.638,   396.850), // = (  105 x 140  ) mm  = (  4.13 x 5.51  ) in
2344
-		'PA7'                    => array(  198.425,   297.638), // = (   70 x 105  ) mm  = (  2.76 x 4.13  ) in
2345
-		'PA8'                    => array(  147.402,   198.425), // = (   52 x 70   ) mm  = (  2.05 x 2.76  ) in
2346
-		'PA9'                    => array(   99.213,   147.402), // = (   35 x 52   ) mm  = (  1.38 x 2.05  ) in
2347
-		'PA10'                   => array(   73.701,    99.213), // = (   26 x 35   ) mm  = (  1.02 x 1.38  ) in
2337
+		'PA0'                    => array(2381.102, 3174.803), // = (  840 x 1120 ) mm  = ( 33.07 x 44.09 ) in
2338
+		'PA1'                    => array(1587.402, 2381.102), // = (  560 x 840  ) mm  = ( 22.05 x 33.07 ) in
2339
+		'PA2'                    => array(1190.551, 1587.402), // = (  420 x 560  ) mm  = ( 16.54 x 22.05 ) in
2340
+		'PA3'                    => array(793.701, 1190.551), // = (  280 x 420  ) mm  = ( 11.02 x 16.54 ) in
2341
+		'PA4'                    => array(595.276, 793.701), // = (  210 x 280  ) mm  = (  8.27 x 11.02 ) in
2342
+		'PA5'                    => array(396.850, 595.276), // = (  140 x 210  ) mm  = (  5.51 x 8.27  ) in
2343
+		'PA6'                    => array(297.638, 396.850), // = (  105 x 140  ) mm  = (  4.13 x 5.51  ) in
2344
+		'PA7'                    => array(198.425, 297.638), // = (   70 x 105  ) mm  = (  2.76 x 4.13  ) in
2345
+		'PA8'                    => array(147.402, 198.425), // = (   52 x 70   ) mm  = (  2.05 x 2.76  ) in
2346
+		'PA9'                    => array(99.213, 147.402), // = (   35 x 52   ) mm  = (  1.38 x 2.05  ) in
2347
+		'PA10'                   => array(73.701, 99.213), // = (   26 x 35   ) mm  = (  1.02 x 1.38  ) in
2348 2348
 		// Standard Photographic Print Sizes
2349
-		'PASSPORT_PHOTO'         => array(   99.213,   127.559), // = (   35 x 45   ) mm  = (  1.38 x 1.77  ) in
2350
-		'E'                      => array(  233.858,   340.157), // = (   82 x 120  ) mm  = (  3.25 x 4.72  ) in
2351
-		'L'                      => array(  252.283,   360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
2352
-		'3R'                     => array(  252.283,   360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
2353
-		'KG'                     => array(  289.134,   430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
2354
-		'4R'                     => array(  289.134,   430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
2355
-		'4D'                     => array(  340.157,   430.866), // = (  120 x 152  ) mm  = (  4.72 x 5.98  ) in
2356
-		'2L'                     => array(  360.000,   504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
2357
-		'5R'                     => array(  360.000,   504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
2358
-		'8P'                     => array(  430.866,   575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
2359
-		'6R'                     => array(  430.866,   575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
2360
-		'6P'                     => array(  575.433,   720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
2361
-		'8R'                     => array(  575.433,   720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
2362
-		'6PW'                    => array(  575.433,   864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
2363
-		'S8R'                    => array(  575.433,   864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
2364
-		'4P'                     => array(  720.000,   864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
2365
-		'10R'                    => array(  720.000,   864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
2366
-		'4PW'                    => array(  720.000,  1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
2367
-		'S10R'                   => array(  720.000,  1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
2368
-		'11R'                    => array(  790.866,  1009.134), // = (  279 x 356  ) mm  = ( 10.98 x 14.02 ) in
2369
-		'S11R'                   => array(  790.866,  1224.567), // = (  279 x 432  ) mm  = ( 10.98 x 17.01 ) in
2370
-		'12R'                    => array(  864.567,  1080.000), // = (  305 x 381  ) mm  = ( 12.01 x 15.00 ) in
2371
-		'S12R'                   => array(  864.567,  1292.598), // = (  305 x 456  ) mm  = ( 12.01 x 17.95 ) in
2349
+		'PASSPORT_PHOTO'         => array(99.213, 127.559), // = (   35 x 45   ) mm  = (  1.38 x 1.77  ) in
2350
+		'E'                      => array(233.858, 340.157), // = (   82 x 120  ) mm  = (  3.25 x 4.72  ) in
2351
+		'L'                      => array(252.283, 360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
2352
+		'3R'                     => array(252.283, 360.000), // = (   89 x 127  ) mm  = (  3.50 x 5.00  ) in
2353
+		'KG'                     => array(289.134, 430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
2354
+		'4R'                     => array(289.134, 430.866), // = (  102 x 152  ) mm  = (  4.02 x 5.98  ) in
2355
+		'4D'                     => array(340.157, 430.866), // = (  120 x 152  ) mm  = (  4.72 x 5.98  ) in
2356
+		'2L'                     => array(360.000, 504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
2357
+		'5R'                     => array(360.000, 504.567), // = (  127 x 178  ) mm  = (  5.00 x 7.01  ) in
2358
+		'8P'                     => array(430.866, 575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
2359
+		'6R'                     => array(430.866, 575.433), // = (  152 x 203  ) mm  = (  5.98 x 7.99  ) in
2360
+		'6P'                     => array(575.433, 720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
2361
+		'8R'                     => array(575.433, 720.000), // = (  203 x 254  ) mm  = (  7.99 x 10.00 ) in
2362
+		'6PW'                    => array(575.433, 864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
2363
+		'S8R'                    => array(575.433, 864.567), // = (  203 x 305  ) mm  = (  7.99 x 12.01 ) in
2364
+		'4P'                     => array(720.000, 864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
2365
+		'10R'                    => array(720.000, 864.567), // = (  254 x 305  ) mm  = ( 10.00 x 12.01 ) in
2366
+		'4PW'                    => array(720.000, 1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
2367
+		'S10R'                   => array(720.000, 1080.000), // = (  254 x 381  ) mm  = ( 10.00 x 15.00 ) in
2368
+		'11R'                    => array(790.866, 1009.134), // = (  279 x 356  ) mm  = ( 10.98 x 14.02 ) in
2369
+		'S11R'                   => array(790.866, 1224.567), // = (  279 x 432  ) mm  = ( 10.98 x 17.01 ) in
2370
+		'12R'                    => array(864.567, 1080.000), // = (  305 x 381  ) mm  = ( 12.01 x 15.00 ) in
2371
+		'S12R'                   => array(864.567, 1292.598), // = (  305 x 456  ) mm  = ( 12.01 x 17.95 ) in
2372 2372
 		// Common Newspaper Sizes
2373
-		'NEWSPAPER_BROADSHEET'   => array( 2125.984,  1700.787), // = (  750 x 600  ) mm  = ( 29.53 x 23.62 ) in
2374
-		'NEWSPAPER_BERLINER'     => array( 1332.283,   892.913), // = (  470 x 315  ) mm  = ( 18.50 x 12.40 ) in
2375
-		'NEWSPAPER_TABLOID'      => array( 1218.898,   793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
2376
-		'NEWSPAPER_COMPACT'      => array( 1218.898,   793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
2373
+		'NEWSPAPER_BROADSHEET'   => array(2125.984, 1700.787), // = (  750 x 600  ) mm  = ( 29.53 x 23.62 ) in
2374
+		'NEWSPAPER_BERLINER'     => array(1332.283, 892.913), // = (  470 x 315  ) mm  = ( 18.50 x 12.40 ) in
2375
+		'NEWSPAPER_TABLOID'      => array(1218.898, 793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
2376
+		'NEWSPAPER_COMPACT'      => array(1218.898, 793.701), // = (  430 x 280  ) mm  = ( 16.93 x 11.02 ) in
2377 2377
 		// Business Cards
2378
-		'CREDIT_CARD'            => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
2379
-		'BUSINESS_CARD'          => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
2380
-		'BUSINESS_CARD_ISO7810'  => array(  153.014,   242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
2381
-		'BUSINESS_CARD_ISO216'   => array(  147.402,   209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
2382
-		'BUSINESS_CARD_IT'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2383
-		'BUSINESS_CARD_UK'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2384
-		'BUSINESS_CARD_FR'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2385
-		'BUSINESS_CARD_DE'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2386
-		'BUSINESS_CARD_ES'       => array(  155.906,   240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2387
-		'BUSINESS_CARD_CA'       => array(  144.567,   252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
2388
-		'BUSINESS_CARD_US'       => array(  144.567,   252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
2389
-		'BUSINESS_CARD_JP'       => array(  155.906,   257.953), // = (   55 x 91   ) mm  = (  2.17 x 3.58  ) in
2390
-		'BUSINESS_CARD_HK'       => array(  153.071,   255.118), // = (   54 x 90   ) mm  = (  2.13 x 3.54  ) in
2391
-		'BUSINESS_CARD_AU'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
2392
-		'BUSINESS_CARD_DK'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
2393
-		'BUSINESS_CARD_SE'       => array(  155.906,   255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
2394
-		'BUSINESS_CARD_RU'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2395
-		'BUSINESS_CARD_CZ'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2396
-		'BUSINESS_CARD_FI'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2397
-		'BUSINESS_CARD_HU'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2398
-		'BUSINESS_CARD_IL'       => array(  141.732,   255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2378
+		'CREDIT_CARD'            => array(153.014, 242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
2379
+		'BUSINESS_CARD'          => array(153.014, 242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
2380
+		'BUSINESS_CARD_ISO7810'  => array(153.014, 242.646), // = (   54 x 86   ) mm  = (  2.13 x 3.37  ) in
2381
+		'BUSINESS_CARD_ISO216'   => array(147.402, 209.764), // = (   52 x 74   ) mm  = (  2.05 x 2.91  ) in
2382
+		'BUSINESS_CARD_IT'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2383
+		'BUSINESS_CARD_UK'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2384
+		'BUSINESS_CARD_FR'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2385
+		'BUSINESS_CARD_DE'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2386
+		'BUSINESS_CARD_ES'       => array(155.906, 240.945), // = (   55 x 85   ) mm  = (  2.17 x 3.35  ) in
2387
+		'BUSINESS_CARD_CA'       => array(144.567, 252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
2388
+		'BUSINESS_CARD_US'       => array(144.567, 252.283), // = (   51 x 89   ) mm  = (  2.01 x 3.50  ) in
2389
+		'BUSINESS_CARD_JP'       => array(155.906, 257.953), // = (   55 x 91   ) mm  = (  2.17 x 3.58  ) in
2390
+		'BUSINESS_CARD_HK'       => array(153.071, 255.118), // = (   54 x 90   ) mm  = (  2.13 x 3.54  ) in
2391
+		'BUSINESS_CARD_AU'       => array(155.906, 255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
2392
+		'BUSINESS_CARD_DK'       => array(155.906, 255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
2393
+		'BUSINESS_CARD_SE'       => array(155.906, 255.118), // = (   55 x 90   ) mm  = (  2.17 x 3.54  ) in
2394
+		'BUSINESS_CARD_RU'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2395
+		'BUSINESS_CARD_CZ'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2396
+		'BUSINESS_CARD_FI'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2397
+		'BUSINESS_CARD_HU'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2398
+		'BUSINESS_CARD_IL'       => array(141.732, 255.118), // = (   50 x 90   ) mm  = (  1.97 x 3.54  ) in
2399 2399
 		// Billboards
2400
-		'4SHEET'                 => array( 2880.000,  4320.000), // = ( 1016 x 1524 ) mm  = ( 40.00 x 60.00 ) in
2401
-		'6SHEET'                 => array( 3401.575,  5102.362), // = ( 1200 x 1800 ) mm  = ( 47.24 x 70.87 ) in
2402
-		'12SHEET'                => array( 8640.000,  4320.000), // = ( 3048 x 1524 ) mm  = (120.00 x 60.00 ) in
2403
-		'16SHEET'                => array( 5760.000,  8640.000), // = ( 2032 x 3048 ) mm  = ( 80.00 x 120.00) in
2404
-		'32SHEET'                => array(11520.000,  8640.000), // = ( 4064 x 3048 ) mm  = (160.00 x 120.00) in
2405
-		'48SHEET'                => array(17280.000,  8640.000), // = ( 6096 x 3048 ) mm  = (240.00 x 120.00) in
2406
-		'64SHEET'                => array(23040.000,  8640.000), // = ( 8128 x 3048 ) mm  = (320.00 x 120.00) in
2407
-		'96SHEET'                => array(34560.000,  8640.000), // = (12192 x 3048 ) mm  = (480.00 x 120.00) in
2400
+		'4SHEET'                 => array(2880.000, 4320.000), // = ( 1016 x 1524 ) mm  = ( 40.00 x 60.00 ) in
2401
+		'6SHEET'                 => array(3401.575, 5102.362), // = ( 1200 x 1800 ) mm  = ( 47.24 x 70.87 ) in
2402
+		'12SHEET'                => array(8640.000, 4320.000), // = ( 3048 x 1524 ) mm  = (120.00 x 60.00 ) in
2403
+		'16SHEET'                => array(5760.000, 8640.000), // = ( 2032 x 3048 ) mm  = ( 80.00 x 120.00) in
2404
+		'32SHEET'                => array(11520.000, 8640.000), // = ( 4064 x 3048 ) mm  = (160.00 x 120.00) in
2405
+		'48SHEET'                => array(17280.000, 8640.000), // = ( 6096 x 3048 ) mm  = (240.00 x 120.00) in
2406
+		'64SHEET'                => array(23040.000, 8640.000), // = ( 8128 x 3048 ) mm  = (320.00 x 120.00) in
2407
+		'96SHEET'                => array(34560.000, 8640.000), // = (12192 x 3048 ) mm  = (480.00 x 120.00) in
2408 2408
 		// -- Old European Sizes
2409 2409
 		// - Old Imperial English Sizes
2410
-		'EN_EMPEROR'             => array( 3456.000,  5184.000), // = ( 1219 x 1829 ) mm  = ( 48.00 x 72.00 ) in
2411
-		'EN_ANTIQUARIAN'         => array( 2232.000,  3816.000), // = (  787 x 1346 ) mm  = ( 31.00 x 53.00 ) in
2412
-		'EN_GRAND_EAGLE'         => array( 2070.000,  3024.000), // = (  730 x 1067 ) mm  = ( 28.75 x 42.00 ) in
2413
-		'EN_DOUBLE_ELEPHANT'     => array( 1926.000,  2880.000), // = (  679 x 1016 ) mm  = ( 26.75 x 40.00 ) in
2414
-		'EN_ATLAS'               => array( 1872.000,  2448.000), // = (  660 x 864  ) mm  = ( 26.00 x 34.00 ) in
2415
-		'EN_COLOMBIER'           => array( 1692.000,  2484.000), // = (  597 x 876  ) mm  = ( 23.50 x 34.50 ) in
2416
-		'EN_ELEPHANT'            => array( 1656.000,  2016.000), // = (  584 x 711  ) mm  = ( 23.00 x 28.00 ) in
2417
-		'EN_DOUBLE_DEMY'         => array( 1620.000,  2556.000), // = (  572 x 902  ) mm  = ( 22.50 x 35.50 ) in
2418
-		'EN_IMPERIAL'            => array( 1584.000,  2160.000), // = (  559 x 762  ) mm  = ( 22.00 x 30.00 ) in
2419
-		'EN_PRINCESS'            => array( 1548.000,  2016.000), // = (  546 x 711  ) mm  = ( 21.50 x 28.00 ) in
2420
-		'EN_CARTRIDGE'           => array( 1512.000,  1872.000), // = (  533 x 660  ) mm  = ( 21.00 x 26.00 ) in
2421
-		'EN_DOUBLE_LARGE_POST'   => array( 1512.000,  2376.000), // = (  533 x 838  ) mm  = ( 21.00 x 33.00 ) in
2422
-		'EN_ROYAL'               => array( 1440.000,  1800.000), // = (  508 x 635  ) mm  = ( 20.00 x 25.00 ) in
2423
-		'EN_SHEET'               => array( 1404.000,  1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
2424
-		'EN_HALF_POST'           => array( 1404.000,  1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
2425
-		'EN_SUPER_ROYAL'         => array( 1368.000,  1944.000), // = (  483 x 686  ) mm  = ( 19.00 x 27.00 ) in
2426
-		'EN_DOUBLE_POST'         => array( 1368.000,  2196.000), // = (  483 x 775  ) mm  = ( 19.00 x 30.50 ) in
2427
-		'EN_MEDIUM'              => array( 1260.000,  1656.000), // = (  445 x 584  ) mm  = ( 17.50 x 23.00 ) in
2428
-		'EN_DEMY'                => array( 1260.000,  1620.000), // = (  445 x 572  ) mm  = ( 17.50 x 22.50 ) in
2429
-		'EN_LARGE_POST'          => array( 1188.000,  1512.000), // = (  419 x 533  ) mm  = ( 16.50 x 21.00 ) in
2430
-		'EN_COPY_DRAUGHT'        => array( 1152.000,  1440.000), // = (  406 x 508  ) mm  = ( 16.00 x 20.00 ) in
2431
-		'EN_POST'                => array( 1116.000,  1386.000), // = (  394 x 489  ) mm  = ( 15.50 x 19.25 ) in
2432
-		'EN_CROWN'               => array( 1080.000,  1440.000), // = (  381 x 508  ) mm  = ( 15.00 x 20.00 ) in
2433
-		'EN_PINCHED_POST'        => array( 1062.000,  1332.000), // = (  375 x 470  ) mm  = ( 14.75 x 18.50 ) in
2434
-		'EN_BRIEF'               => array(  972.000,  1152.000), // = (  343 x 406  ) mm  = ( 13.50 x 16.00 ) in
2435
-		'EN_FOOLSCAP'            => array(  972.000,  1224.000), // = (  343 x 432  ) mm  = ( 13.50 x 17.00 ) in
2436
-		'EN_SMALL_FOOLSCAP'      => array(  954.000,  1188.000), // = (  337 x 419  ) mm  = ( 13.25 x 16.50 ) in
2437
-		'EN_POTT'                => array(  900.000,  1080.000), // = (  318 x 381  ) mm  = ( 12.50 x 15.00 ) in
2410
+		'EN_EMPEROR'             => array(3456.000, 5184.000), // = ( 1219 x 1829 ) mm  = ( 48.00 x 72.00 ) in
2411
+		'EN_ANTIQUARIAN'         => array(2232.000, 3816.000), // = (  787 x 1346 ) mm  = ( 31.00 x 53.00 ) in
2412
+		'EN_GRAND_EAGLE'         => array(2070.000, 3024.000), // = (  730 x 1067 ) mm  = ( 28.75 x 42.00 ) in
2413
+		'EN_DOUBLE_ELEPHANT'     => array(1926.000, 2880.000), // = (  679 x 1016 ) mm  = ( 26.75 x 40.00 ) in
2414
+		'EN_ATLAS'               => array(1872.000, 2448.000), // = (  660 x 864  ) mm  = ( 26.00 x 34.00 ) in
2415
+		'EN_COLOMBIER'           => array(1692.000, 2484.000), // = (  597 x 876  ) mm  = ( 23.50 x 34.50 ) in
2416
+		'EN_ELEPHANT'            => array(1656.000, 2016.000), // = (  584 x 711  ) mm  = ( 23.00 x 28.00 ) in
2417
+		'EN_DOUBLE_DEMY'         => array(1620.000, 2556.000), // = (  572 x 902  ) mm  = ( 22.50 x 35.50 ) in
2418
+		'EN_IMPERIAL'            => array(1584.000, 2160.000), // = (  559 x 762  ) mm  = ( 22.00 x 30.00 ) in
2419
+		'EN_PRINCESS'            => array(1548.000, 2016.000), // = (  546 x 711  ) mm  = ( 21.50 x 28.00 ) in
2420
+		'EN_CARTRIDGE'           => array(1512.000, 1872.000), // = (  533 x 660  ) mm  = ( 21.00 x 26.00 ) in
2421
+		'EN_DOUBLE_LARGE_POST'   => array(1512.000, 2376.000), // = (  533 x 838  ) mm  = ( 21.00 x 33.00 ) in
2422
+		'EN_ROYAL'               => array(1440.000, 1800.000), // = (  508 x 635  ) mm  = ( 20.00 x 25.00 ) in
2423
+		'EN_SHEET'               => array(1404.000, 1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
2424
+		'EN_HALF_POST'           => array(1404.000, 1692.000), // = (  495 x 597  ) mm  = ( 19.50 x 23.50 ) in
2425
+		'EN_SUPER_ROYAL'         => array(1368.000, 1944.000), // = (  483 x 686  ) mm  = ( 19.00 x 27.00 ) in
2426
+		'EN_DOUBLE_POST'         => array(1368.000, 2196.000), // = (  483 x 775  ) mm  = ( 19.00 x 30.50 ) in
2427
+		'EN_MEDIUM'              => array(1260.000, 1656.000), // = (  445 x 584  ) mm  = ( 17.50 x 23.00 ) in
2428
+		'EN_DEMY'                => array(1260.000, 1620.000), // = (  445 x 572  ) mm  = ( 17.50 x 22.50 ) in
2429
+		'EN_LARGE_POST'          => array(1188.000, 1512.000), // = (  419 x 533  ) mm  = ( 16.50 x 21.00 ) in
2430
+		'EN_COPY_DRAUGHT'        => array(1152.000, 1440.000), // = (  406 x 508  ) mm  = ( 16.00 x 20.00 ) in
2431
+		'EN_POST'                => array(1116.000, 1386.000), // = (  394 x 489  ) mm  = ( 15.50 x 19.25 ) in
2432
+		'EN_CROWN'               => array(1080.000, 1440.000), // = (  381 x 508  ) mm  = ( 15.00 x 20.00 ) in
2433
+		'EN_PINCHED_POST'        => array(1062.000, 1332.000), // = (  375 x 470  ) mm  = ( 14.75 x 18.50 ) in
2434
+		'EN_BRIEF'               => array(972.000, 1152.000), // = (  343 x 406  ) mm  = ( 13.50 x 16.00 ) in
2435
+		'EN_FOOLSCAP'            => array(972.000, 1224.000), // = (  343 x 432  ) mm  = ( 13.50 x 17.00 ) in
2436
+		'EN_SMALL_FOOLSCAP'      => array(954.000, 1188.000), // = (  337 x 419  ) mm  = ( 13.25 x 16.50 ) in
2437
+		'EN_POTT'                => array(900.000, 1080.000), // = (  318 x 381  ) mm  = ( 12.50 x 15.00 ) in
2438 2438
 		// - Old Imperial Belgian Sizes
2439
-		'BE_GRAND_AIGLE'         => array( 1984.252,  2948.031), // = (  700 x 1040 ) mm  = ( 27.56 x 40.94 ) in
2440
-		'BE_COLOMBIER'           => array( 1757.480,  2409.449), // = (  620 x 850  ) mm  = ( 24.41 x 33.46 ) in
2441
-		'BE_DOUBLE_CARRE'        => array( 1757.480,  2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
2442
-		'BE_ELEPHANT'            => array( 1746.142,  2182.677), // = (  616 x 770  ) mm  = ( 24.25 x 30.31 ) in
2443
-		'BE_PETIT_AIGLE'         => array( 1700.787,  2381.102), // = (  600 x 840  ) mm  = ( 23.62 x 33.07 ) in
2444
-		'BE_GRAND_JESUS'         => array( 1559.055,  2069.291), // = (  550 x 730  ) mm  = ( 21.65 x 28.74 ) in
2445
-		'BE_JESUS'               => array( 1530.709,  2069.291), // = (  540 x 730  ) mm  = ( 21.26 x 28.74 ) in
2446
-		'BE_RAISIN'              => array( 1417.323,  1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
2447
-		'BE_GRAND_MEDIAN'        => array( 1303.937,  1714.961), // = (  460 x 605  ) mm  = ( 18.11 x 23.82 ) in
2448
-		'BE_DOUBLE_POSTE'        => array( 1233.071,  1601.575), // = (  435 x 565  ) mm  = ( 17.13 x 22.24 ) in
2449
-		'BE_COQUILLE'            => array( 1218.898,  1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
2450
-		'BE_PETIT_MEDIAN'        => array( 1176.378,  1502.362), // = (  415 x 530  ) mm  = ( 16.34 x 20.87 ) in
2451
-		'BE_RUCHE'               => array( 1020.472,  1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
2452
-		'BE_PROPATRIA'           => array(  977.953,  1218.898), // = (  345 x 430  ) mm  = ( 13.58 x 16.93 ) in
2453
-		'BE_LYS'                 => array(  898.583,  1125.354), // = (  317 x 397  ) mm  = ( 12.48 x 15.63 ) in
2454
-		'BE_POT'                 => array(  870.236,  1088.504), // = (  307 x 384  ) mm  = ( 12.09 x 15.12 ) in
2455
-		'BE_ROSETTE'             => array(  765.354,   983.622), // = (  270 x 347  ) mm  = ( 10.63 x 13.66 ) in
2439
+		'BE_GRAND_AIGLE'         => array(1984.252, 2948.031), // = (  700 x 1040 ) mm  = ( 27.56 x 40.94 ) in
2440
+		'BE_COLOMBIER'           => array(1757.480, 2409.449), // = (  620 x 850  ) mm  = ( 24.41 x 33.46 ) in
2441
+		'BE_DOUBLE_CARRE'        => array(1757.480, 2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
2442
+		'BE_ELEPHANT'            => array(1746.142, 2182.677), // = (  616 x 770  ) mm  = ( 24.25 x 30.31 ) in
2443
+		'BE_PETIT_AIGLE'         => array(1700.787, 2381.102), // = (  600 x 840  ) mm  = ( 23.62 x 33.07 ) in
2444
+		'BE_GRAND_JESUS'         => array(1559.055, 2069.291), // = (  550 x 730  ) mm  = ( 21.65 x 28.74 ) in
2445
+		'BE_JESUS'               => array(1530.709, 2069.291), // = (  540 x 730  ) mm  = ( 21.26 x 28.74 ) in
2446
+		'BE_RAISIN'              => array(1417.323, 1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
2447
+		'BE_GRAND_MEDIAN'        => array(1303.937, 1714.961), // = (  460 x 605  ) mm  = ( 18.11 x 23.82 ) in
2448
+		'BE_DOUBLE_POSTE'        => array(1233.071, 1601.575), // = (  435 x 565  ) mm  = ( 17.13 x 22.24 ) in
2449
+		'BE_COQUILLE'            => array(1218.898, 1587.402), // = (  430 x 560  ) mm  = ( 16.93 x 22.05 ) in
2450
+		'BE_PETIT_MEDIAN'        => array(1176.378, 1502.362), // = (  415 x 530  ) mm  = ( 16.34 x 20.87 ) in
2451
+		'BE_RUCHE'               => array(1020.472, 1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
2452
+		'BE_PROPATRIA'           => array(977.953, 1218.898), // = (  345 x 430  ) mm  = ( 13.58 x 16.93 ) in
2453
+		'BE_LYS'                 => array(898.583, 1125.354), // = (  317 x 397  ) mm  = ( 12.48 x 15.63 ) in
2454
+		'BE_POT'                 => array(870.236, 1088.504), // = (  307 x 384  ) mm  = ( 12.09 x 15.12 ) in
2455
+		'BE_ROSETTE'             => array(765.354, 983.622), // = (  270 x 347  ) mm  = ( 10.63 x 13.66 ) in
2456 2456
 		// - Old Imperial French Sizes
2457
-		'FR_UNIVERS'             => array( 2834.646,  3685.039), // = ( 1000 x 1300 ) mm  = ( 39.37 x 51.18 ) in
2458
-		'FR_DOUBLE_COLOMBIER'    => array( 2551.181,  3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
2459
-		'FR_GRANDE_MONDE'        => array( 2551.181,  3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
2460
-		'FR_DOUBLE_SOLEIL'       => array( 2267.717,  3401.575), // = (  800 x 1200 ) mm  = ( 31.50 x 47.24 ) in
2461
-		'FR_DOUBLE_JESUS'        => array( 2154.331,  3174.803), // = (  760 x 1120 ) mm  = ( 29.92 x 44.09 ) in
2462
-		'FR_GRAND_AIGLE'         => array( 2125.984,  3004.724), // = (  750 x 1060 ) mm  = ( 29.53 x 41.73 ) in
2463
-		'FR_PETIT_AIGLE'         => array( 1984.252,  2664.567), // = (  700 x 940  ) mm  = ( 27.56 x 37.01 ) in
2464
-		'FR_DOUBLE_RAISIN'       => array( 1842.520,  2834.646), // = (  650 x 1000 ) mm  = ( 25.59 x 39.37 ) in
2465
-		'FR_JOURNAL'             => array( 1842.520,  2664.567), // = (  650 x 940  ) mm  = ( 25.59 x 37.01 ) in
2466
-		'FR_COLOMBIER_AFFICHE'   => array( 1785.827,  2551.181), // = (  630 x 900  ) mm  = ( 24.80 x 35.43 ) in
2467
-		'FR_DOUBLE_CAVALIER'     => array( 1757.480,  2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
2468
-		'FR_CLOCHE'              => array( 1700.787,  2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
2469
-		'FR_SOLEIL'              => array( 1700.787,  2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
2470
-		'FR_DOUBLE_CARRE'        => array( 1587.402,  2551.181), // = (  560 x 900  ) mm  = ( 22.05 x 35.43 ) in
2471
-		'FR_DOUBLE_COQUILLE'     => array( 1587.402,  2494.488), // = (  560 x 880  ) mm  = ( 22.05 x 34.65 ) in
2472
-		'FR_JESUS'               => array( 1587.402,  2154.331), // = (  560 x 760  ) mm  = ( 22.05 x 29.92 ) in
2473
-		'FR_RAISIN'              => array( 1417.323,  1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
2474
-		'FR_CAVALIER'            => array( 1303.937,  1757.480), // = (  460 x 620  ) mm  = ( 18.11 x 24.41 ) in
2475
-		'FR_DOUBLE_COURONNE'     => array( 1303.937,  2040.945), // = (  460 x 720  ) mm  = ( 18.11 x 28.35 ) in
2476
-		'FR_CARRE'               => array( 1275.591,  1587.402), // = (  450 x 560  ) mm  = ( 17.72 x 22.05 ) in
2477
-		'FR_COQUILLE'            => array( 1247.244,  1587.402), // = (  440 x 560  ) mm  = ( 17.32 x 22.05 ) in
2478
-		'FR_DOUBLE_TELLIERE'     => array( 1247.244,  1927.559), // = (  440 x 680  ) mm  = ( 17.32 x 26.77 ) in
2479
-		'FR_DOUBLE_CLOCHE'       => array( 1133.858,  1700.787), // = (  400 x 600  ) mm  = ( 15.75 x 23.62 ) in
2480
-		'FR_DOUBLE_POT'          => array( 1133.858,  1757.480), // = (  400 x 620  ) mm  = ( 15.75 x 24.41 ) in
2481
-		'FR_ECU'                 => array( 1133.858,  1474.016), // = (  400 x 520  ) mm  = ( 15.75 x 20.47 ) in
2482
-		'FR_COURONNE'            => array( 1020.472,  1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
2483
-		'FR_TELLIERE'            => array(  963.780,  1247.244), // = (  340 x 440  ) mm  = ( 13.39 x 17.32 ) in
2484
-		'FR_POT'                 => array(  878.740,  1133.858), // = (  310 x 400  ) mm  = ( 12.20 x 15.75 ) in
2457
+		'FR_UNIVERS'             => array(2834.646, 3685.039), // = ( 1000 x 1300 ) mm  = ( 39.37 x 51.18 ) in
2458
+		'FR_DOUBLE_COLOMBIER'    => array(2551.181, 3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
2459
+		'FR_GRANDE_MONDE'        => array(2551.181, 3571.654), // = (  900 x 1260 ) mm  = ( 35.43 x 49.61 ) in
2460
+		'FR_DOUBLE_SOLEIL'       => array(2267.717, 3401.575), // = (  800 x 1200 ) mm  = ( 31.50 x 47.24 ) in
2461
+		'FR_DOUBLE_JESUS'        => array(2154.331, 3174.803), // = (  760 x 1120 ) mm  = ( 29.92 x 44.09 ) in
2462
+		'FR_GRAND_AIGLE'         => array(2125.984, 3004.724), // = (  750 x 1060 ) mm  = ( 29.53 x 41.73 ) in
2463
+		'FR_PETIT_AIGLE'         => array(1984.252, 2664.567), // = (  700 x 940  ) mm  = ( 27.56 x 37.01 ) in
2464
+		'FR_DOUBLE_RAISIN'       => array(1842.520, 2834.646), // = (  650 x 1000 ) mm  = ( 25.59 x 39.37 ) in
2465
+		'FR_JOURNAL'             => array(1842.520, 2664.567), // = (  650 x 940  ) mm  = ( 25.59 x 37.01 ) in
2466
+		'FR_COLOMBIER_AFFICHE'   => array(1785.827, 2551.181), // = (  630 x 900  ) mm  = ( 24.80 x 35.43 ) in
2467
+		'FR_DOUBLE_CAVALIER'     => array(1757.480, 2607.874), // = (  620 x 920  ) mm  = ( 24.41 x 36.22 ) in
2468
+		'FR_CLOCHE'              => array(1700.787, 2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
2469
+		'FR_SOLEIL'              => array(1700.787, 2267.717), // = (  600 x 800  ) mm  = ( 23.62 x 31.50 ) in
2470
+		'FR_DOUBLE_CARRE'        => array(1587.402, 2551.181), // = (  560 x 900  ) mm  = ( 22.05 x 35.43 ) in
2471
+		'FR_DOUBLE_COQUILLE'     => array(1587.402, 2494.488), // = (  560 x 880  ) mm  = ( 22.05 x 34.65 ) in
2472
+		'FR_JESUS'               => array(1587.402, 2154.331), // = (  560 x 760  ) mm  = ( 22.05 x 29.92 ) in
2473
+		'FR_RAISIN'              => array(1417.323, 1842.520), // = (  500 x 650  ) mm  = ( 19.69 x 25.59 ) in
2474
+		'FR_CAVALIER'            => array(1303.937, 1757.480), // = (  460 x 620  ) mm  = ( 18.11 x 24.41 ) in
2475
+		'FR_DOUBLE_COURONNE'     => array(1303.937, 2040.945), // = (  460 x 720  ) mm  = ( 18.11 x 28.35 ) in
2476
+		'FR_CARRE'               => array(1275.591, 1587.402), // = (  450 x 560  ) mm  = ( 17.72 x 22.05 ) in
2477
+		'FR_COQUILLE'            => array(1247.244, 1587.402), // = (  440 x 560  ) mm  = ( 17.32 x 22.05 ) in
2478
+		'FR_DOUBLE_TELLIERE'     => array(1247.244, 1927.559), // = (  440 x 680  ) mm  = ( 17.32 x 26.77 ) in
2479
+		'FR_DOUBLE_CLOCHE'       => array(1133.858, 1700.787), // = (  400 x 600  ) mm  = ( 15.75 x 23.62 ) in
2480
+		'FR_DOUBLE_POT'          => array(1133.858, 1757.480), // = (  400 x 620  ) mm  = ( 15.75 x 24.41 ) in
2481
+		'FR_ECU'                 => array(1133.858, 1474.016), // = (  400 x 520  ) mm  = ( 15.75 x 20.47 ) in
2482
+		'FR_COURONNE'            => array(1020.472, 1303.937), // = (  360 x 460  ) mm  = ( 14.17 x 18.11 ) in
2483
+		'FR_TELLIERE'            => array(963.780, 1247.244), // = (  340 x 440  ) mm  = ( 13.39 x 17.32 ) in
2484
+		'FR_POT'                 => array(878.740, 1133.858), // = (  310 x 400  ) mm  = ( 12.20 x 15.75 ) in
2485 2485
 	);
2486 2486
 
2487 2487
 
@@ -2514,7 +2514,7 @@  discard block
 block discarded – undo
2514 2514
 	 * @since 5.0.010 (2010-05-17)
2515 2515
 	 * @public static
2516 2516
 	 */
2517
-	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points, $k, $pagedim=array()) {
2517
+	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points, $k, $pagedim = array()) {
2518 2518
 		if (!isset($pagedim[$page])) {
2519 2519
 			// initialize array
2520 2520
 			$pagedim[$page] = array();
@@ -2561,7 +2561,7 @@  discard block
 block discarded – undo
2561 2561
 	 * @return string Canonical page layout name.
2562 2562
 	 * @public static
2563 2563
 	 */
2564
-	public static function getPageLayoutMode($layout='SinglePage') {
2564
+	public static function getPageLayoutMode($layout = 'SinglePage') {
2565 2565
 		switch ($layout) {
2566 2566
 			case 'default':
2567 2567
 			case 'single':
@@ -2604,7 +2604,7 @@  discard block
 block discarded – undo
2604 2604
 	 * @return string Canonical page mode name.
2605 2605
 	 * @public static
2606 2606
 	 */
2607
-	public static function getPageMode($mode='UseNone') {
2607
+	public static function getPageMode($mode = 'UseNone') {
2608 2608
 		switch ($mode) {
2609 2609
 			case 'UseNone': {
2610 2610
 				$page_mode = 'UseNone';
Please login to merge, or discard this patch.
Upper-Lower-Casing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	 * @public static
180 180
 	 */
181 181
 	public static function getBorderMode($brd, $position='start', $opencell=true) {
182
-		if ((!$opencell) OR empty($brd)) {
182
+		if ((!$opencell) or empty($brd)) {
183 183
 			return $brd;
184 184
 		}
185 185
 		if ($brd == 1) {
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	 * @public static
252 252
 	 */
253 253
 	public static function empty_string($str) {
254
-		return (is_null($str) OR (is_string($str) AND (strlen($str) == 0)));
254
+		return (is_null($str) or (is_string($str) and (strlen($str) == 0)));
255 255
 	}
256 256
 
257 257
 	/**
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 	 * @public static
299 299
 	 */
300 300
 	public static function objclone($object) {
301
-		if (($object instanceof Imagick) AND (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
301
+		if (($object instanceof Imagick) and (version_compare(phpversion('imagick'), '3.0.1') !== 1)) {
302 302
 			// on the versions after 3.0.1 the clone() method was deprecated in favour of clone keyword
303 303
 			return @$object->clone();
304 304
 		}
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 	 * @public static
314 314
 	 */
315 315
 	public static function sendOutputData($data, $length) {
316
-		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) OR empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
316
+		if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']) or empty($_SERVER['HTTP_ACCEPT_ENCODING'])) {
317 317
 			// the content length may vary if the server is using compression
318 318
 			header('Content-Length: '.$length);
319 319
 		}
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 	 * @public static
349 349
 	 */
350 350
 	public static function getTimestamp($date) {
351
-		if (($date[0] == 'D') AND ($date[1] == ':')) {
351
+		if (($date[0] == 'D') and ($date[1] == ':')) {
352 352
 			// remove date prefix if present
353 353
 			$date = substr($date, 2);
354 354
 		}
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
 		if (function_exists('posix_getpid')) {
380 380
 			$rnd .= posix_getpid();
381 381
 		}
382
-		if (function_exists('openssl_random_pseudo_bytes') AND (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
382
+		if (function_exists('openssl_random_pseudo_bytes') and (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')) {
383 383
 			// this is not used on windows systems because it is very slow for a know bug
384 384
 			$rnd .= openssl_random_pseudo_bytes(512);
385 385
 		} else {
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 	 * @public static
469 469
 	 */
470 470
 	public static function _RC4($key, $text, &$last_enc_key, &$last_enc_key_c) {
471
-		if (function_exists('mcrypt_encrypt') AND ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
471
+		if (function_exists('mcrypt_encrypt') and ($out = @mcrypt_encrypt(MCRYPT_ARCFOUR, $key, $text, MCRYPT_MODE_STREAM, ''))) {
472 472
 			// try to use mcrypt function if exist
473 473
 			return $out;
474 474
 		}
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 		$protection = 2147422012; // 32 bit: (01111111 11111111 00001111 00111100)
527 527
 		foreach ($permissions as $permission) {
528 528
 			if (isset($options[$permission])) {
529
-				if (($mode > 0) OR ($options[$permission] <= 32)) {
529
+				if (($mode > 0) or ($options[$permission] <= 32)) {
530 530
 					// set only valid permissions
531 531
 					if ($options[$permission] == 2) {
532 532
 						// the logic for bit 2 is inverted (cleared by default)
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
 	 * @public static
630 630
 	 */
631 631
 	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
632
-		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
632
+		if (isset($prop['aopt']) and is_array($prop['aopt'])) {
633 633
 			// the annotation options are already defined
634 634
 			return $prop['aopt'];
635 635
 		}
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 				}
700 700
 			}
701 701
 		}
702
-		if (isset($prop['border']) AND is_array($prop['border'])) {
702
+		if (isset($prop['border']) and is_array($prop['border'])) {
703 703
 			$opt['border'] = $prop['border'];
704 704
 		}
705 705
 		if (!isset($opt['mk'])) {
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 			$opt['mk']['if']['a'][1] = $prop['buttonAlignY'];
719 719
 		}
720 720
 		// buttonFitBounds: If true, the extent to which the icon may be scaled is set to the bounds of the button field.
721
-		if (isset($prop['buttonFitBounds']) AND ($prop['buttonFitBounds'] == 'true')) {
721
+		if (isset($prop['buttonFitBounds']) and ($prop['buttonFitBounds'] == 'true')) {
722 722
 			$opt['mk']['if']['fb'] = true;
723 723
 		}
724 724
 		// buttonScaleHow: Controls how the icon is scaled (if necessary) to fit inside the button face.
@@ -821,75 +821,75 @@  discard block
 block discarded – undo
821 821
 		}
822 822
 		$ff = 0;
823 823
 		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
824
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
824
+		if (isset($prop['readonly']) and ($prop['readonly'] == 'true')) {
825 825
 			$ff += 1 << 0;
826 826
 		}
827 827
 		// required: Specifies whether a field requires a value.
828
-		if (isset($prop['required']) AND ($prop['required'] == 'true')) {
828
+		if (isset($prop['required']) and ($prop['required'] == 'true')) {
829 829
 			$ff += 1 << 1;
830 830
 		}
831 831
 		// multiline: Controls how text is wrapped within the field.
832
-		if (isset($prop['multiline']) AND ($prop['multiline'] == 'true')) {
832
+		if (isset($prop['multiline']) and ($prop['multiline'] == 'true')) {
833 833
 			$ff += 1 << 12;
834 834
 		}
835 835
 		// password: Specifies whether the field should display asterisks when data is entered in the field.
836
-		if (isset($prop['password']) AND ($prop['password'] == 'true')) {
836
+		if (isset($prop['password']) and ($prop['password'] == 'true')) {
837 837
 			$ff += 1 << 13;
838 838
 		}
839 839
 		// NoToggleToOff: If set, exactly one radio button shall be selected at all times; selecting the currently selected button has no effect.
840
-		if (isset($prop['NoToggleToOff']) AND ($prop['NoToggleToOff'] == 'true')) {
840
+		if (isset($prop['NoToggleToOff']) and ($prop['NoToggleToOff'] == 'true')) {
841 841
 			$ff += 1 << 14;
842 842
 		}
843 843
 		// Radio: If set, the field is a set of radio buttons.
844
-		if (isset($prop['Radio']) AND ($prop['Radio'] == 'true')) {
844
+		if (isset($prop['Radio']) and ($prop['Radio'] == 'true')) {
845 845
 			$ff += 1 << 15;
846 846
 		}
847 847
 		// Pushbutton: If set, the field is a pushbutton that does not retain a permanent value.
848
-		if (isset($prop['Pushbutton']) AND ($prop['Pushbutton'] == 'true')) {
848
+		if (isset($prop['Pushbutton']) and ($prop['Pushbutton'] == 'true')) {
849 849
 			$ff += 1 << 16;
850 850
 		}
851 851
 		// Combo: If set, the field is a combo box; if clear, the field is a list box.
852
-		if (isset($prop['Combo']) AND ($prop['Combo'] == 'true')) {
852
+		if (isset($prop['Combo']) and ($prop['Combo'] == 'true')) {
853 853
 			$ff += 1 << 17;
854 854
 		}
855 855
 		// editable: Controls whether a combo box is editable.
856
-		if (isset($prop['editable']) AND ($prop['editable'] == 'true')) {
856
+		if (isset($prop['editable']) and ($prop['editable'] == 'true')) {
857 857
 			$ff += 1 << 18;
858 858
 		}
859 859
 		// Sort: If set, the field's option items shall be sorted alphabetically.
860
-		if (isset($prop['Sort']) AND ($prop['Sort'] == 'true')) {
860
+		if (isset($prop['Sort']) and ($prop['Sort'] == 'true')) {
861 861
 			$ff += 1 << 19;
862 862
 		}
863 863
 		// fileSelect: If true, sets the file-select flag in the Options tab of the text field (Field is Used for File Selection).
864
-		if (isset($prop['fileSelect']) AND ($prop['fileSelect'] == 'true')) {
864
+		if (isset($prop['fileSelect']) and ($prop['fileSelect'] == 'true')) {
865 865
 			$ff += 1 << 20;
866 866
 		}
867 867
 		// multipleSelection: If true, indicates that a list box allows a multiple selection of items.
868
-		if (isset($prop['multipleSelection']) AND ($prop['multipleSelection'] == 'true')) {
868
+		if (isset($prop['multipleSelection']) and ($prop['multipleSelection'] == 'true')) {
869 869
 			$ff += 1 << 21;
870 870
 		}
871 871
 		// doNotSpellCheck: If true, spell checking is not performed on this editable text field.
872
-		if (isset($prop['doNotSpellCheck']) AND ($prop['doNotSpellCheck'] == 'true')) {
872
+		if (isset($prop['doNotSpellCheck']) and ($prop['doNotSpellCheck'] == 'true')) {
873 873
 			$ff += 1 << 22;
874 874
 		}
875 875
 		// doNotScroll: If true, the text field does not scroll and the user, therefore, is limited by the rectangular region designed for the field.
876
-		if (isset($prop['doNotScroll']) AND ($prop['doNotScroll'] == 'true')) {
876
+		if (isset($prop['doNotScroll']) and ($prop['doNotScroll'] == 'true')) {
877 877
 			$ff += 1 << 23;
878 878
 		}
879 879
 		// 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.
880
-		if (isset($prop['comb']) AND ($prop['comb'] == 'true')) {
880
+		if (isset($prop['comb']) and ($prop['comb'] == 'true')) {
881 881
 			$ff += 1 << 24;
882 882
 		}
883 883
 		// 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.
884
-		if (isset($prop['radiosInUnison']) AND ($prop['radiosInUnison'] == 'true')) {
884
+		if (isset($prop['radiosInUnison']) and ($prop['radiosInUnison'] == 'true')) {
885 885
 			$ff += 1 << 25;
886 886
 		}
887 887
 		// richText: If true, the field allows rich text formatting.
888
-		if (isset($prop['richText']) AND ($prop['richText'] == 'true')) {
888
+		if (isset($prop['richText']) and ($prop['richText'] == 'true')) {
889 889
 			$ff += 1 << 25;
890 890
 		}
891 891
 		// commitOnSelChange: Controls whether a field value is committed after a selection change.
892
-		if (isset($prop['commitOnSelChange']) AND ($prop['commitOnSelChange'] == 'true')) {
892
+		if (isset($prop['commitOnSelChange']) and ($prop['commitOnSelChange'] == 'true')) {
893 893
 			$ff += 1 << 26;
894 894
 		}
895 895
 		$opt['ff'] = $ff;
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 		}
900 900
 		$f = 4; // default value for annotation flags
901 901
 		// readonly: The read-only characteristic of a field. If a field is read-only, the user can see the field but cannot change it.
902
-		if (isset($prop['readonly']) AND ($prop['readonly'] == 'true')) {
902
+		if (isset($prop['readonly']) and ($prop['readonly'] == 'true')) {
903 903
 			$f += 1 << 6;
904 904
 		}
905 905
 		// display: Controls whether the field is hidden or visible on screen and in print.
@@ -916,14 +916,14 @@  discard block
 block discarded – undo
916 916
 		}
917 917
 		$opt['f'] = $f;
918 918
 		// currentValueIndices: Reads and writes single or multiple values of a list box or combo box.
919
-		if (isset($prop['currentValueIndices']) AND is_array($prop['currentValueIndices'])) {
919
+		if (isset($prop['currentValueIndices']) and is_array($prop['currentValueIndices'])) {
920 920
 			$opt['i'] = $prop['currentValueIndices'];
921 921
 		}
922 922
 		// value: The value of the field data that the user has entered.
923 923
 		if (isset($prop['value'])) {
924 924
 			if (is_array($prop['value'])) {
925 925
 				$opt['opt'] = array();
926
-				foreach ($prop['value'] AS $key => $optval) {
926
+				foreach ($prop['value'] as $key => $optval) {
927 927
 					// exportValues: An array of strings representing the export values for the field.
928 928
 					if (isset($prop['exportValues'][$key])) {
929 929
 						$opt['opt'][$key] = array($prop['exportValues'][$key], $prop['value'][$key]);
@@ -1046,10 +1046,10 @@  discard block
 block discarded – undo
1046 1046
 			$cssdata = preg_replace('/@media[\s]+([^\§]*)§([^§]*)§/i', '', $cssdata);
1047 1047
 		}
1048 1048
 		// keep 'all' and 'print' media, other media types are discarded
1049
-		if (isset($cssblocks['all']) AND !empty($cssblocks['all'])) {
1049
+		if (isset($cssblocks['all']) and !empty($cssblocks['all'])) {
1050 1050
 			$cssdata .= $cssblocks['all'];
1051 1051
 		}
1052
-		if (isset($cssblocks['print']) AND !empty($cssblocks['print'])) {
1052
+		if (isset($cssblocks['print']) and !empty($cssblocks['print'])) {
1053 1053
 			$cssdata .= $cssblocks['print'];
1054 1054
 		}
1055 1055
 		// reset css blocks array
@@ -1184,11 +1184,11 @@  discard block
 block discarded – undo
1184 1184
 		$valid = false; // value to be returned
1185 1185
 		$tag = $dom[$key]['value'];
1186 1186
 		$class = array();
1187
-		if (isset($dom[$key]['attribute']['class']) AND !empty($dom[$key]['attribute']['class'])) {
1187
+		if (isset($dom[$key]['attribute']['class']) and !empty($dom[$key]['attribute']['class'])) {
1188 1188
 			$class = explode(' ', strtolower($dom[$key]['attribute']['class']));
1189 1189
 		}
1190 1190
 		$id = '';
1191
-		if (isset($dom[$key]['attribute']['id']) AND !empty($dom[$key]['attribute']['id'])) {
1191
+		if (isset($dom[$key]['attribute']['id']) and !empty($dom[$key]['attribute']['id'])) {
1192 1192
 			$id = strtolower($dom[$key]['attribute']['id']);
1193 1193
 		}
1194 1194
 		$selector = preg_replace('/([\>\+\~\s]{1})([\.]{1})([^\>\+\~\s]*)/si', '\\1*.\\3', $selector);
@@ -1199,7 +1199,7 @@  discard block
 block discarded – undo
1199 1199
 			$offset = $parentop[1];
1200 1200
 			$lasttag = array_pop($matches[2]);
1201 1201
 			$lasttag = strtolower(trim($lasttag[0]));
1202
-			if (($lasttag == '*') OR ($lasttag == $tag)) {
1202
+			if (($lasttag == '*') or ($lasttag == $tag)) {
1203 1203
 				// the last element on selector is our tag or 'any tag'
1204 1204
 				$attrib = array_pop($matches[3]);
1205 1205
 				$attrib = strtolower(trim($attrib[0]));
@@ -1285,7 +1285,7 @@  discard block
 block discarded – undo
1285 1285
 				} else {
1286 1286
 					$valid = true;
1287 1287
 				}
1288
-				if ($valid AND ($offset > 0)) {
1288
+				if ($valid and ($offset > 0)) {
1289 1289
 					$valid = false;
1290 1290
 					// check remaining selector part
1291 1291
 					$selector = substr($selector, 0, $offset);
@@ -1307,7 +1307,7 @@  discard block
 block discarded – undo
1307 1307
 						}
1308 1308
 						case '+': { // immediately preceded by an element
1309 1309
 							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
1310
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
1310
+								if ($dom[$i]['tag'] and $dom[$i]['opening']) {
1311 1311
 									$valid = self::isValidCSSSelectorForTag($dom, $i, $selector);
1312 1312
 									break;
1313 1313
 								}
@@ -1316,7 +1316,7 @@  discard block
 block discarded – undo
1316 1316
 						}
1317 1317
 						case '~': { // preceded by an element
1318 1318
 							for ($i = ($key - 1); $i > $dom[$key]['parent']; --$i) {
1319
-								if ($dom[$i]['tag'] AND $dom[$i]['opening']) {
1319
+								if ($dom[$i]['tag'] and $dom[$i]['opening']) {
1320 1320
 									if (self::isValidCSSSelectorForTag($dom, $i, $selector)) {
1321 1321
 										break;
1322 1322
 									}
@@ -1775,7 +1775,7 @@  discard block
 block discarded – undo
1775 1775
 		$limit = $limit === null ? -1 : $limit;
1776 1776
 		$flags = $flags === null ? 0 : $flags;
1777 1777
 		// the bug only happens on PHP 5.2 when using the u modifier
1778
-		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
1778
+		if ((strpos($modifiers, 'u') === FALSE) or (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
1779 1779
 			$ret = preg_split($pattern.$modifiers, $subject, $limit, $flags);
1780 1780
 			if ($ret === false) {
1781 1781
 				return array();
Please login to merge, or discard this patch.
htdocs/includes/tecnickcom/tcpdf/include/tcpdf_images.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 			}
80 80
 		}
81 81
 		if (empty($type)) {
82
-            $type = strtolower(trim(pathinfo(parse_url($imgfile, PHP_URL_PATH), PATHINFO_EXTENSION)));
82
+			$type = strtolower(trim(pathinfo(parse_url($imgfile, PHP_URL_PATH), PATHINFO_EXTENSION)));
83 83
 		}
84 84
 		if ($type == 'jpg') {
85 85
 			$type = 'jpeg';
Please login to merge, or discard this patch.
Upper-Lower-Casing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	 */
73 73
 	public static function getImageFileType($imgfile, $iminfo=array()) {
74 74
 		$type = '';
75
-		if (isset($iminfo['mime']) AND !empty($iminfo['mime'])) {
75
+		if (isset($iminfo['mime']) and !empty($iminfo['mime'])) {
76 76
 			$mime = explode('/', $iminfo['mime']);
77
-			if ((count($mime) > 1) AND ($mime[0] == 'image') AND (!empty($mime[1]))) {
77
+			if ((count($mime) > 1) and ($mime[0] == 'image') and (!empty($mime[1]))) {
78 78
 				$type = strtolower(trim($mime[1]));
79 79
 			}
80 80
 		}
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		// transparency index
102 102
 		$tid = imagecolortransparent($image);
103 103
 		$palletsize = imagecolorstotal($image);
104
-		if (($tid >= 0) AND ($tid < $palletsize)) {
104
+		if (($tid >= 0) and ($tid < $palletsize)) {
105 105
 			// get the colors for the transparency index
106 106
 			$tcol = imagecolorsforindex($image, $tid);
107 107
 		}
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 		if (count($icc) > 0) {
222 222
 			ksort($icc);
223 223
 			$icc = implode('', $icc);
224
-			if ((ord($icc[36]) != 0x61) OR (ord($icc[37]) != 0x63) OR (ord($icc[38]) != 0x73) OR (ord($icc[39]) != 0x70)) {
224
+			if ((ord($icc[36]) != 0x61) or (ord($icc[37]) != 0x63) or (ord($icc[38]) != 0x73) or (ord($icc[39]) != 0x70)) {
225 225
 				// invalid ICC profile
226 226
 				$icc = false;
227 227
 			}
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 			} elseif ($type == 'iCCP') {
323 323
 				// skip profile name
324 324
 				$len = 0;
325
-				while ((ord(fread($f, 1)) != 0) AND ($len < 80)) {
325
+				while ((ord(fread($f, 1)) != 0) and ($len < 80)) {
326 326
 					++$len;
327 327
 				}
328 328
 				// get compression method
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 			}
344 344
 			$n = TCPDF_STATIC::_freadint($f);
345 345
 		} while ($n);
346
-		if (($colspace == 'Indexed') AND (empty($pal))) {
346
+		if (($colspace == 'Indexed') and (empty($pal))) {
347 347
 			// Missing palette
348 348
 			fclose($f);
349 349
 			return false;
Please login to merge, or discard this patch.