From 4af4346a49b4943b922a7cd72506308e20f8520e Mon Sep 17 00:00:00 2001
From: "Davide P. Cervone" <dpvc@union.edu>
Date: Mon, 13 May 2013 05:40:24 -0400
Subject: [PATCH] Strengthen class and ID patterns so no extra classes are
 included.  Use a ninimum size multiplier as well.

---
 unpacked/extensions/Safe.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/unpacked/extensions/Safe.js b/unpacked/extensions/Safe.js
index 73e2a4a20..998c4704d 100644
--- a/unpacked/extensions/Safe.js
+++ b/unpacked/extensions/Safe.js
@@ -127,12 +127,12 @@
     //
     filterClass: function (CLASS) {
       if (ALLOW.classes === "none" ||
-         (ALLOW.classes !== "all" && !CLASS.match(/^MJX-/))) {CLASS = null}
+         (ALLOW.classes !== "all" && !CLASS.match(/^MJX-[-a-zA-Z0-9_.]+$/))) {CLASS = null}
       return CLASS;
     },
     filterID: function (id) {
       if (ALLOW.cssIDs === "none" ||
-         (ALLOW.cssIDs !== "all" && !id.match(/^MJX-/))) {id = null}
+         (ALLOW.cssIDs !== "all" && !id.match(/^MJX-[-a-zA-Z0-9_.]+$/))) {id = null}
       return id;
     },
     
@@ -190,7 +190,7 @@
     //
     filterSizeMultiplier: function (size) {
       if (ALLOW.fontsize === "none") {size = null}
-      else if (ALLOW.fontsize !== "all") {size = Math.min(1,size).toString()}
+      else if (ALLOW.fontsize !== "all") {size = Math.min(1,Math.max(.6,size)).toString()}
       return size;
     },
     //