Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Schreiber committed Jul 25, 2018
2 parents 4867483 + ca912c7 commit fdf52c6
Show file tree
Hide file tree
Showing 4 changed files with 322 additions and 314 deletions.
46 changes: 23 additions & 23 deletions mathjax-latex-admin.php → class-mathjax-latex-admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,31 @@

class MathJax_Latex_Admin {

public static $admin_tags = array(
'input' => array(
'type' => array(),
'name' => array(),
'id' => array(),
'disabled' => array(),
'value' => array(),
'checked' => array(),
),
'select' => array(
'name' => array(),
'id' => array(),
),
'option' => array(
'value' => array(),
'selected' => array(),
),
);
public static $admin_tags = [
'input' => [
'type' => [],
'name' => [],
'id' => [],
'disabled' => [],
'value' => [],
'checked' => [],
],
'select' => [
'name' => [],
'id' => [],
],
'option' => [
'value' => [],
'selected' => [],
],
];

public function __construct() {
add_action( 'admin_menu', array( $this, 'admin_page_init' ) );
add_action( 'admin_menu', [ $this, 'admin_page_init' ] );
}

public function admin_page_init() {
add_options_page( 'MathJax-LaTeX', 'MathJax-LaTeX', 'manage_options', 'kblog-mathjax-latex', array( $this, 'plugin_options_menu' ) );
add_options_page( 'MathJax-LaTeX', 'MathJax-LaTeX', 'manage_options', 'kblog-mathjax-latex', [ $this, 'plugin_options_menu' ] );
}

public function plugin_options_menu() {
Expand Down Expand Up @@ -146,12 +146,12 @@ public function plugin_options_menu() {
}

public function config_options() {
$options = array(
$options = [
'default',
'Accessible',
'TeX-AMS_HTML',
'TeX-AMS-MML_HTMLorMML',
);
];

return $options;
}
Expand All @@ -164,7 +164,7 @@ public function admin_save() {
update_option( 'kblog_mathjax_force_load', array_key_exists( 'kblog_mathjax_force_load', $_POST ) ); // input var okay

if ( array_key_exists( 'kblog_mathjax_latex_inline', $_POST ) && isset( $_POST['kblog_mathjax_latex_inline'] ) && // input var okay
in_array( sanitize_text_field( wp_unslash( $_POST['kblog_mathjax_latex_inline'] ) ), array( 'inline', 'display' ), true ) // input var okay
in_array( sanitize_text_field( wp_unslash( $_POST['kblog_mathjax_latex_inline'] ) ), [ 'inline', 'display' ], true ) // input var okay
) {
update_option( 'kblog_mathjax_latex_inline', sanitize_text_field( wp_unslash( $_POST['kblog_mathjax_latex_inline'] ) ) ); // input var okay
}
Expand Down
291 changes: 291 additions & 0 deletions class-mathjax-latex.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,291 @@
<?php
/*
* The contents of this file are subject to the LGPL License, Version 3.0.
*
* Copyright (C) 2010-2013, Phillip Lord, Newcastle University
* Copyright (C) 2010-2011, Simon Cockell, Newcastle University
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see http://www.gnu.org/licenses/.
*/

define( 'MATHJAX_VERSION', '1.3.10' );

require_once __DIR__ . '/class-mathjax-latex-admin.php';

class MathJax_Latex {
public static $add_script;
public static $block_script;
public static $mathml_tags = [
'math' => [ 'class', 'id', 'style', 'dir', 'href', 'mathbackground', 'mathcolor', 'display', 'overflow', 'xmlns' ],
'maction' => [ 'actiontype', 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor', 'selection' ],
'maligngroup' => [],
'malignmark' => [],
'menclose' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor', 'notation' ],
'merror' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor' ],
'mfenced' => [ 'class', 'id', 'style', 'close', 'href', 'mathbackground', 'mathcolor', 'open', 'separators' ],
'mfrac' => [ 'bevelled', 'class', 'id', 'style', 'denomalign', 'href', 'linethickness', 'mathbackground', 'mathcolor', 'numalign' ],
'mglyph' => [ 'alt', 'class', 'id', 'style', 'height', 'href', 'mathbackground', 'src', 'valign', 'width' ],
'mi' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant' ],
'mlabeledtr' => [ 'class', 'id', 'style', 'columnalign', 'groupalign', 'href', 'mathbackground', 'mathcolor', 'rowalign' ],
'mlongdiv' => [],
'mmultiscripts' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor', 'subscriptshift', 'superscriptshift' ],
'mn' => [ 'class', 'id', 'style', 'dir', 'href', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant' ],
'mo' => [ 'accent', 'class', 'id', 'style', 'dir', 'fence', 'form', 'href', 'largeop', 'lspace', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant', 'maxsize', 'minsize', 'moveablelimits', 'rspace', 'separator', 'stretchy', 'symmetric' ],
'mover' => [ 'accent', 'align', 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor' ],
'mpadded' => [ 'class', 'id', 'style', 'depth', 'height', 'href', 'lspace', 'mathbackground', 'mathcolor', 'voffset', 'width' ],
'mphantom' => [ 'class', 'id', 'style', 'mathbackground' ],
'mroot' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor' ],
'mrow' => [ 'class', 'id', 'style', 'dir', 'href', 'mathbackground', 'mathcolor' ],
'ms' => [ 'class', 'id', 'style', 'dir', 'lquote', 'href', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant', 'rquote' ],
'mscarries' => [],
'mscarry' => [],
'msgroup' => [],
'msline' => [],
'mspace' => [ 'class', 'id', 'style', 'depth', 'height', 'linebreak', 'mathbackground', 'width' ],
'msqrt' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor' ],
'msrow' => [],
'mstack' => [],
'mstyle' => [ 'dir', 'decimalpoint', 'displaystyle', 'infixlinebreakstyle', 'scriptlevel', 'scriptminsize', 'scriptsizemultiplier' ],
'msub' => [ 'class', 'id', 'style', 'mathbackground', 'mathcolor', 'subscriptshift' ],
'msubsup' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor', 'subscriptshift', 'superscriptshift' ],
'msup' => [ 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor', 'superscriptshift' ],
'mtable' => [ 'class', 'id', 'style', 'align', 'alignmentscope', 'columnalign', 'columnlines', 'columnspacing', 'columnwidth', 'displaystyle', 'equalcolumns', 'equalrows', 'frame', 'framespacing', 'groupalign', 'href', 'mathbackground', 'mathcolor', 'minlabelspacing', 'rowalign', 'rowlines', 'rowspacing', 'side', 'width' ],
'mtd' => [ 'class', 'id', 'style', 'columnalign', 'columnspan', 'groupalign', 'href', 'mathbackground', 'mathcolor', 'rowalign', 'rowspan' ],
'mtext' => [ 'class', 'id', 'style', 'dir', 'href', 'mathbackground', 'mathcolor', 'mathsize', 'mathvariant' ],
'mtr' => [ 'class', 'id', 'style', 'columnalign', 'groupalign', 'href', 'mathbackground', 'mathcolor', 'rowalign' ],
'munder' => [ 'accentunder', 'align', 'class', 'id', 'style', 'mathbackground', 'mathcolor' ],
'munderover' => [ 'accent', 'accentunder', 'align', 'class', 'id', 'style', 'href', 'mathbackground', 'mathcolor' ],
'semantics' => [ 'definitionURL', 'encoding', 'cd', 'name', 'src' ],
'annotation' => [ 'definitionURL', 'encoding', 'cd', 'name', 'src' ],
'annotation-xml' => [ 'definitionURL', 'encoding', 'cd', 'name', 'src' ],
];

public static function init() {
register_activation_hook( __FILE__, [ __CLASS__, 'mathjax_install' ] );
register_deactivation_hook( __FILE__, [ __CLASS__, 'mathjax_uninstall' ] );

if ( get_option( 'kblog_mathjax_force_load' ) ) {
self::$add_script = true;
}

add_shortcode( 'mathjax', [ __CLASS__, 'mathjax_shortcode' ] );
add_shortcode( 'nomathjax', [ __CLASS__, 'nomathjax_shortcode' ] );
add_shortcode( 'latex', [ __CLASS__, 'latex_shortcode' ] );
add_action( 'wp_footer', [ __CLASS__, 'add_script' ] );
add_filter( 'script_loader_tag', [ __CLASS__, 'script_loader_tag' ], 10, 3 );

if ( get_option( 'kblog_mathjax_use_wplatex_syntax' ) ) {
add_filter( 'the_content', [ __CLASS__, 'inline_to_shortcode' ] );
}

add_filter( 'plugin_action_links', [ __CLASS__, 'mathjax_settings_link' ], 9, 2 );

add_filter( 'the_content', [ __CLASS__, 'filter_br_tags_on_math' ] );

add_action( 'init', [ __CLASS__, 'allow_mathml_tags' ] );
add_filter( 'tiny_mce_before_init', [ __CLASS__, 'allow_mathml_tags_in_tinymce' ] );
}

// registers default options
public static function mathjax_install() {
add_option( 'kblog_mathjax_force_load', false );
add_option( 'kblog_mathjax_latex_inline', 'inline' );
add_option( 'kblog_mathjax_use_wplatex_syntax', false );
add_option( 'kblog_mathjax_use_cdn', true );
add_option( 'kblog_mathjax_custom_location', false );
add_option( 'kblog_mathjax_config', 'default' );
}

public static function mathjax_uninstall() {
delete_option( 'kblog_mathjax_force_load' );
delete_option( 'kblog_mathjax_latex_inline' );
delete_option( 'kblog_mathjax_use_wplatex_syntax' );
delete_option( 'kblog_mathjax_use_cdn' );
delete_option( 'kblog_mathjax_custom_location' );
delete_option( 'kblog_mathjax_config' );
}

public static function mathjax_shortcode( $atts, $content ) {
self::$add_script = true;
}

public static function nomathjax_shortcode( $atts, $content ) {
self::$block_script = true;
}

public static function latex_shortcode( $atts, $content ) {
self::$add_script = true;

// this gives us an optional "syntax" attribute, which defaults to "inline", but can also be "display"
$shortcode_atts = shortcode_atts(
[
'syntax' => get_option( 'kblog_mathjax_latex_inline' ),
], $atts
);

if ( 'inline' === $shortcode_atts['syntax'] ) {
return '\(' . $content . '\)';
} elseif ( 'display' === $shortcode_atts['syntax'] ) {
return '\[' . $content . '\]';
}
}

public static function add_script() {
if ( ! self::$add_script ) {
return;
}

if ( self::$block_script ) {
return;
}

// initialise option for existing MathJax-LaTeX users
if ( get_option( 'kblog_mathjax_use_cdn' ) || ! get_option( 'kblog_mathjax_custom_location' ) ) {
$mathjax_location = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js';
} else {
$mathjax_location = get_option( 'kblog_mathjax_custom_location' );
}

$mathjax_url = $mathjax_location . '?config=' . get_option( 'kblog_mathjax_config' );

wp_enqueue_script( 'mathjax', $mathjax_url, false, MATHJAX_VERSION, false );

$mathjax_config = apply_filters( 'mathjax_config', [] );
if ( $mathjax_config ) {
wp_add_inline_script( 'mathjax', 'MathJax.Hub.Config(' . wp_json_encode( $mathjax_config ) . ');' );
}
}


/**
* Set the script tag to have type text/x-mathjax-config
*
* @param string $tag The `<script>` tag for the enqueued script.
* @param string $handle The script's registered handle.
* @param string $src The script's source URL.
*
* @return string $tag
*/
public static function script_loader_tag( $tag, $handle = null, $src = null ) {
if ( 'mathjax' === $handle ) {
// replace the <script> tag for the inline script, but not for the <script> tag with src=""
return str_replace( "<script type='text/javascript'>", "<script type='text/x-mathjax-config'>", $tag );
}

return $tag;
}

public static function inline_to_shortcode( $content ) {
if ( false === strpos( $content, '$latex' ) ) {
return $content;
}

self::$add_script = true;

return preg_replace_callback( '#\$latex[= ](.*?[^\\\\])\$#', [ __CLASS__, 'inline_to_shortcode_callback' ], $content );
}

public static function inline_to_shortcode_callback( $matches ) {

//
// Also support wp-latex syntax. This includes the ability to set background and foreground
// colour, which we can ignore.
//

if ( preg_match( '/.+((?:&#038;|&amp;)s=(-?[0-4])).*/i', $matches[1], $s_matches ) ) {
$matches[1] = str_replace( $s_matches[1], '', $matches[1] );
}

if ( preg_match( '/.+((?:&#038;|&amp;)fg=([0-9a-f]{6})).*/i', $matches[1], $fg_matches ) ) {
$matches[1] = str_replace( $fg_matches[1], '', $matches[1] );
}

if ( preg_match( '/.+((?:&#038;|&amp;)bg=([0-9a-f]{6})).*/i', $matches[1], $bg_matches ) ) {
$matches[1] = str_replace( $bg_matches[1], '', $matches[1] );
}

return "[latex]{$matches[1]}[/latex]";
}

// add a link to settings on the plugin management page
public static function mathjax_settings_link( $links, $file ) {
if ( 'mathjax-latex/mathjax-latex.php' === $file && function_exists( 'admin_url' ) ) {
$settings_link = '<a href="' . esc_url( admin_url( 'options-general.php?page=kblog-mathjax-latex' ) ) . '">' . esc_html__( 'Settings' ) . '</a>';
array_unshift( $links, $settings_link );
}
return $links;
}

/**
* Removes the <br /> tags inside math tags
*
* @param $content
* @return string without <br /> tags
*/
public static function filter_br_tags_on_math( $content ) {
$filtered_content = preg_replace_callback(
'/(<math.*>.*<\/math>)/isU',
function( $matches ) {
return str_replace( array( '<br/>', '<br />', '<br>' ), '', $matches[0] );
},
$content
);
return null === $filtered_content ? $content : $filtered_content;
}

/**
* Allow MathML tags within WordPress
* http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
* https://developer.mozilla.org/en-US/docs/Web/MathML/Element
*/
public static function allow_mathml_tags() {
global $allowedposttags;

foreach ( self::$mathml_tags as $tag => $attributes ) {
$allowedposttags[ $tag ] = [];

foreach ( $attributes as $a ) {
$allowedposttags[ $tag ][ $a ] = true;
}
}
}

/**
* Ensure that the MathML tags will not be removed
* by the TinyMCE editor
*/
public static function allow_mathml_tags_in_tinymce( $options ) {

$extended_tags = [];

foreach ( self::$mathml_tags as $tag => $attributes ) {
if ( ! empty( $attributes ) ) {
$tag = $tag . '[' . implode( '|', $attributes ) . ']';
}

$extended_tags[] = $tag;
}

if ( ! isset( $options['extended_valid_elements'] ) ) {
$options['extended_valid_elements'] = '';
}

$options['extended_valid_elements'] .= ',' . implode( ',', $extended_tags );
$options['extended_valid_elements'] = trim( $options['extended_valid_elements'], ',' );

return $options;
}
}

MathJax_Latex::init();
Loading

0 comments on commit fdf52c6

Please sign in to comment.