accoutrement 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2eca6b2e9fd7f48c7f94b5b44e15eab2c878bd4
-  data.tar.gz: d642b716f57ebe99eea3fd9126f66c0c4ab13e60
+  metadata.gz: 051b8e47b2a6d8e73a0b18f697efb6380d7eee58
+  data.tar.gz: 4c8c50d20b2d0ddecd0f5f7ba16e4d65338d53cb
 SHA512:
-  metadata.gz: 9556f7c356b1afc1879ac8e77c600ffdf1336902f21623b684b97d4a6e3a89c5b415fed175720bb589613255e7452453abde0292d0c764189113e65a50e07216
-  data.tar.gz: 81c5286e72063b50b32a82eaa53d29371e5a239d1acc59c8ef27c270d11eb6d5be1ff0a996460080fd693b92d69524342024970032e5a85c5c1dc0054d83327e
+  metadata.gz: 1a99afa561cadaaf1a5d4cbf8f42866b8a75be7f0f39c1ae51ee1c0aae2dc8a4eb60d3ad84956f809af79a39459dadb39b552da1e96ff32b2fc15e4249f270ca
+  data.tar.gz: bfb27c22775f50c07653575551d657e6a193b6f5680fc14ca0f5240bf44f7f7ca8600bc0ea2cc1623ac24fc707d14abcdfb8922ffe2764a8d580114b83f44076

data/README.md

@@ -12,7 +12,7 @@ Don't upgrade unless you're willing to use new things in new ways.
 License
 -------
 
-Copyright © Eric Meyer.
+Copyright © Eric M. Suzanne
 
 Original code licensed under MIT/GLPv2
 Open Source projects used within this project retain their original licenses.

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/stylesheets/_accoutrement.scss

@@ -1,7 +1,13 @@
+// Sass Extensions
+// ---------------
+
+@import 'accoutrement/maps';
+@import 'accoutrement/strings';
+
+
 // Utilities
 // ---------
 
-@import 'accoutrement/maps';
 @import 'accoutrement/settings';
 @import 'accoutrement/scale';
 @import 'accoutrement/fonts';

data/stylesheets/accoutrement/_fonts.scss

@@ -1,7 +1,11 @@
 // Fontface Tools
 // ==============
 
-@include set(fontface, formats, woff ttf);
+@include set(fontface, (
+  formats: woff ttf,
+  valid-styles: italic oblique,
+  valid-weights: 100 200 300 400 500 600 700 800 900 bold bolder lighter,
+));
 
 
 // Fonts
