QR code now converts line breaks to actual line breaks

CHANGELOG.md

@@ -33,6 +33,7 @@ Backward incompatible changes
     - Changed names to camelCase without underscores and to `computeBezierBoundingBox`
 - Security: Embedded files via `<annotation>` custom tag must be explicitly allowed via `allowAnnotationFiles` configuration key
 - `fontDir` property of Mpdf class is private and must be accessed via configuration variable with array of paths or `AddFontDirectory` method
+- QR code `<barcode>` element now treats `\r\n` and `\n` as actual line breaks
 
 
 Removed features
@@ -92,6 +93,7 @@ New features
 - PDF/A-3 associated files + additional xmp rdf (by @chab in #130)
 - Additional font directories can be added via `addFontDir` method
 - Introduced `cleanup` method which restores original `mb_` encoding settings (see #421)
+- QR code `<barcode>` element now treats `\r\n` and `\n` as actual line breaks
 
 
 Git repository enhancements

src/Mpdf.php

@@ -7153,34 +7153,86 @@ function printobjectbuffer($is_table = false, $blockdir = false)
 				}
 			}
 
-			/* -- BARCODES -- */
-			// BARCODE
-			if ($objattr['type'] == 'barcode') {
+			if ($objattr['type'] === 'barcode') {
+
 				$bgcol = $this->colorConverter->convert(255, $this->PDFAXwarnings);
+
 				if (isset($objattr['bgcolor']) && $objattr['bgcolor']) {
 					$bgcol = $objattr['bgcolor'];
 				}
+
 				$col = $this->colorConverter->convert(0, $this->PDFAXwarnings);
+
 				if (isset($objattr['color']) && $objattr['color']) {
 					$col = $objattr['color'];
 				}
+
 				$this->SetFColor($bgcol);
 				$this->Rect($objattr['BORDER-X'], $objattr['BORDER-Y'], $objattr['BORDER-WIDTH'], $objattr['BORDER-HEIGHT'], 'F');
 				$this->SetFColor($this->colorConverter->convert(255, $this->PDFAXwarnings));
+
 				if (isset($objattr['BORDER-WIDTH'])) {
 					$this->PaintImgBorder($objattr, $is_table);
 				}
-				if ($objattr['btype'] == 'EAN13' || $objattr['btype'] == 'ISBN' || $objattr['btype'] == 'ISSN' || $objattr['btype'] == 'UPCA' || $objattr['btype'] == 'UPCE' || $objattr['btype'] == 'EAN8') {
-					$this->WriteBarcode($objattr['code'], $objattr['showtext'], $objattr['INNER-X'], $objattr['INNER-Y'], $objattr['bsize'], 0, 0, 0, 0, 0, $objattr['bheight'], $bgcol, $col, $objattr['btype'], $objattr['bsupp'], (isset($objattr['bsupp_code']) ? $objattr['bsupp_code'] : ''), $k);
-				} // QR-code
-				elseif ($objattr['btype'] == 'QR') {
-					$this->qrcode = new QrCode\QrCode($objattr['code'], $objattr['errorlevel']);
-					$this->qrcode->displayFPDF($this, $objattr['INNER-X'], $objattr['INNER-Y'], $objattr['bsize'] * 25, [255, 255, 255], [0, 0, 0]);
+
+
+
+				$barcodeTypes = ['EAN13', 'ISBN', 'ISSN', 'UPCA', 'UPCE', 'EAN8'];
+				if (in_array($objattr['btype'], $barcodeTypes, true)) {
+
+					$this->WriteBarcode(
+						$objattr['code'],
+						$objattr['showtext'],
+						$objattr['INNER-X'],
+						$objattr['INNER-Y'],
+						$objattr['bsize'],
+						0,
+						0,
+						0,
+						0,
+						0,
+						$objattr['bheight'],
+						$bgcol,
+						$col,
+						$objattr['btype'],
+						$objattr['bsupp'],
+						(isset($objattr['bsupp_code']) ? $objattr['bsupp_code'] : ''),
+						$k
+					);
+
+				} elseif ($objattr['btype'] === 'QR') {
+
+					$barcodeContent = str_replace('\r\n', "\r\n", $objattr['code']);
+					$barcodeContent = str_replace('\n', "\n", $barcodeContent);
+
+					$this->qrcode = new QrCode\QrCode($barcodeContent, $objattr['errorlevel']);
+
+					$this->qrcode->displayFPDF(
+						$this,
+						$objattr['INNER-X'],
+						$objattr['INNER-Y'],
+						$objattr['bsize'] * 25,
+						[255, 255, 255],
+						[0, 0, 0]
+					);
+
 				} else {
-					$this->WriteBarcode2($objattr['code'], $objattr['INNER-X'], $objattr['INNER-Y'], $objattr['bsize'], $objattr['bheight'], $bgcol, $col, $objattr['btype'], $objattr['pr_ratio'], $k);
+
+					$this->WriteBarcode2(
+						$objattr['code'],
+						$objattr['INNER-X'],
+						$objattr['INNER-Y'],
+						$objattr['bsize'],
+						$objattr['bheight'],
+						$bgcol,
+						$col,
+						$objattr['btype'],
+						$objattr['pr_ratio'],
+						$k
+					);
+
 				}
 			}
-			/* -- END BARCODES -- */
 
 			// TEXT CIRCLE
 			if ($objattr['type'] == 'textcircle') {