Add prefix to Biaodian h-char class names (fix #81)

ethantw · Aug 20, 2015 · 56612eb · 56612eb
1 parent f379507
commit 56612eb
Show file tree

Hide file tree

Showing 31 changed files with 691 additions and 1,970 deletions.
diff --git a/dist/han.css b/dist/han.css
diff --git a/dist/han.js b/dist/han.js
@@ -1369,10 +1369,10 @@ function createBdGroup( portion, match ) {
 function createBdChar( char ) {
   var div = $.create( 'div' )
   var unicode = char.charCodeAt( 0 ).toString( 16 )
-  var clazz = 'biaodian cjk ' + ( char.match( TYPESET.char.biaodian.open ) ? 'open' :
-    char.match( TYPESET.char.biaodian.close ) ? 'close end' :
-    char.match( TYPESET.char.biaodian.end ) ? 'end' : 
-    char.match( new RegExp( '(' + UNICODE.biaodian.liga + ')' )) ? 'liga' : '' )
+  var clazz = 'biaodian cjk ' + ( char.match( TYPESET.char.biaodian.open ) ? 'bd-open' :
+    char.match( TYPESET.char.biaodian.close ) ? 'bd-close bd-end' :
+    char.match( TYPESET.char.biaodian.end ) ? 'bd-end' :
+    char.match( new RegExp( '(' + UNICODE.biaodian.liga + ')' )) ? 'bd-liga' : '' )
 
   div.innerHTML = '<h-char unicode="' + unicode + '" class="' + clazz + '">' + char + '</h-char>'
   return div.firstChild
@@ -2318,7 +2318,7 @@ Han.renderHanging = function( context ) {
     TYPESET.jinze.hanging,
     function( portion, match ) {
       var elem = $.create( 'h-hangable' )
-      elem.innerHTML = match[2] + '<h-cs><h-inner hidden> </h-inner><h-char class="biaodian close end cjk">' + match[3] + '</h-char></h-cs>'
+      elem.innerHTML = match[2] + '<h-cs><h-inner hidden> </h-inner><h-char class="biaodian bd-close bd-end cjk">' + match[3] + '</h-char></h-cs>'
       return portion.index === 0 ? elem : ''
     }
   )
@@ -2377,12 +2377,12 @@ Han.renderJiya = function( context ) {
   // The reason we're doing this instead of using pseudo elements in CSS
   // is because WebKit has problem rendering pseudo elements containing only 
   // space.
-  $.qsa( 'h-char.biaodian.open, h-char.biaodian.end', context )
+  $.qsa( 'h-char.biaodian.bd-open, h-char.biaodian.bd-end', context )
   .forEach(function( elem ) {
     if ( Han.find.matches( elem, 'h-cs *' ))  return
     var html = '<h-inner>' + elem.innerHTML + '</h-inner>'
     var hcs = '<h-cs hidden> </h-cs>'
-    var isOpen = elem.classList.contains( 'open' )
+    var isOpen = elem.classList.contains( 'bd-open' )
     elem.innerHTML = isOpen ? hcs + html : html + hcs
   })
 
@@ -2407,11 +2407,11 @@ $.extend( Han.fn, {
 
 var mdot
 
-mdot = $.create( 'h-char', 'biaodian cjk middle' )
+mdot = $.create( 'h-char', 'biaodian cjk bd-middle' )
 mdot.setAttribute( 'unicode', 'b7' )
 
 Han.correctBasicBD = function( context, all ) {
-  if ( Han.support.unicoderange && !all ) return
+  if ( Han.support.unicoderange && !all )  return
 
   var context = context || document
   var finder

diff --git a/dist/han.min.css b/dist/han.min.css
diff --git a/dist/han.min.js b/dist/han.min.js
diff --git a/src/js/find.js b/src/js/find.js
@@ -27,10 +27,10 @@ function createBdGroup( portion, match ) {
 function createBdChar( char ) {
   var div = $.create( 'div' )
   var unicode = char.charCodeAt( 0 ).toString( 16 )
-  var clazz = 'biaodian cjk ' + ( char.match( TYPESET.char.biaodian.open ) ? 'open' :
-    char.match( TYPESET.char.biaodian.close ) ? 'close end' :
-    char.match( TYPESET.char.biaodian.end ) ? 'end' : 
-    char.match( new RegExp( '(' + UNICODE.biaodian.liga + ')' )) ? 'liga' : '' )
+  var clazz = 'biaodian cjk ' + ( char.match( TYPESET.char.biaodian.open ) ? 'bd-open' :
+    char.match( TYPESET.char.biaodian.close ) ? 'bd-close bd-end' :
+    char.match( TYPESET.char.biaodian.end ) ? 'bd-end' :
+    char.match( new RegExp( '(' + UNICODE.biaodian.liga + ')' )) ? 'bd-liga' : '' )
 
   div.innerHTML = '<h-char unicode="' + unicode + '" class="' + clazz + '">' + char + '</h-char>'
   return div.firstChild

diff --git a/src/js/inline/basic-bd.js b/src/js/inline/basic-bd.js
@@ -6,11 +6,11 @@ define([
 
 var mdot
 
-mdot = $.create( 'h-char', 'biaodian cjk middle' )
+mdot = $.create( 'h-char', 'biaodian cjk bd-middle' )
 mdot.setAttribute( 'unicode', 'b7' )
 
 Han.correctBasicBD = function( context, all ) {
-  if ( Han.support.unicoderange && !all ) return
+  if ( Han.support.unicoderange && !all )  return
 
   var context = context || document
   var finder

diff --git a/src/js/inline/hanging.js b/src/js/inline/hanging.js
@@ -31,7 +31,7 @@ Han.renderHanging = function( context ) {
     TYPESET.jinze.hanging,
     function( portion, match ) {
       var elem = $.create( 'h-hangable' )
-      elem.innerHTML = match[2] + '<h-cs><h-inner hidden> </h-inner><h-char class="biaodian close end cjk">' + match[3] + '</h-char></h-cs>'
+      elem.innerHTML = match[2] + '<h-cs><h-inner hidden> </h-inner><h-char class="biaodian bd-close bd-end cjk">' + match[3] + '</h-char></h-cs>'
       return portion.index === 0 ? elem : ''
     }
   )

diff --git a/src/js/inline/jiya.js b/src/js/inline/jiya.js
@@ -31,12 +31,12 @@ Han.renderJiya = function( context ) {
   // The reason we're doing this instead of using pseudo elements in CSS
   // is because WebKit has problem rendering pseudo elements containing only 
   // space.
-  $.qsa( 'h-char.biaodian.open, h-char.biaodian.end', context )
+  $.qsa( 'h-char.biaodian.bd-open, h-char.biaodian.bd-end', context )
   .forEach(function( elem ) {
     if ( Han.find.matches( elem, 'h-cs *' ))  return
     var html = '<h-inner>' + elem.innerHTML + '</h-inner>'
     var hcs = '<h-cs hidden> </h-cs>'
-    var isOpen = elem.classList.contains( 'open' )
+    var isOpen = elem.classList.contains( 'bd-open' )
     elem.innerHTML = isOpen ? hcs + html : html + hcs
   })
 

diff --git a/src/sass/inline/_basic-bd.sass b/src/sass/inline/_basic-bd.sass
@@ -2,8 +2,9 @@
 /**
  * Basic Biaodian correction for Firefox
  */
-h-char.biaodian.liga,
+h-char.bd-liga,
 h-char.biaodian[unicode='b7']
   .no-unicoderange &
     @extend %han-ligature
     font-family: 'Biaodian Basic', 'Han Heiti'
+
diff --git a/src/sass/inline/_em.sass b/src/sass/inline/_em.sass
@@ -39,3 +39,4 @@ em:lang(ja)
     $color: $han-text-emphasis-color-ja
 
   +han-text-emphasis( $posi, $mark, $shape, $color, $skip, false )
+
diff --git a/src/sass/inline/_hanging.sass b/src/sass/inline/_hanging.sass
@@ -23,7 +23,7 @@
 
   // Hide the collapsable spaces of closing brackets for we are sure
   // they ain't in use.
-  h-char.biaodian.close h-cs
+  h-char.bd-close h-cs
     display: none
 
   > h-cs
@@ -43,7 +43,7 @@
     // typography
     font: 1em 'Han Space', $han-mono
 
-  > h-cs h-char.end
+  > h-cs h-char.bd-end
     +han-typo-reset
     // positioning
     position: absolute

diff --git a/src/sass/inline/_jiya.sass b/src/sass/inline/_jiya.sass
@@ -17,19 +17,19 @@ h-cs[hidden]
 // *
 
 h-char.biaodian
-  &.open > h-inner
+  &.bd-open > h-inner
     margin-left: -.5em
 
-  &.close,
+  &.bd-close,
   &[unicode='3001'],
   &[unicode='3002'],
   &[unicode='ff0c'],
   &[unicode='ff0e']
     > h-inner
       letter-spacing: -.5em
 
-  &.open,
-  &.close,
+  &.bd-open,
+  &.bd-close,
   &[unicode='3001'],
   &[unicode='3002'],
   &[unicode='ff0c'],
@@ -53,10 +53,10 @@ h-char.biaodian
 // *
 h-char-group,
 h-hangable
-  &.portion .open:first-child h-cs,
-  &.portion .end:last-child h-cs,
-  .open + .open h-cs,
-  .end:not(:last-child) h-cs
+  &.portion .bd-open:first-child h-cs,
+  &.portion .bd-end:last-child h-cs,
+  .bd-open + .bd-open h-cs,
+  .bd-end:not(:last-child) h-cs
     display: none
 
   [unicode='3001'],
@@ -66,7 +66,7 @@ h-hangable
     &:lang(zh-Hant),
     &:lang(zh-TW),
     &:lang(zh-HK)
-      & + .open h-cs
+      & + .bd-open h-cs
         display: none
 
 h-char-group
@@ -79,6 +79,6 @@ h-char-group
 
   // * Handle ‘……「漢字’ situation
   // *
-  .liga:not(:last-child)
+  .bd-liga:not(:last-child)
     margin-right: -.25em
 
diff --git a/src/sass/inline/_subst.sass b/src/sass/inline/_subst.sass
@@ -27,3 +27,4 @@ h-char[display-as]
 
   &.comb-liga:after
     font-family: 'Romanization Sans', 'Zhuyin Kaiti'
+
diff --git a/src/sass/locale/_enhancement.sass b/src/sass/locale/_enhancement.sass
@@ -96,3 +96,4 @@ h-word
   // box
   display: inline-block
   text-indent: 0
+
diff --git a/src/styl/inline/basic-bd.styl b/src/styl/inline/basic-bd.styl
@@ -2,7 +2,7 @@
 /*
  * Basic Biaodian correction for Firefox
  */
-h-char.biaodian.liga,
+h-char.biaodian.bd-liga,
 h-char.biaodian[unicode='b7']
   .no-unicoderange &
     @extend $han-ligature

diff --git a/src/styl/inline/em.styl b/src/styl/inline/em.styl
@@ -31,3 +31,4 @@ em:lang(ja)
   if $han-text-emphasis-color-ja != $HAN-TEXT-EMPHASIS-COLOR-JA
     $color = $han-text-emphasis-color-ja
   han-text-emphasis($posi, $mark, $shape, $color, $skip, false)
+
diff --git a/src/styl/inline/hanging.styl b/src/styl/inline/hanging.styl
@@ -22,7 +22,7 @@ unless $han-hanging-hant
   display: inline
   // Hide the collapsable spaces of closing brackets for we are sure
   // they ain't in use.
-  h-char.biaodian.close h-cs
+  h-char.biaodian.bd-close h-cs
     display: none
   > h-cs
     // positioning
@@ -39,7 +39,7 @@ unless $han-hanging-hant
     visibility: hidden
     // typography
     font: 1em "Han Space", $han-mono
-  > h-cs h-char.end
+  > h-cs h-char.bd-end
     han-typo-reset()
     // positioning
     position: absolute

diff --git a/src/styl/inline/hws.styl b/src/styl/inline/hws.styl
@@ -25,3 +25,4 @@ h-hws[hidden]
   samp &,
   pre  &
     display: none
+
diff --git a/src/styl/inline/jiya.styl b/src/styl/inline/jiya.styl
@@ -15,19 +15,19 @@ h-cs[hidden]
 // * Handle line start/end Biaodian (行首行尾標點擠壓)
 // *
 h-char.biaodian
-  &.open > h-inner
+  &.bd-open > h-inner
     margin-left: -.5em
 
-  &.close,
+  &.bd-close,
   &[unicode='3001'],
   &[unicode='3002'],
   &[unicode='ff0c'],
   &[unicode='ff0e']
     > h-inner
       letter-spacing: -.5em
 
-  &.open,
-  &.close,
+  &.bd-open,
+  &.bd-close,
   &[unicode='3001'],
   &[unicode='3002'],
   &[unicode='ff0c'],
@@ -51,10 +51,10 @@ h-char.biaodian
 // *
 h-char-group,
 h-hangable
-  &.portion .open:first-child h-cs,
-  &.portion .end:last-child h-cs,
-  .open + .open h-cs,
-  .end:not(:last-child) h-cs
+  &.portion .bd-open:first-child h-cs,
+  &.portion .bd-end:last-child h-cs,
+  .bd-open + .bd-open h-cs,
+  .bd-end:not(:last-child) h-cs
     display: none
 
   [unicode='3001'],
@@ -64,7 +64,7 @@ h-hangable
     &:lang(zh-Hant),
     &:lang(zh-TW),
     &:lang(zh-HK)
-      & + .open h-cs
+      & + .bd-open h-cs
         display: none
 
 h-char-group
@@ -77,6 +77,6 @@ h-char-group
 
   // * Handle ‘……「漢字’ situation
   // *
-  .liga:not(:last-child)
+  .bd-liga:not(:last-child)
     margin-right: -.25em
 
diff --git a/src/styl/inline/subst.styl b/src/styl/inline/subst.styl
@@ -27,3 +27,4 @@ h-char[display-as]
 
   &.comb-liga:after
     font-family: 'Romanization Sans', 'Zhuyin Kaiti'
+