Editor: Introduce the Font Library post types and low level APIs.
This is the first step towards adding the font library to WordPress. This commit includes the font library and font face CPTs. It also adds the necessary APIs and classes to register and manipulate font collections. This PR backports the font library post types and low level APIs to Core. This is the first step to include the font library entirely into Core. Once this merged, we'll open a PR with the necessary REST API controllers. Props youknowriad, get_dave, grantmkin, swissspidy, hellofromtonya, mukesh27, mcsf. See #59166. Built from https://develop.svn.wordpress.org/trunk@57539 git-svn-id: http://core.svn.wordpress.org/trunk@57040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
youknowriad
parent
b769f2b0cd
commit
ea8080d8c8
|
|
@ -748,5 +748,7 @@ add_action( 'wp_restore_post_revision', 'wp_restore_post_revision_meta', 10, 2 )
|
|||
|
||||
// Font management.
|
||||
add_action( 'wp_head', 'wp_print_font_faces', 50 );
|
||||
add_action( 'deleted_post', '_wp_after_delete_font_family', 10, 2 );
|
||||
add_action( 'before_delete_post', '_wp_before_delete_font_face', 10, 2 );
|
||||
|
||||
unset( $filter, $action );
|
||||
|
|
|
|||
|
|
@ -51,3 +51,140 @@ function wp_print_font_faces( $fonts = array() ) {
|
|||
$wp_font_face = new WP_Font_Face();
|
||||
$wp_font_face->generate_and_print( $fonts );
|
||||
}
|
||||
|
||||
/**
|
||||
* Registers a new Font Collection in the Font Library.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug. May only contain alphanumeric characters, dashes,
|
||||
* and underscores. See sanitize_title().
|
||||
* @param array|string $data_or_file {
|
||||
* Font collection data array or a path/URL to a JSON file containing the font collection.
|
||||
*
|
||||
* @link https://schemas.wp.org/trunk/font-collection.json
|
||||
*
|
||||
* @type string $name Required. Name of the font collection shown in the Font Library.
|
||||
* @type string $description Optional. A short descriptive summary of the font collection. Default empty.
|
||||
* @type array $font_families Required. Array of font family definitions that are in the collection.
|
||||
* @type array $categories Optional. Array of categories, each with a name and slug, that are used by the
|
||||
* fonts in the collection. Default empty.
|
||||
* }
|
||||
* @return WP_Font_Collection|WP_Error A font collection if it was registered
|
||||
* successfully, or WP_Error object on failure.
|
||||
*/
|
||||
function wp_register_font_collection( $slug, $data_or_file ) {
|
||||
return WP_Font_Library::get_instance()->register_font_collection( $slug, $data_or_file );
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters a font collection from the Font Library.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug.
|
||||
* @return bool True if the font collection was unregistered successfully, else false.
|
||||
*/
|
||||
function wp_unregister_font_collection( $slug ) {
|
||||
return WP_Font_Library::get_instance()->unregister_font_collection( $slug );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an array containing the current fonts upload directory's path and URL.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param array $defaults {
|
||||
* Array of information about the upload directory.
|
||||
*
|
||||
* @type string $path Base directory and subdirectory or full path to the fonts upload directory.
|
||||
* @type string $url Base URL and subdirectory or absolute URL to the fonts upload directory.
|
||||
* @type string $subdir Subdirectory
|
||||
* @type string $basedir Path without subdir.
|
||||
* @type string $baseurl URL path without subdir.
|
||||
* @type string|false $error False or error message.
|
||||
* }
|
||||
* @return array $defaults {
|
||||
* Array of information about the upload directory.
|
||||
*
|
||||
* @type string $path Base directory and subdirectory or full path to the fonts upload directory.
|
||||
* @type string $url Base URL and subdirectory or absolute URL to the fonts upload directory.
|
||||
* @type string $subdir Subdirectory
|
||||
* @type string $basedir Path without subdir.
|
||||
* @type string $baseurl URL path without subdir.
|
||||
* @type string|false $error False or error message.
|
||||
* }
|
||||
*/
|
||||
function wp_get_font_dir( $defaults = array() ) {
|
||||
$site_path = '';
|
||||
if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
|
||||
$site_path = '/sites/' . get_current_blog_id();
|
||||
}
|
||||
|
||||
// Sets the defaults.
|
||||
$defaults['path'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
|
||||
$defaults['url'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
|
||||
$defaults['subdir'] = '';
|
||||
$defaults['basedir'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
|
||||
$defaults['baseurl'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
|
||||
$defaults['error'] = false;
|
||||
|
||||
/**
|
||||
* Filters the fonts directory data.
|
||||
*
|
||||
* This filter allows developers to modify the fonts directory data.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param array $defaults The original fonts directory data.
|
||||
*/
|
||||
return apply_filters( 'font_dir', $defaults );
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes child font faces when a font family is deleted.
|
||||
*
|
||||
* @access private
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param int $post_id Post ID.
|
||||
* @param WP_Post $post Post object.
|
||||
*/
|
||||
function _wp_after_delete_font_family( $post_id, $post ) {
|
||||
if ( 'wp_font_family' !== $post->post_type ) {
|
||||
return;
|
||||
}
|
||||
|
||||
$font_faces = get_children(
|
||||
array(
|
||||
'post_parent' => $post_id,
|
||||
'post_type' => 'wp_font_face',
|
||||
)
|
||||
);
|
||||
|
||||
foreach ( $font_faces as $font_face ) {
|
||||
wp_delete_post( $font_face->ID, true );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes associated font files when a font face is deleted.
|
||||
*
|
||||
* @access private
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param int $post_id Post ID.
|
||||
* @param WP_Post $post Post object.
|
||||
*/
|
||||
function _wp_before_delete_font_face( $post_id, $post ) {
|
||||
if ( 'wp_font_face' !== $post->post_type ) {
|
||||
return;
|
||||
}
|
||||
|
||||
$font_files = get_post_meta( $post_id, '_wp_font_face_file', false );
|
||||
$font_dir = wp_get_font_dir()['path'];
|
||||
|
||||
foreach ( $font_files as $font_file ) {
|
||||
wp_delete_file( $font_dir . '/' . $font_file );
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,260 @@
|
|||
<?php
|
||||
/**
|
||||
* Font Collection class.
|
||||
*
|
||||
* This file contains the Font Collection class definition.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Fonts
|
||||
* @since 6.5.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* Font Collection class.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @see wp_register_font_collection()
|
||||
*/
|
||||
final class WP_Font_Collection {
|
||||
/**
|
||||
* The unique slug for the font collection.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @var string
|
||||
*/
|
||||
public $slug;
|
||||
|
||||
/**
|
||||
* Font collection data.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @var array|WP_Error|null
|
||||
*/
|
||||
private $data;
|
||||
|
||||
/**
|
||||
* Font collection JSON file path or URL.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @var string|null
|
||||
*/
|
||||
private $src;
|
||||
|
||||
/**
|
||||
* WP_Font_Collection constructor.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug.
|
||||
* @param array|string $data_or_file Font collection data array or a path/URL to a JSON file
|
||||
* containing the font collection.
|
||||
* See {@see wp_register_font_collection()} for the supported fields.
|
||||
*/
|
||||
public function __construct( $slug, $data_or_file ) {
|
||||
$this->slug = sanitize_title( $slug );
|
||||
if ( $this->slug !== $slug ) {
|
||||
_doing_it_wrong(
|
||||
__METHOD__,
|
||||
/* translators: %s: Font collection slug. */
|
||||
sprintf( __( 'Font collection slug "%s" is not valid. Slugs must use only alphanumeric characters, dashes, and underscores.' ), $slug ),
|
||||
'6.5.0'
|
||||
);
|
||||
}
|
||||
|
||||
if ( is_array( $data_or_file ) ) {
|
||||
$this->data = $this->sanitize_and_validate_data( $data_or_file );
|
||||
} else {
|
||||
// JSON data is lazy loaded by ::get_data().
|
||||
$this->src = $data_or_file;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the font collection data.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @return array|WP_Error An array containing the font collection data, or a WP_Error on failure.
|
||||
*/
|
||||
public function get_data() {
|
||||
// If the collection uses JSON data, load it and cache the data/error.
|
||||
if ( $this->src && empty( $this->data ) ) {
|
||||
$this->data = $this->load_from_json( $this->src );
|
||||
}
|
||||
|
||||
if ( is_wp_error( $this->data ) ) {
|
||||
return $this->data;
|
||||
}
|
||||
|
||||
// Set defaults for optional properties.
|
||||
$defaults = array(
|
||||
'description' => '',
|
||||
'categories' => array(),
|
||||
);
|
||||
|
||||
return wp_parse_args( $this->data, $defaults );
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads font collection data from a JSON file or URL.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $file_or_url File path or URL to a JSON file containing the font collection data.
|
||||
* @return array|WP_Error An array containing the font collection data on success,
|
||||
* else an instance of WP_Error on failure.
|
||||
*/
|
||||
private function load_from_json( $file_or_url ) {
|
||||
$url = wp_http_validate_url( $file_or_url );
|
||||
$file = file_exists( $file_or_url ) ? wp_normalize_path( realpath( $file_or_url ) ) : false;
|
||||
|
||||
if ( ! $url && ! $file ) {
|
||||
// translators: %s: File path or URL to font collection JSON file.
|
||||
$message = __( 'Font collection JSON file is invalid or does not exist.' );
|
||||
_doing_it_wrong( __METHOD__, $message, '6.5.0' );
|
||||
return new WP_Error( 'font_collection_json_missing', $message );
|
||||
}
|
||||
|
||||
return $url ? $this->load_from_url( $url ) : $this->load_from_file( $file );
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the font collection data from a JSON file path.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $file File path to a JSON file containing the font collection data.
|
||||
* @return array|WP_Error An array containing the font collection data on success,
|
||||
* else an instance of WP_Error on failure.
|
||||
*/
|
||||
private function load_from_file( $file ) {
|
||||
$data = wp_json_file_decode( $file, array( 'associative' => true ) );
|
||||
if ( empty( $data ) ) {
|
||||
return new WP_Error( 'font_collection_decode_error', __( 'Error decoding the font collection JSON file contents.' ) );
|
||||
}
|
||||
|
||||
return $this->sanitize_and_validate_data( $data );
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the font collection data from a JSON file URL.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $url URL to a JSON file containing the font collection data.
|
||||
* @return array|WP_Error An array containing the font collection data on success,
|
||||
* else an instance of WP_Error on failure.
|
||||
*/
|
||||
private function load_from_url( $url ) {
|
||||
// Limit key to 167 characters to avoid failure in the case of a long URL.
|
||||
$transient_key = substr( 'wp_font_collection_url_' . $url, 0, 167 );
|
||||
$data = get_site_transient( $transient_key );
|
||||
|
||||
if ( false === $data ) {
|
||||
$response = wp_safe_remote_get( $url );
|
||||
if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
|
||||
// translators: %s: Font collection URL.
|
||||
return new WP_Error( 'font_collection_request_error', sprintf( __( 'Error fetching the font collection data from "%s".' ), $url ) );
|
||||
}
|
||||
|
||||
$data = json_decode( wp_remote_retrieve_body( $response ), true );
|
||||
if ( empty( $data ) ) {
|
||||
return new WP_Error( 'font_collection_decode_error', __( 'Error decoding the font collection data from the HTTP response JSON.' ) );
|
||||
}
|
||||
|
||||
// Make sure the data is valid before storing it in a transient.
|
||||
$data = $this->sanitize_and_validate_data( $data );
|
||||
if ( is_wp_error( $data ) ) {
|
||||
return $data;
|
||||
}
|
||||
|
||||
set_site_transient( $transient_key, $data, DAY_IN_SECONDS );
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitizes and validates the font collection data.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param array $data Font collection data to sanitize and validate.
|
||||
* @return array|WP_Error Sanitized data if valid, otherwise a WP_Error instance.
|
||||
*/
|
||||
private function sanitize_and_validate_data( $data ) {
|
||||
$schema = self::get_sanitization_schema();
|
||||
$data = WP_Font_Utils::sanitize_from_schema( $data, $schema );
|
||||
|
||||
$required_properties = array( 'name', 'font_families' );
|
||||
foreach ( $required_properties as $property ) {
|
||||
if ( empty( $data[ $property ] ) ) {
|
||||
$message = sprintf(
|
||||
// translators: 1: Font collection slug, 2: Missing property name, e.g. "font_families".
|
||||
__( 'Font collection "%1$s" has missing or empty property: "%2$s".' ),
|
||||
$this->slug,
|
||||
$property
|
||||
);
|
||||
_doing_it_wrong( __METHOD__, $message, '6.5.0' );
|
||||
return new WP_Error( 'font_collection_missing_property', $message );
|
||||
}
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the font collection sanitization schema.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @return array Font collection sanitization schema.
|
||||
*/
|
||||
private static function get_sanitization_schema() {
|
||||
return array(
|
||||
'name' => 'sanitize_text_field',
|
||||
'description' => 'sanitize_text_field',
|
||||
'font_families' => array(
|
||||
array(
|
||||
'font_family_settings' => array(
|
||||
'name' => 'sanitize_text_field',
|
||||
'slug' => 'sanitize_title',
|
||||
'fontFamily' => 'sanitize_text_field',
|
||||
'preview' => 'sanitize_url',
|
||||
'fontFace' => array(
|
||||
array(
|
||||
'fontFamily' => 'sanitize_text_field',
|
||||
'fontStyle' => 'sanitize_text_field',
|
||||
'fontWeight' => 'sanitize_text_field',
|
||||
'src' => static function ( $value ) {
|
||||
return is_array( $value )
|
||||
? array_map( 'sanitize_text_field', $value )
|
||||
: sanitize_text_field( $value );
|
||||
},
|
||||
'preview' => 'sanitize_url',
|
||||
'fontDisplay' => 'sanitize_text_field',
|
||||
'fontStretch' => 'sanitize_text_field',
|
||||
'ascentOverride' => 'sanitize_text_field',
|
||||
'descentOverride' => 'sanitize_text_field',
|
||||
'fontVariant' => 'sanitize_text_field',
|
||||
'fontFeatureSettings' => 'sanitize_text_field',
|
||||
'fontVariationSettings' => 'sanitize_text_field',
|
||||
'lineGapOverride' => 'sanitize_text_field',
|
||||
'sizeAdjust' => 'sanitize_text_field',
|
||||
'unicodeRange' => 'sanitize_text_field',
|
||||
),
|
||||
),
|
||||
),
|
||||
'categories' => array( 'sanitize_title' ),
|
||||
),
|
||||
),
|
||||
'categories' => array(
|
||||
array(
|
||||
'name' => 'sanitize_text_field',
|
||||
'slug' => 'sanitize_title',
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
<?php
|
||||
/**
|
||||
* Font Library class.
|
||||
*
|
||||
* This file contains the Font Library class definition.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Fonts
|
||||
* @since 6.5.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* Font Library class.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*/
|
||||
class WP_Font_Library {
|
||||
|
||||
/**
|
||||
* Font collections.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @var array
|
||||
*/
|
||||
private $collections = array();
|
||||
|
||||
/**
|
||||
* Container for the main instance of the class.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @var WP_Font_Library|null
|
||||
*/
|
||||
private static $instance = null;
|
||||
|
||||
/**
|
||||
* Register a new font collection.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug.
|
||||
* @param array $data_or_file Font collection data array or a path/URL to a JSON file
|
||||
* containing the font collection.
|
||||
* See {@see wp_register_font_collection()} for the supported fields.
|
||||
* @return WP_Font_Collection|WP_Error A font collection if it was registered successfully,
|
||||
* or WP_Error object on failure.
|
||||
*/
|
||||
public function register_font_collection( $slug, $data_or_file ) {
|
||||
$new_collection = new WP_Font_Collection( $slug, $data_or_file );
|
||||
|
||||
if ( $this->is_collection_registered( $new_collection->slug ) ) {
|
||||
$error_message = sprintf(
|
||||
/* translators: %s: Font collection slug. */
|
||||
__( 'Font collection with slug: "%s" is already registered.' ),
|
||||
$new_collection->slug
|
||||
);
|
||||
_doing_it_wrong(
|
||||
__METHOD__,
|
||||
$error_message,
|
||||
'6.5.0'
|
||||
);
|
||||
return new WP_Error( 'font_collection_registration_error', $error_message );
|
||||
}
|
||||
$this->collections[ $new_collection->slug ] = $new_collection;
|
||||
return $new_collection;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unregisters a previously registered font collection.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug.
|
||||
* @return bool True if the font collection was unregistered successfully and false otherwise.
|
||||
*/
|
||||
public function unregister_font_collection( $slug ) {
|
||||
if ( ! $this->is_collection_registered( $slug ) ) {
|
||||
_doing_it_wrong(
|
||||
__METHOD__,
|
||||
/* translators: %s: Font collection slug. */
|
||||
sprintf( __( 'Font collection "%s" not found.' ), $slug ),
|
||||
'6.5.0'
|
||||
);
|
||||
return false;
|
||||
}
|
||||
unset( $this->collections[ $slug ] );
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if a font collection is registered.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug.
|
||||
* @return bool True if the font collection is registered and false otherwise.
|
||||
*/
|
||||
private function is_collection_registered( $slug ) {
|
||||
return array_key_exists( $slug, $this->collections );
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets all the font collections available.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @return array List of font collections.
|
||||
*/
|
||||
public function get_font_collections() {
|
||||
return $this->collections;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets a font collection.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param string $slug Font collection slug.
|
||||
* @return WP_Font_Collection|WP_Error Font collection object,
|
||||
* or WP_Error object if the font collection doesn't exist.
|
||||
*/
|
||||
public function get_font_collection( $slug ) {
|
||||
if ( $this->is_collection_registered( $slug ) ) {
|
||||
return $this->collections[ $slug ];
|
||||
}
|
||||
return new WP_Error( 'font_collection_not_found', __( 'Font collection not found.' ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Utility method to retrieve the main instance of the class.
|
||||
*
|
||||
* The instance will be created if it does not exist yet.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @return WP_Font_Library The main instance.
|
||||
*/
|
||||
public static function get_instance() {
|
||||
if ( null === self::$instance ) {
|
||||
self::$instance = new self();
|
||||
}
|
||||
|
||||
return self::$instance;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,238 @@
|
|||
<?php
|
||||
/**
|
||||
* Font Utils class.
|
||||
*
|
||||
* Provides utility functions for working with font families.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Fonts
|
||||
* @since 6.5.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* A class of utilities for working with the Font Library.
|
||||
*
|
||||
* These utilities may change or be removed in the future and are intended for internal use only.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @access private
|
||||
*/
|
||||
class WP_Font_Utils {
|
||||
/**
|
||||
* Sanitizes and formats font family names.
|
||||
*
|
||||
* - Applies `sanitize_text_field`
|
||||
* - Adds surrounding quotes to names that contain spaces and are not already quoted
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @access private
|
||||
*
|
||||
* @see sanitize_text_field()
|
||||
*
|
||||
* @param string $font_family Font family name(s), comma-separated.
|
||||
* @return string Sanitized and formatted font family name(s).
|
||||
*/
|
||||
public static function sanitize_font_family( $font_family ) {
|
||||
if ( ! $font_family ) {
|
||||
return '';
|
||||
}
|
||||
|
||||
$font_family = sanitize_text_field( $font_family );
|
||||
$font_families = explode( ',', $font_family );
|
||||
$wrapped_font_families = array_map(
|
||||
function ( $family ) {
|
||||
$trimmed = trim( $family );
|
||||
if ( ! empty( $trimmed ) && str_contains( $trimmed, ' ' ) && ! str_contains( $trimmed, "'" ) && ! str_contains( $trimmed, '"' ) ) {
|
||||
return '"' . $trimmed . '"';
|
||||
}
|
||||
return $trimmed;
|
||||
},
|
||||
$font_families
|
||||
);
|
||||
|
||||
if ( count( $wrapped_font_families ) === 1 ) {
|
||||
$font_family = $wrapped_font_families[0];
|
||||
} else {
|
||||
$font_family = implode( ', ', $wrapped_font_families );
|
||||
}
|
||||
|
||||
return $font_family;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a slug from font face properties, e.g. `open sans;normal;400;100%;U+0-10FFFF`
|
||||
*
|
||||
* Used for comparison with other font faces in the same family, to prevent duplicates
|
||||
* that would both match according the CSS font matching spec. Uses only simple case-insensitive
|
||||
* matching for fontFamily and unicodeRange, so does not handle overlapping font-family lists or
|
||||
* unicode ranges.
|
||||
*
|
||||
* @since 6.5.0
|
||||
* @access private
|
||||
*
|
||||
* @link https://drafts.csswg.org/css-fonts/#font-style-matching
|
||||
*
|
||||
* @param array $settings {
|
||||
* Font face settings.
|
||||
*
|
||||
* @type string $fontFamily Font family name.
|
||||
* @type string $fontStyle Optional font style, defaults to 'normal'.
|
||||
* @type string $fontWeight Optional font weight, defaults to 400.
|
||||
* @type string $fontStretch Optional font stretch, defaults to '100%'.
|
||||
* @type string $unicodeRange Optional unicode range, defaults to 'U+0-10FFFF'.
|
||||
* }
|
||||
* @return string Font face slug.
|
||||
*/
|
||||
public static function get_font_face_slug( $settings ) {
|
||||
$defaults = array(
|
||||
'fontFamily' => '',
|
||||
'fontStyle' => 'normal',
|
||||
'fontWeight' => '400',
|
||||
'fontStretch' => '100%',
|
||||
'unicodeRange' => 'U+0-10FFFF',
|
||||
);
|
||||
$settings = wp_parse_args( $settings, $defaults );
|
||||
|
||||
$font_family = mb_strtolower( $settings['fontFamily'] );
|
||||
$font_style = strtolower( $settings['fontStyle'] );
|
||||
$font_weight = strtolower( $settings['fontWeight'] );
|
||||
$font_stretch = strtolower( $settings['fontStretch'] );
|
||||
$unicode_range = strtoupper( $settings['unicodeRange'] );
|
||||
|
||||
// Convert weight keywords to numeric strings.
|
||||
$font_weight = str_replace( array( 'normal', 'bold' ), array( '400', '700' ), $font_weight );
|
||||
|
||||
// Convert stretch keywords to numeric strings.
|
||||
$font_stretch_map = array(
|
||||
'ultra-condensed' => '50%',
|
||||
'extra-condensed' => '62.5%',
|
||||
'condensed' => '75%',
|
||||
'semi-condensed' => '87.5%',
|
||||
'normal' => '100%',
|
||||
'semi-expanded' => '112.5%',
|
||||
'expanded' => '125%',
|
||||
'extra-expanded' => '150%',
|
||||
'ultra-expanded' => '200%',
|
||||
);
|
||||
$font_stretch = str_replace( array_keys( $font_stretch_map ), array_values( $font_stretch_map ), $font_stretch );
|
||||
|
||||
$slug_elements = array( $font_family, $font_style, $font_weight, $font_stretch, $unicode_range );
|
||||
|
||||
$slug_elements = array_map(
|
||||
function ( $elem ) {
|
||||
// Remove quotes to normalize font-family names, and ';' to use as a separator.
|
||||
$elem = trim( str_replace( array( '"', "'", ';' ), '', $elem ) );
|
||||
|
||||
// Normalize comma separated lists by removing whitespace in between items,
|
||||
// but keep whitespace within items (e.g. "Open Sans" and "OpenSans" are different fonts).
|
||||
// CSS spec for whitespace includes: U+000A LINE FEED, U+0009 CHARACTER TABULATION, or U+0020 SPACE,
|
||||
// which by default are all matched by \s in PHP.
|
||||
return preg_replace( '/,\s+/', ',', $elem );
|
||||
},
|
||||
$slug_elements
|
||||
);
|
||||
|
||||
return sanitize_text_field( join( ';', $slug_elements ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Sanitizes a tree of data using a schema.
|
||||
*
|
||||
* The schema structure should mirror the data tree. Each value provided in the
|
||||
* schema should be a callable that will be applied to sanitize the corresponding
|
||||
* value in the data tree. Keys that are in the data tree, but not present in the
|
||||
* schema, will be removed in the santized data. Nested arrays are traversed recursively.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @access private
|
||||
*
|
||||
* @param array $tree The data to sanitize.
|
||||
* @param array $schema The schema used for sanitization.
|
||||
* @return array The sanitized data.
|
||||
*/
|
||||
public static function sanitize_from_schema( $tree, $schema ) {
|
||||
if ( ! is_array( $tree ) || ! is_array( $schema ) ) {
|
||||
return array();
|
||||
}
|
||||
|
||||
foreach ( $tree as $key => $value ) {
|
||||
// Remove keys not in the schema or with null/empty values.
|
||||
if ( ! array_key_exists( $key, $schema ) ) {
|
||||
unset( $tree[ $key ] );
|
||||
continue;
|
||||
}
|
||||
|
||||
$is_value_array = is_array( $value );
|
||||
$is_schema_array = is_array( $schema[ $key ] ) && ! is_callable( $schema[ $key ] );
|
||||
|
||||
if ( $is_value_array && $is_schema_array ) {
|
||||
if ( wp_is_numeric_array( $value ) ) {
|
||||
// If indexed, process each item in the array.
|
||||
foreach ( $value as $item_key => $item_value ) {
|
||||
$tree[ $key ][ $item_key ] = isset( $schema[ $key ][0] ) && is_array( $schema[ $key ][0] )
|
||||
? self::sanitize_from_schema( $item_value, $schema[ $key ][0] )
|
||||
: self::apply_sanitizer( $item_value, $schema[ $key ][0] );
|
||||
}
|
||||
} else {
|
||||
// If it is an associative or indexed array, process as a single object.
|
||||
$tree[ $key ] = self::sanitize_from_schema( $value, $schema[ $key ] );
|
||||
}
|
||||
} elseif ( ! $is_value_array && $is_schema_array ) {
|
||||
// If the value is not an array but the schema is, remove the key.
|
||||
unset( $tree[ $key ] );
|
||||
} elseif ( ! $is_schema_array ) {
|
||||
// If the schema is not an array, apply the sanitizer to the value.
|
||||
$tree[ $key ] = self::apply_sanitizer( $value, $schema[ $key ] );
|
||||
}
|
||||
|
||||
// Remove keys with null/empty values.
|
||||
if ( empty( $tree[ $key ] ) ) {
|
||||
unset( $tree[ $key ] );
|
||||
}
|
||||
}
|
||||
|
||||
return $tree;
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies a sanitizer function to a value.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @param mixed $value The value to sanitize.
|
||||
* @param mixed $sanitizer The sanitizer function to apply.
|
||||
* @return mixed The sanitized value.
|
||||
*/
|
||||
private static function apply_sanitizer( $value, $sanitizer ) {
|
||||
if ( null === $sanitizer ) {
|
||||
return $value;
|
||||
|
||||
}
|
||||
return call_user_func( $sanitizer, $value );
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the expected mime-type values for font files, depending on PHP version.
|
||||
*
|
||||
* This is needed because font mime types vary by PHP version, so checking the PHP version
|
||||
* is necessary until a list of valid mime-types for each file extension can be provided to
|
||||
* the 'upload_mimes' filter.
|
||||
*
|
||||
* @since 6.5.0
|
||||
*
|
||||
* @access private
|
||||
*
|
||||
* @return array A collection of mime types keyed by file extension.
|
||||
*/
|
||||
public static function get_allowed_font_mime_types() {
|
||||
$php_7_ttf_mime_type = PHP_VERSION_ID >= 70300 ? 'application/font-sfnt' : 'application/x-font-ttf';
|
||||
|
||||
return array(
|
||||
'otf' => 'application/vnd.ms-opentype',
|
||||
'ttf' => PHP_VERSION_ID >= 70400 ? 'font/sfnt' : $php_7_ttf_mime_type,
|
||||
'woff' => PHP_VERSION_ID >= 80100 ? 'font/woff' : 'application/font-woff',
|
||||
'woff2' => PHP_VERSION_ID >= 80100 ? 'font/woff2' : 'application/font-woff2',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -564,6 +564,64 @@ function create_initial_post_types() {
|
|||
)
|
||||
);
|
||||
|
||||
register_post_type(
|
||||
'wp_font_family',
|
||||
array(
|
||||
'labels' => array(
|
||||
'name' => __( 'Font Families' ),
|
||||
'singular_name' => __( 'Font Family' ),
|
||||
),
|
||||
'public' => false,
|
||||
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
|
||||
'hierarchical' => false,
|
||||
'capabilities' => array(
|
||||
'read' => 'edit_theme_options',
|
||||
'read_private_posts' => 'edit_theme_options',
|
||||
'create_posts' => 'edit_theme_options',
|
||||
'publish_posts' => 'edit_theme_options',
|
||||
'edit_posts' => 'edit_theme_options',
|
||||
'edit_others_posts' => 'edit_theme_options',
|
||||
'edit_published_posts' => 'edit_theme_options',
|
||||
'delete_posts' => 'edit_theme_options',
|
||||
'delete_others_posts' => 'edit_theme_options',
|
||||
'delete_published_posts' => 'edit_theme_options',
|
||||
),
|
||||
'map_meta_cap' => true,
|
||||
'query_var' => false,
|
||||
'show_in_rest' => false,
|
||||
'rewrite' => false,
|
||||
)
|
||||
);
|
||||
|
||||
register_post_type(
|
||||
'wp_font_face',
|
||||
array(
|
||||
'labels' => array(
|
||||
'name' => __( 'Font Faces' ),
|
||||
'singular_name' => __( 'Font Face' ),
|
||||
),
|
||||
'public' => false,
|
||||
'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
|
||||
'hierarchical' => false,
|
||||
'capabilities' => array(
|
||||
'read' => 'edit_theme_options',
|
||||
'read_private_posts' => 'edit_theme_options',
|
||||
'create_posts' => 'edit_theme_options',
|
||||
'publish_posts' => 'edit_theme_options',
|
||||
'edit_posts' => 'edit_theme_options',
|
||||
'edit_others_posts' => 'edit_theme_options',
|
||||
'edit_published_posts' => 'edit_theme_options',
|
||||
'delete_posts' => 'edit_theme_options',
|
||||
'delete_others_posts' => 'edit_theme_options',
|
||||
'delete_published_posts' => 'edit_theme_options',
|
||||
),
|
||||
'map_meta_cap' => true,
|
||||
'query_var' => false,
|
||||
'show_in_rest' => false,
|
||||
'rewrite' => false,
|
||||
)
|
||||
);
|
||||
|
||||
register_post_status(
|
||||
'publish',
|
||||
array(
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.5-alpha-57538';
|
||||
$wp_version = '6.5-alpha-57539';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
|
|
@ -374,7 +374,10 @@ require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-rule.php';
|
|||
require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-css-rules-store.php';
|
||||
require ABSPATH . WPINC . '/style-engine/class-wp-style-engine-processor.php';
|
||||
require ABSPATH . WPINC . '/fonts/class-wp-font-face-resolver.php';
|
||||
require ABSPATH . WPINC . '/fonts/class-wp-font-collection.php';
|
||||
require ABSPATH . WPINC . '/fonts/class-wp-font-face.php';
|
||||
require ABSPATH . WPINC . '/fonts/class-wp-font-library.php';
|
||||
require ABSPATH . WPINC . '/fonts/class-wp-font-utils.php';
|
||||
require ABSPATH . WPINC . '/fonts.php';
|
||||
require ABSPATH . WPINC . '/class-wp-script-modules.php';
|
||||
require ABSPATH . WPINC . '/script-modules.php';
|
||||
|
|
|
|||
Loading…
Reference in New Issue