Merge branch 'howto-install-consolas-font-mac' into deploy

Conflicts:
	config.yaml

config.yaml

@@ -2,7 +2,7 @@
 # A list of file extensions that nanoc will consider to be textual rather than
 # binary. If an item with an extension not in this list is found,  the file
 # will be considered as binary.
-text_extensions: [ 'css', 'erb', 'haml', 'htm', 'html', 'js', 'json', 'less', 'markdown', 'md', 'mkdn', 'php', 'rb', 'sass', 'txt', 'xhtml', 'xml' ]
+text_extensions: [ 'css', 'erb', 'haml', 'htm', 'html', 'js', 'json', 'less', 'markdown', 'mkdn', 'md', 'php', 'rb', 'sass', 'txt', 'xhtml', 'xml' ]
 
 # The path to the directory where all generated files will be written to. This
 # can be an absolute path starting with a slash, but it can also be path

content/screen.sass

@@ -9,7 +9,7 @@ body
 
 
 // HTML5 expectations - should go in reset perhaps
-header, footer, nav, article
+header, footer, nav, article, figure, figcaption
   display: block
 
 
@@ -113,6 +113,18 @@ blockquote
   padding-left: 1em
   margin: 0 0 1em 0
 
+figure
+  margin: 1em 0
+
+figcaption
+  font-size: small
+  text-align: center
+  font-style: italic
+
+  .label
+    font-weight: bold
+
+
 
 body > header
   font-family: "Helvetica Neue", Helvetica, "Liberation Sans", "Bitstream Vera Sans", Tahoma, Geneva, Arial, sans-serif
@@ -357,7 +369,6 @@ img.feed-icon
   display: block
   margin: 10px auto
 
-
 #content
   .clear
     clear: both

content/technical/2009/03/consolas-on-mac-update.html

@@ -1,3 +1,6 @@
+**Update 4 Aug 2010:** See revised post: [How to Install Consolas on Mac OS X][revised]
+[revised]: /technical/2010/08/howto-install-consolas-font-mac/
+
 Today I followed my own <a href="/technical/2009/03/install-consolas-mac-osx/">directions on installing Consolas</a> on my Mac Pro. The original directions were put together when installing it on my Mac Book. The downloaded disk image had a different volume name, as did the meta package. So the the command I used to launch the font installer was:
 
     open "/Volumes/Open XML File Format Converter for Mac 1.0/Open XML File Format Converter for Mac 1.0.mpkg/Contents/Packages/OpenXML_all_fonts.pkg"

content/technical/2009/03/install-consolas-mac-osx.html

@@ -1,3 +1,6 @@
+**Update 4 Aug 2010:** See revised post: [How to Install Consolas on Mac OS X][revised]
+[revised]: /technical/2010/08/howto-install-consolas-font-mac/
+
 With the introduction of Windows Vista and Office 2007 Microsoft included some new fonts, which became the defaults in Office. Their names all start with 'C' and they are quite attractive. In particular there is a monospaced font called <a href="http://en.wikipedia.org/wiki/Consolas">Consolas</a> that is nice to use as a text editor font and Terminal font. The problem is they aren't technically free, although Microsoft does include them in a number of freely available updaters. What follows is how I went about installing the fonts on my Mac.
 
 <!--more-->

content/technical/2010/08/howto-install-consolas-font-mac.mkdn

