Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108024
Change subject: Detect tofu before applying any default fonts
......................................................................
Detect tofu before applying any default fonts
To detect whether the client can render a given string, use a tofu
detection algorithm
If the user has a font preference, do not override
If the user has no preference and there is a default font for a
language, see if that language can be rendered at users browser
(tofu detection)
If tofu detected, apply the font.
If the element has 'autonym' class, apply Autonym font only when
that language has tofu.
Change-Id: Ib9ee9497e6bcfa7eb86f7d264e0980d8880d6b70
---
M Resources.php
M UniversalLanguageSelector.php
M lib/jquery.webfonts.js
D resources/css/ext.uls.webfonts.css
M resources/js/ext.uls.webfonts.js
5 files changed, 93 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/24/108024/1
diff --git a/Resources.php b/Resources.php
index 4642721..2b5b70b 100644
--- a/Resources.php
+++ b/Resources.php
@@ -143,10 +143,10 @@
$wgResourceModules['ext.uls.webfonts'] = array(
'scripts' => 'resources/js/ext.uls.webfonts.js',
- 'styles' => 'resources/css/ext.uls.webfonts.css',
'dependencies' => array(
'jquery.webfonts',
'ext.uls.init',
+ 'jquery.uls.data',
'ext.uls.webfonts.repository',
'ext.uls.preferences',
),
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index b98d920..e369db6 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -155,7 +155,7 @@
* Autonym
* @since 2013.09
*/
-$GLOBALS['wgULSNoWebfontsSelectors'] = array( '.autonym' );
+$GLOBALS['wgULSNoWebfontsSelectors'] = array();
/**
* Base path of ULS font repository.
diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index 63c34f6..e7ce234 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -58,13 +58,14 @@
/**
* Get the default font family for given language.
* @param {String} language Language code.
+ * @param {array} classes
* @return {String} Font family name
*/
- getFont: function( language ) {
+ getFont: function( language, classes ) {
language = ( language || this.language ).toLowerCase();
if ( this.options.fontSelector ) {
- return this.options.fontSelector(
this.repository, language );
+ return this.options.fontSelector(
this.repository, language, classes );
} else {
return this.repository.defaultFont( language );
}
@@ -199,7 +200,6 @@
// Note: it depends on the browser whether this
returns font names
// which don't exist. In Chrome it does, while
in Opera it doesn't.
fontFamilyStyle = $element.css( 'fontFamily' );
-
// Note: It is unclear whether this can ever be
falsy. Maybe also
// browser specific.
if ( fontFamilyStyle ) {
@@ -220,7 +220,7 @@
// browser settings.
return;
} else {
- fontFamily = webfonts.getFont(
element.lang );
+ fontFamily = webfonts.getFont(
element.lang, element.className.split(/\s+/) );
}
if ( !fontFamily ) {
@@ -269,8 +269,8 @@
// whether the font is inherited from top element to
which plugin applied
return this.$element.css( 'fontFamily' ) !==
elementFontFamily
- // whether the element has generic font family
- && ( $.inArray( elementFontFamily,
+ // whether the element has generic font
family
+ && ( $.inArray( elementFontFamily,
['monospace', 'serif',
'cursive','fantasy', 'sans-serif'] ) < 0 );
},
diff --git a/resources/css/ext.uls.webfonts.css
b/resources/css/ext.uls.webfonts.css
deleted file mode 100644
index 05b6dc2..0000000
--- a/resources/css/ext.uls.webfonts.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#p-lang li.interlanguage-link,
-.autonym { /* provide autonym class for simplifying the Autonym font usage */
- font-family: sans-serif, 'Autonym';
-}
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index f315c17..0868391 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -18,7 +18,9 @@
*/
( function ( $, mw, undefined ) {
'use strict';
- var mediawikiFontRepository, ulsPreferences;
+ var mediawikiFontRepository, ulsPreferences,
+ // cache languages with tofu.
+ tofuLanguages = {};
mw.webfonts = mw.webfonts || {};
ulsPreferences = mw.uls.preferences();
@@ -48,19 +50,96 @@
}
};
+
+ /**
+ * Detect tofu
+ *
+ * Create a temporary span in the page with fontsize 72px and
font-family
+ * sans-serif for each letters of the text.
+ * For each of this spans, calculate the width and height. If they are
same
+ * for all spans, we can understand that each of the letters are
rendered using
+ * same glyph - it must be a tofu.
+ *
+ * @param {string} text
+ * @return {boolean}
+ */
+ function detectTofu( text ) {
+ var width = {},
+ height = {},
+ index,
+ length = Math.min( 4, text.length ),
+ $fixture,
+ detected = false;
+
+ $fixture = $( '<span>' )
+ .css( {
+ fontSize: '72px',
+ fontFamily: 'sans-serif'
+ } )
+ .appendTo( 'body' );
+ for ( index = 0; index < length; index++ ) {
+ $fixture.text( text[index] );
+ width[index] = $fixture.width() || width[index-1];
+ height[index] = $fixture.height();
+ if( index > 0 &&
+ ( width[index] !== width[index-1] ||
+ height[index] !== height[index-1] )
+ ) {
+ detected = false;
+ break;
+ }
+ }
+ $fixture.remove();
+ if ( index === length ) {
+ detected = true;
+ }
+ return detected;
+ }
+
mediawikiFontRepository = $.webfonts.repository;
mediawikiFontRepository.base = mw.config.get(
'wgULSFontRepositoryBasePath' );
mw.webfonts.setup = function () {
// Initialize webfonts
$.fn.webfonts.defaults = $.extend( $.fn.webfonts.defaults, {
- fontSelector: function ( repository, language ) {
- var font;
+ /**
+ * Font selector - depending the language and
optionally
+ * based on the class given choose a font.
+ *
+ * @param {Object} repository
+ * @param {string} language
+ * @param {array} classes
+ */
+ fontSelector: function ( repository, language, classes
) {
+ var font, tofu, autonym, defaultFont;
+ if ( !language ) {
+ return null;
+ }
+ defaultFont = repository.defaultFont( language
);
+ if ( classes && $.inArray( 'autonym', classes )
>= 0 ) {
+ autonym = true;
+ }
+ // If the user has a font preference, apply it
always.
font = mw.webfonts.preferences.getFont(
language );
-
- if ( !font ) {
- font = repository.defaultFont( language
);
+ if ( !font || autonym ) {
+ // is there any default font for
language?
+ if ( ( !defaultFont || defaultFont ===
'system' ) && !autonym ) {
+ return font;
+ }
+ // There is aa default font for
language, but make sure
+ // whether the user see tofu for that
language.
+ tofu = tofuLanguages[language]
+ || detectTofu(
$.uls.data.getAutonym( language ) );
+ if ( !tofu ) {
+ // No tofu and no font
preference. Use system font.
+ font = 'system';
+ } else {
+ mw.log( 'tofu detected for ' +
language );
+ // Cache the languages with tofu
+ tofuLanguages[language] = true;
+ font = autonym? 'Autonym':
defaultFont;
+ }
}
if ( font === 'system' ) {
--
To view, visit https://gerrit.wikimedia.org/r/108024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9ee9497e6bcfa7eb86f7d264e0980d8880d6b70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
