font-stacks 0.1.3 → 0.1.4

data/CHANGELOG.mdown

@@ -1,3 +1,13 @@
+# 0.1.4
+
+* [NEW] Added vars for setting the default sans-serif, serif and monospace.
+* [NEW] Added `@warn` for when the fail safe gets triggered, defaults to $default-sans-serif.
+* [NEW] Can now access defaults by passing "sans-serif", "serif", or "monospace".
+* [NEW] Cleaned up the tests and gave the test view some style.
+* [NEW] Added support for Times New Roman.
+* [CHANGED] Better documentation in the readme on the font stacks supported.
+* [CHANGED] DRY'd up the mixin.
+
 # 0.1.3
 
 * [NEW] Added $default-monospace var to override the default monospace.

data/lib/font-stacks.rb

@@ -3,7 +3,7 @@ Compass::Frameworks.register("font-stacks", :path => "#{File.dirname(__FILE__)}/
 
 module FontStacks
   
-  VERSION = "0.1.3"
-  DATE = "2011-11-23"
+  VERSION = "0.1.4"
+  DATE = "2011-11-25"
 
 end

data/stylesheets/_font-stacks.scss

@@ -12,8 +12,15 @@
 //    Avoid using Helvetica or Helvetica Neue for body text, especially below 14px.
 //    Futura, Gill Sans and Franklin Gothic Medium should be carefully stacked and used because of their unusual weight.
 
-$default-font-family: "Helvetica" !default;
+// Default fonts
+$default-sans-serif: "Helvetica" !default;
+$default-serif: "Georgia" !default;
 $default-monospace: false !default;
+
+// Fail-safe
+$default-font-family: $default-sans-serif !default;
+
+// The 'family' var
 $family: $default-font-family !default;
 
 @import "font-stacks/function";

data/stylesheets/font-stacks/_function.scss

@@ -4,135 +4,128 @@
   // Serif
   //
 
-  // BASKERVILLE ( 88.60% on Mac, 49.10% on Windows)
+  @if $family == "serif" {
+    @return font-family($default-serif);
+  }
+
   @if $family == "Baskerville" {
     @return Baskerville, "Baskerville Old Face", "Hoefler Text", Garamond, "Times New Roman", serif;
   }
 
-  // BIG CASLON (85.10% on Mac)
   @else if $family == "Big Caslon" {
     @return "Big Caslon", "Book Antiqua", "Palatino Linotype", Georgia, serif;
   }
-  
-  // BODONI (47.89% on Windows)
+
   @else if $family == "Bodoni MT" {
     @return "Bodoni MT", Didot, "Didot LT STD", "Hoefler Text", Garamond, "Times New Roman", serif;
   }
 
-  // BOOK ANTIQUA (86.09% on Mac)
   @else if $family == "Book Antiqua" {
     @return "Book Antiqua", Palatino, "Palatino Linotype", "Palatino LT STD", Georgia, serif;
   }
-  
-  // CAMBRIA (54.51% on Windows)
+
   @else if $family == "Cambria" {
     @return Cambria, Georgia, serif;
   }
 
-  // CONSTANTIA (53.81% on Windows)
   @else if $family == "Constantia" {
     @return Constantia, Palatino, "Palatino Linotype", "Palatino LT STD", Georgia, serif;
   }
 
-  // DIDOT (87.72% on Mac)
   @else if $family == "Didot" {
     @return Didot, "Didot LT STD", "Hoefler Text", Garamond, "Times New Roman", serif;
   }
 
-  // GARAMOND (23.84% on Mac, 86.24% on Windows)
   @else if $family == "Garamond" {
     @return Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif;
   }
 
-  // GOUDY OLD STYLE (51.30% on Windows)
   @else if $family == "Goudy Old Style" {
     @return "Goudy Old Style", Garamond, "Big Caslon", "Times New Roman", serif;
   }
 
-  // HOEFLER TEXT (88.70% on Mac, 1.16% on Windows)
   @else if $family == "Hoefler Text" {
     @return "Hoefler Text", "Baskerville Old Face", Garamond, "Times New Roman", serif;
   }
 
-  // LUCIDA BRIGHT (64.90% on Mac, 33.84% on Windows) - huge x-height
   @else if $family == "Lucida Bright" {
     @return "Lucida Bright", Georgia, serif;
   }
 
-  // PALATINO (79.71% on Mac, 98.04% on Windows)
   @else if $family == "Palatino" {
     @return Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif;
   }
 
+  @else if $family == "Times New Roman" {
+    @return "Times New Roman", Times, serif;
+  }
+  
+  // Alias to "Times New Roman"
+  @else if $family == "Times" {
+    @return font-family("Times New Roman");
+  }
+
   //
   // Sans-serif
   //
 
-  // CALIBRI (54.76% on Windows)
+  @if $family == "sans-serif" {
+    @return font-family($default-sans-serif);
+  }
+
   @else if $family == "Calibri" {
     @return Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
   }  
 
-  // CANDARA (54.31% on Windows)
   @else if $family == "Candara" {
     @return Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
   }
 
-  // FRANKLIN GOTHIC MEDIUM (97.89% on Windows)
   @else if $family == "Franklin Gothic Medium" {
     @return "Franklin Gothic Medium", Arial, sans-serif;
   } 
 
-  // FUTURA (91.01% on Mac)
   @else if $family == "Futura" {
     @return Futura, "Trebuchet MS", Arial, sans-serif;
   }
 
-  // GENEVA (98.84% on Mac)
   @else if $family == "Geneva" {
     @return Geneva, Tahoma, Verdana, sans-serif;
   }
-  
-  // GILL SANS (91.52% on Mac, 51.74% on Windows)
+
   @else if $family == "Gill Sans" {
     @return "Gill Sans", "Gill Sans MT", Calibri, sans-serif;
   }
 
-  // HELVETICA NEUE (94.74% on Mac)
   @else if $family == "Helvetica Neue" {
     @return "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
   }
-  // Alias to "helvetica-neue"
+
+  // Alias to "Helvetica Neue"
   @else if $family == "Helvetica" {
     @return font-family("Helvetica Neue");
   }
-  
-  // LUCIDA GRANDE (99.13% on Mac, 98.25% on Windows)
+
   @else if $family == "Lucida Grande" {
     @return "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
   }
 
-  // OPTIMA (90.14% on Mac)
   @else if $family == "Optima" {
     @return Optima, Segoe, "Segoe UI", Candara, Calibri, Arial, sans-serif;
   }
 
-  // SEGOE (45.04% on Windows)
   @else if $family == "Segoe" {
     @return Segoe, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
   }
 
-  // TAHOMA (99.30% on Windows)
   @else if $family == "Tahoma" {
     @return Tahoma, Geneva, Verdana, sans-serif;
   }
 
-  // TREBUCHET (94.20% on Mac, 99% on Windows)
   @else if $family == "Trebuchet MS" {
     @return "Trebuchet MS", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Tahoma, sans-serif;
   }
 
-  // VERDANA (96.81% on Mac, 99.40% on Windows)
   @else if $family == "Verdana" {
     @return Verdana, Geneva, sans-serif;
   }
@@ -141,7 +134,7 @@
   // Monospace
   //
   
-  @else if $family == "Monospace" {
+  @else if $family == "monospace" {
     @if $default-monospace {
       @return $default-monospace;
     }
@@ -149,17 +142,13 @@
       @return "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace;
     }
   }
-
-  // Alias to "Monospace"
-  @else if $family == "monospace" {
-    @return font-family("Monospace");
-  }
  
   //
   // Else, catch all, fail safe
   //
 
   @else {
+    @warn "The font-family you specified wasn't found. The $default-font-family has been returned instead.";
     @return font-family($default-font-family);
   }
 

data/stylesheets/font-stacks/_mixin.scss

@@ -1,167 +1,7 @@
 @mixin font-family($family) {
-  
-  //
-  // Serif
-  //
-
-  // BASKERVILLE ( 88.60% on Mac, 49.10% on Windows)
-  @if $family == "Baskerville" {
-    font-family: font-family($family);
-  }
-
-  // BIG CASLON (85.10% on Mac)
-  @else if $family == "Big Caslon" {
-    font-family: font-family($family);
-  }
-  
-  // BODONI (47.89% on Windows)
-  @else if $family == "Bodoni MT" {
-    font-family: font-family($family);
-  }
-
-  // BOOK ANTIQUA (86.09% on Mac)
-  @else if $family == "Book Antiqua" {
-    font-family: font-family($family);
-  }
-  
-  // CAMBRIA (54.51% on Windows)
-  @else if $family == "Cambria" {
-    font-family: font-family($family);
-  }
-
-  // CONSTANTIA (53.81% on Windows)
-  @else if $family == "Constantia" {
-    font-family: font-family($family);
-  }
-
-  // DIDOT (87.72% on Mac)
-  @else if $family == "Didot" {
-    font-family: font-family($family);
-  }
-
-  // GARAMOND (23.84% on Mac, 86.24% on Windows)
-  @else if $family == "Garamond" {
-    font-family: font-family($family);
-  }
-
-  // GOUDY OLD STYLE (51.30% on Windows)
-  @else if $family == "Goudy Old Style" {
-    font-family: font-family($family);
-  }
-
-  // HOEFLER TEXT (88.70% on Mac, 1.16% on Windows)
-  @else if $family == "Hoefler Text" {
-    font-family: font-family($family);
-  }
-
-  // LUCIDA BRIGHT (64.90% on Mac, 33.84% on Windows) - huge x-height
-  @else if $family == "Lucida Bright" {
-    font-family: font-family($family);
-  }
-
-  // PALATINO (79.71% on Mac, 98.04% on Windows)
-  @else if $family == "Palatino" {
-    font-family: font-family($family);
-  }
-
-  //
-  // Sans-serif
-  //
-
-  // CALIBRI (54.76% on Windows)
-  @else if $family == "Calibri" {
-    font-family: font-family($family);
-  }  
-
-  // CANDARA (54.31% on Windows)
-  @else if $family == "Candara" {
-    font-family: font-family($family);
-  }
-
-  // FRANKLIN GOTHIC MEDIUM (97.89% on Windows)
-  @else if $family == "Franklin Gothic Medium" {
-    font-family: font-family($family);
-  } 
-
-  // FUTURA (91.01% on Mac)
-  @else if $family == "Futura" {
-    font-family: font-family($family);
-  }
-
-  // GENEVA (98.84% on Mac)
-  @else if $family == "Geneva" {
-    font-family: font-family($family);
-  }
-  
-  // GILL SANS (91.52% on Mac, 51.74% on Windows)
-  @else if $family == "Gill Sans" {
-    font-family: font-family($family);
-  }
-
-  // HELVETICA NEUE (94.74% on Mac)
-  @else if $family == "Helvetica Neue" {
-    font-family: font-family($family);
-  }
-  
-  // Alias to "Helvetica Neue"
-  @else if $family == "Helvetica" {
-    font-family: font-family("Helvetica Neue");
-  }
-  
-  // LUCIDA GRANDE (99.13% on Mac, 98.25% on Windows)
-  @else if $family == "Lucida Grande" {
-    font-family: font-family($family);
-  }
-
-  // OPTIMA (90.14% on Mac)
-  @else if $family == "Optima" {
-    font-family: font-family($family);
-  }
-
-  // SEGOE (45.04% on Windows)
-  @else if $family == "Segoe" {
-    font-family: font-family($family);
-  }
-
-  // TAHOMA (99.30% on Windows)
-  @else if $family == "Tahoma" {
-    font-family: font-family($family);
-  }
-
-  // TREBUCHET (94.20% on Mac, 99% on Windows)
-  @else if $family == "Trebuchet MS" {
-    font-family: font-family($family);
-  }
-
-  // VERDANA (96.81% on Mac, 99.40% on Windows)
-  @else if $family == "Verdana" {
-    font-family: font-family($family);
-  }
-  
-  //
-  // Monospace
-  //
-  
-  @else if $family == "Monospace" {
-    font-family: font-family($family);
-  }
-
-  // Alias to "Monospace"
-  @else if $family == "monospace" {
-    font-family: font-family("Monospace");
-  }
-
-  //
-  // Else, catch all, fail safe
-  //
-  
-  @else {
-    font-family: font-family($default-font-family);
-  }
-
+  font-family: font-family($family);
 }
 
-// Shorthand counterpart
 @mixin ff($family) {
   @include font-family($family);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: font-stacks
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70134073545220 !ruby/object:Gem::Requirement
+  requirement: &70152259746140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +21,8 @@ dependencies:
         version: 0.11.5
   type: :runtime
   prerelease: false
-  version_requirements: *70134073545220
-description: Sass/Compass extension for Sassy access to common web-friendly font-stacks
+  version_requirements: *70152259746140
+description: A Sass and Compass font-family library of common web-friendly font stacks
 email:
 - adam@stacoviak.com
 executables: []
@@ -48,7 +48,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2595218414718269859
+      hash: 2867448192045769992
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -60,6 +60,6 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Sass/Compass extension that provides Sass functions to easily use common
-  web-friendly font-stacks
+summary: Font Stacks is a Sass and Compass font-family library of common web-friendly
+  font stacks.
 test_files: []