@@ -0,0 +1,67 @@
+I've [previously](/technical/2009/03/install-consolas-mac-osx/)
+[written](/technical/2009/03/consolas-on-mac-update/)
+[about](/technical/2009/09/font-smoothing-in-snow-leopard/) installing the
+Consolas font on Mac OS X. This post bundles up those posts
+into a single reference.
+
+Installation
+------------
+
+1. Download the Open XML File Format Converter for Mac from the
+   [Microsoft Mactopia download page][download].
+2. Double click the disk image if it wasn't automatically mounted. You will
+   see an Open XML File Format Converter meta package (.mpkg).
+3. Right click (or Control-click) the meta package and choose "Show Package Contents".
+4. In the Finder window that opens, click "Contents", then "Packages".
+5. Double click "OpenXML\_all\_fonts.pkg", which will run the installer.
+
+[download]: http://www.microsoft.com/mac/downloads.mspx
+
+<figure>
+  <a href="/images/2010/08/open-xml-converter-show-package-contents.png" rel="prettyPhoto[openxml]"><img src="/images/2010/08/open-xml-converter-show-package-contents-small.jpg" width="600" height="325" alt="Step 1: Show Package Contents" /></a>
+  <figcaption><span class="label">Step 3:</span> Show Package Contents</figcaption>
+<figure>
+
+<figure>
+  <a href="/images/2010/08/open-xml-converter-all-fonts.png" rel="prettyPhoto[openxml]"><img src="/images/2010/08/open-xml-converter-all-fonts-small.jpg" width="600" height="180" alt="Step 4: Navigating to the package" /></a>
+  <figcaption><span class="label">Step 4:</span> Navigating to the package</figcaption>
+</figure>
+
+<figure>
+  <a href="/images/2010/08/open-xml-converter-all-fonts-installer.png" rel="prettyPhoto[openxml]"><img src="/images/2010/08/open-xml-converter-all-fonts-installer-small.jpg" width="600" height="426" alt="Step 5: Running the OpenXML_all_fonts.pkg installer"></a>
+  <figcaption><span class="label">Step 5:</span> Running the OpenXML_all_fonts.pkg installer</figcaption>
+</figure>
+
+Fine Tuning
+-----------
+
+At this point Consolas is now installed, but depending on your font smoothing
+settings it [may look a bit thin and ugly][smoothing]. This can be fixed by
+adjusting these settings.
+
+[smoothing]: /technical/2009/09/font-smoothing-in-snow-leopard/
+
+For Mac OS X Snow Leopard its necessary to set the right value in the Terminal
+because Apple removed it from System Preferences:
+
+1. Open Terminal (Applications > Utilities > Terminal)
+1. Copy and paste the following at the terminal prompt and press Return:
+
+    `defaults -currentHost write -globalDomain AppleFontSmoothing -int 2`
+
+For the Terminal shy, this is what the command is doing: The
+[`defaults`][defaults] command manipulates the user defaults, also known as
+preferences. This particular use of it sets the AppleFontSmoothing setting at
+the global (I.e. all users or system) level to the integer 2, which corresponds
+to the Medium font smoothing setting in previous versions of Mac OS X. 
+
+[defaults]: http://developer.apple.com/DOCUMENTATION/DARWIN/Reference/ManPages/man1/defaults.1.html
+
+For Mac OS X Leopard or earlier its easier:
+
+1. Open System Preferences
+1. Click "Appearance"
+1. At the bottom, set Font smoothing to, "Medium (best for Flat Panel)"
+
+You will need to restart any running applications for them to pick up the new
+font smoothing settings.

content/technical/2010/08/howto-install-consolas-font-mac.yaml

@@ -0,0 +1,12 @@
+--- 
+title: How to Install Consolas on Mac OS X
+extra: Concise summary of where to download and how to install the Consolas font on Mac OS X.
+kind: article
+section: technical
+created_at: 2010-08-04 13:50:00
+keywords: 
+- install
+- consolas
+- mac
+- font
+short_url: http://bit.ly/b0XwgI

layouts/_head.html

@@ -9,11 +9,13 @@
 <link rel="stylesheet" href="/css/reset.css" type="text/css" media="screen,projection" />
 <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen,projection" />
 <link rel="stylesheet" href="/css/mobile.css" type="text/css" media="only screen and (max-device-width: 480px)" />
+<link rel="stylesheet" href="/css/prettyPhoto.css" type="text/css" media="screen" charset="utf-8" />
 <link rel="alternate" href="http://feeds.feedburner.com/wezm" type="application/atom+xml" title="WezM.net - All Articles" />
 <link rel="alternate" href="http://feeds.feedburner.com/wezm-technical" type="application/atom+xml" title="WezM.net - Technical Articles" />
 <link rel="alternate" href="http://feeds.feedburner.com/wezm-personal" type="application/atom+xml" title="WezM.net - Personal Articles" />
 <script src="/js/jquery-1.4.2.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/js/jquery.timers-1.1.2.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/jquery.prettyPhoto.js" type="text/javascript" charset="utf-8"></script>
 <script src="/js/application.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
   var _gaq = _gaq || [];

layouts/home.html

@@ -2,9 +2,6 @@
 <html>
 <head>
   <%= render '_head' %>
-  <link rel="stylesheet" href="/css/prettyPhoto.css" type="text/css" media="screen" charset="utf-8" />
-  <script src="/js/jquery-1.4.2.min.js" type="text/javascript" charset="utf-8"></script>
-  <script src="/js/jquery.prettyPhoto.js" type="text/javascript" charset="utf-8"></script>
   <script src="/js/mojo.js" type="text/javascript" charset="utf-8"></script>
   <script src="/js/home.js" type="text/javascript" charset="utf-8"></script>
 </head>

output/js/application.js

@@ -44,5 +44,7 @@ jQuery(function() {
     input.val('');
   }
   $('#search').show();
-});
 
+  // Enable light box
+  $("a[rel^='prettyPhoto']").prettyPhoto({theme: "facebook"});
+});

output/js/home.js

@@ -20,7 +20,6 @@ jQuery(function () {
       li.css("background-position", (i * -75) + 'px -75px');
       ul.append(li);
     });
-    $("a[rel^='prettyPhoto']").prettyPhoto({theme: "facebook"});
   };
 
   // Populate Flickr