Convert fonts V2 to V1

timotei-litespeed · Jul 12, 2024 · e72f969 · e72f969
1 parent 455192c
commit e72f969
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/optimize.cls.php b/src/optimize.cls.php
@@ -575,17 +575,33 @@ private function _async_ggfonts()
 		 *
 		 * Could be multiple fonts
 		 *
+		 * CSS API V1
 		 * 	<link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans%3A400%2C600%2C700%2C800%2C300&#038;ver=4.9.8' type='text/css' media='all' />
 		 *	<link rel='stylesheet' href='//fonts.googleapis.com/css?family=PT+Sans%3A400%2C700%7CPT+Sans+Narrow%3A400%7CMontserrat%3A600&#038;subset=latin&#038;ver=4.9.8' type='text/css' media='all' />
 		 *		-> family: PT Sans:400,700|PT Sans Narrow:400|Montserrat:600
 		 *	<link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,300italic,400italic,600,700,900&#038;subset=latin%2Clatin-ext' />
+		 *
+		 * CSS API V2
+		 *	<link rel='stylesheet' href='https://fonts.googleapis.com/css2?family=Manrope:wght@200..800&display=swap' />
+		 *	<link rel='stylesheet' href='https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap' />
+		 *	<link rel='stylesheet' href='https://fonts.googleapis.com/css2?family=Playwrite+ES+Deco:wght@100..400&family=Playwrite+US+Trad:wght@100..400&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap' />
 		 */
 		$script = 'WebFontConfig={google:{families:[';
 
 		$families = array();
 		foreach ($this->_ggfonts_urls as $v) {
 			$qs = wp_specialchars_decode($v);
 			$qs = urldecode($qs);
+
+			// Try to convert API V2 to V1.
+			if( strpos($qs, '/css2?') ){
+				$qs = str_replace(
+					array( 'css2?', 'ital,wght@', 'wght@', 'ital@', '0,', '1,', ';', '&family=' ),
+					array( 'css?', '', '', '', 'bold', 'italic', ',', '|' ),
+					$qs
+				);
+			}
+
 			$qs = parse_url($qs, PHP_URL_QUERY);
 			parse_str($qs, $qs);