<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -342,7 +342,7 @@ Each new page can have its own set of these options:
   Prawn::Document.generate(&quot;page_creation.pdf&quot;) do
     text &quot;First Page, with default settings&quot;
 
-    start_new_page(:page_layout =&gt; :landscape, :page_size =&gt; &quot;A4&quot;)
+    start_new_page(:layout =&gt; :landscape, :size =&gt; &quot;A4&quot;)
     text &quot;Now on a landscaped A4 page&quot;
   end
 
@@ -809,11 +809,161 @@ need to render, Prawn will have no trouble producing your text.
 
 === Selecting Your Font ===
 
-Not Blank
+By default, Prawn will use Helvetica at size 12.  If you want to use another
+font, you'll need to specify it.  For built in fonts, this is as easy as
+referring to them by name.  Here's a little example that summarizes most of the
+basics:
+
+------------------------------------------------------------------------------
+
+  Prawn::Document.generate(&quot;fonts.pdf&quot;) do
+    text &quot;A cheer for Helvetica&quot;
+    
+    font &quot;Courier&quot;
+    text &quot;A Couri-yay for Courier&quot;
+    
+    font &quot;Times-Bold&quot;, :size =&gt; 8
+    text &quot;A little greeting to bold times&quot;
+    
+    font &quot;Helvetica&quot;
+    text &quot;Back to the old grind (at 12pt!)&quot;
+
+    font &quot;Times-Bold&quot;
+    text &quot;Still at 8 point here&quot;
+  end   
+
+------------------------------------------------------------------------------
+
+If we were to use TTF fonts instead, we need to specify a path to the file,
+either absolute or relative to the current working directory.  You'll often see
+us reference some of the files included with Prawn for demonstration purposes
+this way:
+
+------------------------------------------------------------------------------
+
+  Prawn::Document.generate(&quot;fonts.pdf&quot;) do
+    font &quot;#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf&quot;
+    text &quot;Hi there&quot;
+  end   
+
+------------------------------------------------------------------------------
+
+Though this is pretty simple stuff, there are a few things you might want to
+make a note of when using +font()+.  The first is that font names are case
+sensitive.  If you use &quot;courier&quot; instead of &quot;Courier&quot;, Prawn will become sad
+with you.  Furthermore, when using TTF fonts, your font name must end in the
+.ttf extension, otherwise Prawn will not detect it as a valid font.
+
+The other thing to notice is that current font size is stored by font in Prawn.
+The default size for all fonts is 12, but when we change it in the way shown
+previously, it affects things globally for that particular font.  If you run the
+example, you'll see that the Courier and Helvetica text is rendered at 12 point,
+but the Times-Bold is rendered at 8 point even without explictly specifying it
+the second time around.
+
+If we want to do things in a non-global way, it is possible to do so.  
+
+------------------------------------------------------------------------------
+
+  Prawn::Document.generate(&quot;fonts.pdf&quot;) do
+    font &quot;Courier&quot; do
+      font.size(20) do
+        text &quot;Some fixed width text with a nice big font&quot;
+      end
+    end
+
+    text &quot;Some 12 point Helvetica here&quot;
+
+    font &quot;Courier&quot; do
+      text &quot;Some 12 point courier here&quot;
+    end
+  end   
+
+------------------------------------------------------------------------------
+
+Note we needed to set the font size in a special way here.  Future versions of
+Prawn will roll back the :size option when passed to +font()+, but this workaround
+is currently needed.
+
+Of course, +font.size+ is useful even within a single font face.  Like +font()+,
+you can use it both globally and transactionally:
+
+------------------------------------------------------------------------------
+
+  Prawn::Document.generate(&quot;fonts.pdf&quot;) do
+    text &quot;Helvetica 12&quot;
+
+    font.size(16) do
+      text &quot;Helvetica 16&quot;
+      text &quot;Helvetica 32&quot;, :size =&gt; 32
+    end
+
+    text &quot;Helvetica 12&quot;
+
+    font.size = 40
+
+    text &quot;Helvetica 40&quot;
+  end   
+
+------------------------------------------------------------------------------
+
+Since there a lot of different use cases here, Prawn provides a lot of ways to
+work with font sizes.  Feel free to choose the ones that seem most well suited
+to your needs.
 
 === Font Families and Styling ===
 
-Not Blank
+Setting typefaces and font sizes isn't all you can do in Prawn.  You can also
+group several fonts together to form a family, simplifying some styling tasks.
+Though this support is fairly basic in Prawn 0.3, it is currently being improved 
+and is worth knowing about even in its limited capability.
+
+Prawn automatically groups the built-in fonts into families.  This means you can
+specify the base name of a family and get all of its styles:
+
+------------------------------------------------------------------------------
+
+  Prawn::Document.generate(&quot;fonts.pdf&quot;) do
+    %w[Helvetica Courier Times-Roman].each do |name|
+      [:normal, :bold, :italic, :bold_italic].each do |s|   
+        font name
+        text &quot;Hello World&quot;, :style =&gt; s
+      end
+    end
+  end   
+
+------------------------------------------------------------------------------
+
+You can do this globally via +font()+, or per string with +text()+. If you are
+okay with using the built in fonts, this is all you need to know.  However, if
+you want to make use of TTF fonts, you'll need to know how to register a family
+manually.
+
+Luckily, this is quite easy to do.  We literally just match up style names with
+font files.
+
+------------------------------------------------------------------------------
+
+  Prawn::Document.generate(&quot;fonts.pdf&quot;) do
+    font_families.update(
+     &quot;MyTrueTypeFamily&quot; =&gt; { :bold        =&gt; &quot;foo-bold.ttf&quot;,
+                             :italic      =&gt; &quot;foo-italic.ttf&quot;,
+                             :bold_italic =&gt; &quot;foo-bold-italic.ttf&quot;,
+                             :normal      =&gt; &quot;foo.ttf&quot; })
+
+
+    font(&quot;MyTrueTypeFamily&quot;)
+    text &quot;Some bold text&quot;, :style =&gt; :bold
+    text &quot;Some normal text&quot;
+  end
+
+------------------------------------------------------------------------------
+
+It's also worth mentioning that style names are entirely based on convention.
+If you want to create a style named +:happy_kitten_puppies+, it'd work fine.
+However, by using +:normal+, +:bold+, +:italic+, and +:bold_italic+, you might
+be able to take advantage of some assumptions made by Prawn in other
+places.
 
 == Spans and Bounding Boxes ==
 
@@ -825,6 +975,8 @@ Not Blank
 
 == Working With Images ==
 
+Not Blank
+
 == Common Mistakes ==
 
 Not Blank</diff>
      <filename>manual/src/index.txt</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>caf753c85ab08892ba36fc43044facd0d7064ea0</id>
    </parent>
  </parents>
  <author>
    <name>Gregory Brown</name>
    <email>gregory.t.brown@gmail.com</email>
  </author>
  <url>http://github.com/yob/prawn/commit/566c461b74559ddccfe7eacfe83ef2252b292c11</url>
  <id>566c461b74559ddccfe7eacfe83ef2252b292c11</id>
  <committed-date>2009-01-04T19:26:40-08:00</committed-date>
  <authored-date>2009-01-04T18:44:58-08:00</authored-date>
  <message>Font stuff</message>
  <tree>8b41bd01d6cf31207d086450dd6e7ec2cea756d3</tree>
  <committer>
    <name>Jamis Buck</name>
    <email>jamis@37signals.com</email>
  </committer>
</commit>