@@ -23,32 +27,115 @@
   $fonts: get(fonts),
   $formats: get(fontface, formats)
 ) {
+  $_output: _get-font-face($fonts, $formats);
+
+  @each $font in $_output {
+    @font-face {
+      @include output-map($font);
+    }
+  }
+}
+
+
+// Font Placeholders
+// -----------------
+// Create font-family placeholders
+@mixin font-placeholders(
+  $fonts: get(fonts)
+) {
+  $_output: _get-font-placeholders($fonts);
+
+  @each $font, $map in $_output {
+    #{$font} {
+      @include output-map($map);
+    }
+  }
+}
+
+
+// Get Font Face
+// -------------
+// PRIVATE: Return a list of font-face output maps
+@function _get-font-face(
+  $fonts: get(fonts),
+  $formats: get(fontface, formats)
+) {
+  $_return: ();
+
   @each $font, $info in $fonts {
-    $name: map-get($info, name) or $font;
+    $_name: map-get($info, name) or $font;
+    $_files: map-get($info, files) or ();
+    $_interp-path: map-get($info, path);
+    $_interp-styles: map-get($info, styles);
+
+    @if $_interp-path and $_interp-styles {
+      $_interp: _interpolate-font-files($_interp-path, $_interp-styles);
+      $_files: map-merge($_interp, $_files);
+    }
 
-    @each $styles, $path in map-get($info, files) {
+    @each $styles, $path in $_files {
       $styles: _parse-font-styles($styles);
-      $src: _build-font-src($path, $formats);
+      $_src: _build-font-src($path, $formats);
+
+      $_return: append($_return, (
+        font-family: quote($_name),
+        src: $_src,
+        font-weight: map-get($styles, weight),
+        font-style: map-get($styles, style),
+      ));
+    }
+  }
+
+  @return $_return;
+}
 
-      @font-face {
-        font-family: quote($name);
-        src: $src;
-        font-weight: map-get($styles, weight);
-        font-style: map-get($styles, style);
+
+// Interpolate Font Files
+// ----------------------
+// PRIVATE: Return font files based on path/style interpolation
+@function _interpolate-font-files(
+  $path,
+  $variants: regular
+) {
+  $_styles: get(fontface, valid-styles);
+  $_weights: get(fontface, valid-weights);
+  $_return: ();
+
+  @each $v in $variants {
+    $_key: ();
+    $_weight: '';
+    $_style: '';
+
+    @if length($v) == 1 {
+      $_weight: $v;
+      $_key: $v;
+    } @else {
+      @each $item in $v {
+        @if index($_styles, $item) {
+          $_style: $item;
+        } @else if index($_weights, $item) {
+          $_weight: $item;
+        }
+        $_key: append($_key, to-lower-case($item));
       }
     }
+
+    $_val: interpolate($path, $_weight, $_style);
+    $_return: map-merge($_return, ($_key: $_val));
   }
+
+  @return $_return;
 }
 
 
 // Parse Font Styles
 // -----------------
-// Return font weight and style based on shorthand syntax
+// PRIVATE: Return font weight and style based on shorthand syntax
 @function _parse-font-styles(
   $face
 ) {
-  $styles: italic, oblique;
-  $weights: 100, 200, 300, 400, 500, 600, 700, 800, 900, bold, bolder, lighter;
+  $styles: get(fontface, valid-styles);
+  $weights: get(fontface, valid-weights);
   $return: (
     weight: normal,
     style: normal,
@@ -68,7 +155,7 @@
 
 // Build Font SRC
 // --------------
-// Return src attribute based on path and formats
+// PRIVATE: Return src attribute based on path and formats
 @function _build-font-src(
   $path,
   $formats: get(fontface, formats)
@@ -92,22 +179,26 @@
 }
 
 
-// Font Placeholders
-// -----------------
-// Create font-family placeholders
-@mixin font-placeholders(
+// Get Font Placeholders
+// ---------------------
+// PRIVATE: Return a list of font-placeholder maps ready for output
+@function _get-font-placeholders(
   $fonts: get(fonts)
 ) {
+  $_return: ();
+
   @each $font, $info in $fonts {
-    $name: map-get($info, name) or $font;
-    $type: map-get($info, type);
-    $stack: append($name, map-get($info, stack), comma);
-    $stack: append($stack, $type, comma);
+    $_name: map-get($info, name) or $font;
+    $_type: map-get($info, type);
+    $_stack: join($_name, map-get($info, stack) or (), comma);
+    $_stack: append($_stack, $_type, comma);
 
-    @if $type == monospace {
-      $stack: append($stack, serif);
+    @if $_type == monospace {
+      $_stack: append($_stack, serif);
     }
 
-    %#{$font} { font-family: $stack; }
+    $_return: map-merge($_return, ('%#{$font}': (font-family: $_stack)));
   }
+
+  @return $_return;
 }

data/stylesheets/accoutrement/_strings.scss

@@ -0,0 +1,46 @@
+// String Functions
+// ================
+
+$interpolation-format-string: '%s';
+
+// String Replace
+// --------------
+// Return a string, with a substring replaced
+@function str-replace(
+  $string,
+  $old,
+  $new: ''
+) {
+  $_i: str-index($string, $old);
+  $_n: str-length($old);
+
+  $_a: str-slice($string, 1, $_i - 1);
+  $_z: str-slice($string, $_i + $_n);
+
+  @return $_a + $new + $_z;
+}
+
+
+// Interpolate
+// -----------
+// Return a string with interpolated values replacing '%s' format strings
+@function interpolate(
+  $string,
+  $values...
+) {
+  $_return: $string;
+
+  @each $val in $values {
+    @if str-index($_return, $interpolation-format-string) {
+      $_return: str-replace($_return, $interpolation-format-string, $val);
+    } @else {
+      @warn 'Too many values passed for interpolation with "#{$string}".';
+    }
+  }
+
+  @if str-index($_return, $interpolation-format-string) {
+    @warn 'Not all format strings were replaced in "#{$string}".';
+  }
+
+  @return $_return;
+}

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: accoutrement
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
-- Eric Meyer
+- Eric M. Suzanne
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -61,6 +61,7 @@ files:
 - stylesheets/accoutrement/_pseudo-elements.scss
 - stylesheets/accoutrement/_scale.scss
 - stylesheets/accoutrement/_settings.scss
+- stylesheets/accoutrement/_strings.scss
 - stylesheets/accoutrement/_tooltips.scss
 - README.md
 - VERSION