haml 4.1.0.beta.1 → 5.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6db8c2e57e4132457faca789a5700112ee9a8e5
-  data.tar.gz: c4f15045d582be5eeb7daecb3781c6102920beb9
+  metadata.gz: 056cc654414c29999474b5115839d33e5ebc9a20
+  data.tar.gz: e56a16b4d053d863af5e9a89200d413d7901f3f7
 SHA512:
-  metadata.gz: 3fabebdd299e3cea1516c42d40b6d63c96dbcf073434d11794403933b7b6fb233e0460908317256abbb07b7281da3b3582ac1b26676725cdc6462cbd31234d00
-  data.tar.gz: 3eff7188b9d214cf4face1dc8078c598c45369cb70a4caad27d74fc53d29ab7de5748ff7997a24b6dc807c4ee926c72bf6373885bc517ba525b541fe8bdf5ee9
+  metadata.gz: 7dbf54da5889f0477f6122eb5178310a1e0167f0aaed5f6b495efc6de108183a228bda85ae5a10c46862443e10d30836351d826bdda86d4ebede4b5221ed6b19
+  data.tar.gz: 5d77752a502ab13aaac1e1af68876ff9084913d4a82491c0e790ae851d8975931a478fd59779d5acb92587ebfbff93de4d33411945e0c3a726e5d7fd68902732

data/.yardopts

@@ -1,7 +1,7 @@
 --charset          utf-8
 --readme           README.md
 --markup           markdown
---markup-provider  maruku
+--markup-provider  kramdown
 --template-path    yard
 --default-return   ""
 --title            "Haml Documentation"

data/CHANGELOG.md

@@ -1,9 +1,9 @@
 # Haml Changelog
 
-## 4.1.0 (Unreleased)
+## 5.0.0 (Unreleased)
 
-* Haml now requires Ruby 1.9.2 or above.
-* Rails 3.0 and 3.1 are no longer supported, matching the official
+* Haml now requires Ruby 2.0.0 or above.
+* Rails 3 is no longer supported, matching the official
   [Maintenance Policy for Ruby on Rails](http://weblog.rubyonrails.org/2013/2/24/maintenance-policy-for-ruby-on-rails/).
   (Tee Parham)
 * Fix for attribute merging. When an attribute method (or literal nested hash)
@@ -14,6 +14,37 @@
 * Make escape_once respect hexadecimal references. (Matt Wildig)
 * General performance and memory usage improvements. (Akira Matsuda)
 * Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
+* Add a tracing option. When enabled, Haml will output a data-trace attribute on each tag showing the path
+  to the source Haml file from which it was generated. Thanks [Alex Babkin](https://github.com/ababkin).
+* Fix #@foo and #$foo style interpolation that was not working in html_safe mode. (Akira Matsuda)
+* Add `haml_tag_if` to render a block, conditionally wrapped in another element (Matt Wildig)
+* The `haml` command's debug option (`-d`) no longer executes the Haml code, but
+  rather checks the generated Ruby syntax for errors.
+* Support Rails 5.1 Erubi template handler.
+* Raise `Haml::InvalidAttributeNameError` when attribute name includes invalid characters. (Takashi Kokubun)
+* Drop dynamic quotes support and always escape `'` for `escape_html`/`escape_attrs` instead.
+  Also, escaped results are slightly changed and always unified to the same characters. (Takashi Kokubun)
+* Don't preserve newlines in attributes. (Takashi Kokubun)
+* Add temple gem as dependency and create `Haml::TempleEngine` class.
+  Some methods in `Haml::Compiler` are migrated to `Haml::TempleEngine`. (Takashi Kokubun)
+* Drop parser/compiler accessor from `Haml::Engine`. Modify `Haml::Engine#initialize` options
+  or `Haml::Template.options` instead. (Takashi Kokubun)
+* Don't ignore unexpected exceptions on initializing `ActionView::OutputBuffer`. (Takashi Kokubun)
+* Analyze attribute values by Ripper and render static attributes beforehand. (Takashi Kokubun)
+* Optimize attribute rendering about 3x faster. (Takashi Kokubun)
+
+## 4.0.7
+
+Released on August 10, 2015
+([diff](https://github.com/haml/haml/compare/4.0.6...4.0.7)).
+
+* Significantly improve performance of regexp used to fix whitespace handling in textareas (thanks [Stan Hu](https://github.com/stanhu)).
+
+## 4.0.6
+
+Released on Dec 1, 2014 ([diff](https://github.com/haml/haml/compare/4.0.5...4.0.6)).
+
+* Fix warning on Ruby 1.8.7 "regexp has invalid interval" (thanks [Elia Schito](https://github.com/elia)).
 
 ## 4.0.5
 
@@ -77,7 +108,7 @@ Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0
 
 ## 4.0.0
 
-* The Haml exectutable now accepts an `--autoclose` option. You can now
+* The Haml executable now accepts an `--autoclose` option. You can now
   specify a list of tags that should be autoclosed
 
 * The `:ruby` filter no longer redirects $stdout to the Haml document, as this
@@ -114,7 +145,7 @@ Released March 21, 2013 ([diff](https://github.com/haml/haml/compare/4.0.0...4.0
 
 * All Hash attribute values are now treated as HTML5 data, regardless of key.
   Previously only the "data" key was treated this way. Allowing arbitrary keys
-  means you can now easily use this feauture for Aria attributes, among other
+  means you can now easily use this feature for Aria attributes, among other
   uses.
   (thanks to [Elvin Efendi](https://github.com/ElvinEfendi))
 
@@ -533,7 +564,6 @@ The {file:HAML_REFERENCE.md#ugly-option `:ugly` option} is now on by default
 in the testing environment in Rails to help tests run faster.
 
 ## 3.0.0
-{#3-0-0}
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.0).
 

data/FAQ.md

@@ -2,14 +2,7 @@
 
 ## Haml
 
-### Why is my markup indented properly in development mode, but not in production?
-{#q-indentation-in-production}
-
-To improve performance, Haml defaults to {Haml::Options#ugly "ugly" mode} in
-Rails apps running in production.
-
-### How do I put a punctuation mark after an element, like "`I like <strong>cake</strong>!`"?
-{#q-punctuation}
+### How do I put a punctuation mark after an element, like "`I like <strong>cake</strong>!`"? {#q-punctuation}
 
 Expressing the structure of a document
 and expressing inline formatting are two very different problems.
@@ -37,8 +30,7 @@ then it's even easier:
 
     %p== I like #{link_to 'chocolate', 'http://franschocolates.com'}!
 
-### How do I stop Haml from indenting the contents of my `pre` and `textarea` tags?
-{#q-preserve}
+### How do I stop Haml from indenting the contents of my `pre` and `textarea` tags? {#q-preserve}
 
 Because Haml automatically indents the HTML source code,
 the contents of whitespace-sensitive tags like `pre` and `textarea`
@@ -78,8 +70,7 @@ and renders
 
     <p><textarea>Foo&#x000A;Bar</textarea></p>
 
-### How do I make my long lines of Ruby code look nicer in my Haml document?
-{#q-multiline}
+### How do I make my long lines of Ruby code look nicer in my Haml document? {#q-multiline}
 
 Put them in a helper or your model.
 
@@ -125,8 +116,7 @@ in Haml, you have to do
     - form_for stuff do
       ...
 
-### I have Haml installed. Why is Rails (only looking for `.html.erb` files | rendering Haml files as plain text | rendering Haml files as blank pages)?
-{#q-blank-page}
+### I have Haml installed. Why is Rails (only looking for `.html.erb` files | rendering Haml files as plain text | rendering Haml files as blank pages)? {#q-blank-page}
 
 There are several reasons these things might be happening.
 First of all, make sure that Haml really is installed;

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin and Nathan Weizenbaum
+Copyright (c) 2006-2009 Hampton Catlin and Natalie Weizenbaum
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,8 +1,10 @@
 # Haml
 
-[![Build Status](https://secure.travis-ci.org/haml/haml.png?branch=master)](http://travis-ci.org/haml/haml)
-[![Code Climate](https://codeclimate.com/github/haml/haml.png)](https://codeclimate.com/github/haml/haml)
-[![Coverage Status](https://coveralls.io/repos/haml/haml/badge.png)](https://coveralls.io/r/haml/haml)
+[![Gem Version](https://badge.fury.io/rb/haml.svg)](http://rubygems.org/gems/haml)
+[![Build Status](https://travis-ci.org/haml/haml.svg?branch=master)](http://travis-ci.org/haml/haml)
+[![Code Climate](http://img.shields.io/codeclimate/github/haml/haml.svg)](https://codeclimate.com/github/haml/haml)
+[![Coverage Status](http://img.shields.io/coveralls/haml/haml.svg)](https://coveralls.io/r/haml/haml)
+[![Inline docs](http://inch-ci.org/github/haml/haml.png)](http://inch-ci.org/github/haml/haml)
 
 Haml is a templating engine for HTML. It's designed to make it both easier and
 more pleasant to write HTML documents, by eliminating redundancy, reflecting the
@@ -14,29 +16,37 @@ that's both powerful and easy to understand.
 Haml can be used from the command line or as part of a Ruby web framework. The
 first step is to install the gem:
 
-    gem install haml
+~~~sh
+gem install haml
+~~~
 
 After you write some Haml, you can run
 
-    haml document.haml
+~~~sh
+haml document.haml
+~~~
 
 to compile it to HTML. For more information on these commands, check out
 
-    haml --help
+~~~sh
+haml --help
+~~~
 
-To use Haml programatically, check out the [YARD
-documentation](http://haml.info/docs/yardoc/).
+To use Haml programatically, check out the [YARD documentation](http://haml.info/docs/yardoc/).
 
 ## Using Haml with Rails
 
 To use Haml with Rails, simply add Haml to your Gemfile and run `bundle`.
 
-    gem 'haml'
+~~~ruby
+gem 'haml'
+~~~
 
-Haml 4.1 requires an actively maintained version of Rails (version 3.2 or later).
-If you are using Rails 3.0 or 3.1, you should use Haml version 4.0.x:
+Haml 5 will require Rails version 4.0 or later. If you are using Rails 3.x, you should use Haml version 4.0.x:
 
-    gem 'haml', '~> 4.0.4'
+~~~ruby
+gem 'haml', '~> 4.0.5'
+~~~
 
 If you'd like to replace Rails's Erb-based generators with Haml, add
 [haml-rails](https://github.com/indirect/haml-rails) to your Gemfile as well.
@@ -45,58 +55,76 @@ If you'd like to replace Rails's Erb-based generators with Haml, add
 
 The most basic element of Haml is a shorthand for creating HTML:
 
-    %tagname{:attr1 => 'value1', :attr2 => 'value2'} Contents
+~~~haml
+%tagname{:attr1 => 'value1', :attr2 => 'value2'} Contents
+~~~
 
 No end-tag is needed; Haml handles that automatically. If you prefer HTML-style
 attributes, you can also use:
 
-    %tagname(attr1='value1' attr2='value2') Contents
+~~~haml
+%tagname(attr1='value1' attr2='value2') Contents
+~~~
 
 Adding `class` and `id` attributes is even easier. Haml uses the same syntax as
 the CSS that styles the document:
 
-    %tagname#id.class
+~~~haml
+%tagname#id.class
+~~~
 
 In fact, when you're using the `<div>` tag, it becomes _even easier_. Because
 `<div>` is such a common element, a tag without a name defaults to a div. So
 
-    #foo Hello!
+~~~haml
+#foo Hello!
+~~~
 
 becomes
 
-    <div id='foo'>Hello!</div>
+~~~html
+<div id='foo'>Hello!</div>
+~~~
 
 Haml uses indentation to bring the individual elements to represent the HTML
 structure. A tag's children are indented beneath than the parent tag. Again, a
 closing tag is automatically added. For example:
 
-    %ul
-      %li Salt
-      %li Pepper
+~~~haml
+%ul
+  %li Salt
+  %li Pepper
+~~~
 
 becomes:
 
-    <ul>
-      <li>Salt</li>
-      <li>Pepper</li>
-    </ul>
+~~~html
+<ul>
+  <li>Salt</li>
+  <li>Pepper</li>
+</ul>
+~~~
 
 You can also put plain text as a child of an element:
 
-    %p
-      Hello,
-      World!
+~~~haml
+%p
+  Hello,
+  World!
+~~~
 
 It's also possible to embed Ruby code into Haml documents. An equals sign, `=`,
 will output the result of the code. A hyphen, `-`, will run the code but not
 output the result. You can even use control statements like `if` and `while`:
 
-    %p
-      Date/Time:
-      - now = DateTime.now
-      %strong= now
-      - if now > DateTime.parse("December 31, 2006")
-        = "Happy new " + "year!"
+~~~haml
+%p
+  Date/Time:
+  - now = DateTime.now
+  %strong= now
+  - if now > DateTime.parse("December 31, 2006")
+    = "Happy new " + "year!"
+~~~
 
 Haml provides far more tools than those presented here. Check out the [reference
 documentation](http://haml.info/docs/yardoc/file.REFERENCE.html)
@@ -114,18 +142,22 @@ Contributions are welcomed, but before you get started please read the
 [guidelines](http://haml.info/development.html#contributing).
 
 After forking and then cloning the repo locally, install Bundler and then use it
-to install the development gem dependecies:
-
-    gem install bundler
-    bundle install
+to install the development gem dependencies:
+~~~sh
+gem install bundler
+bundle install
+~~~
 
 Once this is complete, you should be able to run the test suite:
-
-    rake
+~~~sh
+rake
+~~~
 
 You'll get a warning that you need to install haml-spec, so run this:
 
-    git submodule update --init
+~~~sh
+git submodule update --init
+~~~
 
 At this point `rake` should run without error or warning and you are ready to
 start working on your patch!
@@ -133,18 +165,18 @@ start working on your patch!
 Note that you can also run just one test out of the test suite if you're working
 on a specific area:
 
-    ruby -Itest test/helper_test.rb -n test_buffer_access
+~~~sh
+ruby -Itest test/helper_test.rb -n test_buffer_access
+~~~
 
-Haml supports Ruby 1.9.2 and higher, so please make sure your changes run on
-both 1.9 and 2.0.
+Haml currently supports Ruby 2.0.0 and higher, so please make sure your changes run on 2.0+.
 
 ## Team
 
 ### Current Maintainers
 
-* [Norman Clarke](http://github.com/norman)
-* [Matt Wildig](http://github.com/mattwildig)
 * [Akira Matsuda](https://github.com/amatsuda)
+* [Matt Wildig](https://github.com/mattwildig)
 * [Tee Parham](https://github.com/teeparham)
 
 ### Alumni
@@ -153,17 +185,18 @@ Haml was created by [Hampton Catlin](http://hamptoncatlin.com), the author of
 the original implementation. Hampton is no longer involved in day-to-day coding,
 but still consults on language issues.
 
-[Nathan Weizenbaum](http://nex-3.com) was for many years the primary developer
+[Natalie Weizenbaum](http://nex-3.com) was for many years the primary developer
 and architect of the "modern" Ruby implementation of Haml.
 
+[Norman Clarke](http://github.com/norman) was the primary maintainer of Haml from 2012 to 2016.
 
 ## License
 
-Some of Nathan's work on Haml was supported by Unspace Interactive.
+Some of Natalie's work on Haml was supported by Unspace Interactive.
 
 Beyond that, the implementation is licensed under the MIT License.
 
-Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum and the Haml team
+Copyright (c) 2006-2013 Hampton Catlin, Natalie Weizenbaum and the Haml team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/REFERENCE.md

@@ -233,8 +233,7 @@ is compiled to:
 
     <script src='javascripts/script_9' type='text/javascript'></script>
 
-#### `:class` and `:id` Attributes
-{#class-and-id-attributes}
+#### `:class` and `:id` Attributes {#class-and-id-attributes}
 
 The `:class` and `:id` attributes can also be specified as a Ruby array whose
 elements will be joined together. A `:class` array is joined with `" "` and an
@@ -329,7 +328,7 @@ This is compiled to:
     </html>
 
 You can use as many such attribute methods as you want by separating them with
-commas, like a Ruby argument list. All the hashes will me merged together, from
+commas, like a Ruby argument list. All the hashes will be merged together, from
 left to right. For example, if you defined
 
     def hash1
@@ -389,27 +388,49 @@ or using `true` and `false`:
 
     %input(selected=true)
 
-#### HTML5 Custom Data Attributes
+<!-- The title to the next section (Prefixed Attributes) has changed. This
+<a> tag is so old links to here still work. -->
+<a id="html5_custom_data_attributes" style="border:0;"></a>
 
-HTML5 allows for adding [custom non-visible data
-attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data)
-to elements using attribute names beginning with `data-`. Custom data attributes
-can be used in Haml by using the key `:data` with a Hash value in an attribute
-hash. Each of the key/value pairs in the Hash will be transformed into a custom
-data attribute. For example:
+#### Prefixed Attributes
 
-    %a{:href=>"/posts", :data => {:author_id => 123}} Posts By Author
+HTML5 allows for adding
+[custom non-visible data attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data-with-the-data-*-attributes)
+to elements using attribute names beginning with `data-`. The
+[Accessible Rich Internet Applications](http://www.w3.org/WAI/intro/aria)
+specification makes use of attributes beginning with `aria-`. There are also
+frameworks that use non-standard attributes with a common prefix.
+
+Haml can help generate collections of attributes that share a prefix like
+these. Any entry in an attribute hash that has a Hash as its value is expanded
+into a series of attributes, one for each key/value pair in the hash, with the
+attribute name formed by joining the “parent” key name to the key name with a
+hyphen.
+
+For example:
+
+    %a{:href=>"/posts", :data => {:author_id => 123, :category => 7}} Posts By Author
 
 will render as:
 
-    <a data-author-id='123' href='/posts'>Posts By Author</a>
+    <a data-author-id='123' data-category='7' href='/posts'>Posts By Author</a>
 
 Notice that the underscore in `author_id` was replaced by a hyphen. If you wish
 to suppress this behavior, you can set Haml's
 {Haml::Options#hyphenate_data_attrs `:hyphenate_data_attrs` option} to `false`,
 and the output will be rendered as:
 
-    <a data-author_id='123' href='/posts'>Posts By Author</a>
+    <a data-author_id='123' data-category='7' href='/posts'>Posts By Author</a>
+
+This expansion of hashes is recursive – any value of the child hash that is
+itself a hash will create an attribute for each entry, with the attribute name
+prefixed with all ancestor keys. For example:
+
+    .book-info{:data => {:book => {:id => 123, :genre => 'programming'}, :category => 7}}
+
+will render as:
+
+    <div class='book-info' data-book-genre='programming' data-book-id='123' data-category='7'></div>
 
 ### Class and ID: `.` and `#`
 
@@ -1000,6 +1021,21 @@ might compile to:
       //]]>
     </script>
 
+#### Gotchas
+
+Haml uses an overly simplistic regular expression to identify string
+interpolation rather than a full-blown Ruby parser. This is fast and works for
+most code but you may have errors with code like the following:
+
+    %span #{'{'}
+
+This code will generate a syntax error, complaining about unbalanced brackets.
+In cases like this, the recommended workaround is output the code as a Ruby
+string to force Haml to parse the code with Ruby.
+
+    %span= "#{'{'}"
+
+
 ### Escaping HTML: `&=` {#escaping_html}
 
 An ampersand followed by one or two equals characters evaluates Ruby code just
@@ -1102,53 +1138,53 @@ more info.
 
 Haml comes with the following filters defined:
 
-{#cdata-filter}
-### `:cdata`
+### `:cdata` {#cdata-filter}
+
 Surrounds the filtered text with CDATA tags.
 
-{#coffee-filter}
-### `:coffee`
+### `:coffee` {#coffee-filter}
+
 Compiles the filtered text to Javascript using Coffeescript. You can also
 reference this filter as `:coffeescript`. This filter is implemented using
 Tilt.
 
-{#css-filter}
-### `:css`
+### `:css` {#css-filter}
+
 Surrounds the filtered text with `<style>` and (optionally) CDATA tags. Useful
 for including inline CSS. Use the {Haml::Options#cdata `:cdata` option} to
 control when CDATA tags are added.
 
-{#erb-filter}
-### `:erb`
-Parses the filtered text with ERb, like an RHTML template. Not available if the
+### `:erb` {#erb-filter}
+
+Parses the filtered text with ERB, like an RHTML template. Not available if the
 {Haml::Options#suppress_eval `:suppress_eval`} option is set to true. Embedded
 Ruby code is evaluated in the same context as the Haml template. This filter is
 implemented using Tilt.
 
-{#escaped-filter}
-### `:escaped`
+### `:escaped` {#escaped-filter}
+
 Works the same as plain, but HTML-escapes the text
 before placing it in the document.
 
-{#javascript-filter}
-### `:javascript`
+### `:javascript` {#javascript-filter}
+
 Surrounds the filtered text with `<script>` and (optionally) CDATA tags.
 Useful for including inline Javascript. Use the {Haml::Options#cdata `:cdata`
 option} to control when CDATA tags are added.
 
-{#less-filter}
-### `:less`
+### `:less` {#less-filter}
+
 Parses the filtered text with [Less](http://lesscss.org/) to produce CSS output.
 This filter is implemented using Tilt.
 
-{#markdown-filter}
-### `:markdown`
+### `:markdown` {#markdown-filter}
+
 Parses the filtered text with
 [Markdown](http://daringfireball.net/projects/markdown). This filter is
 implemented using Tilt.
 
-{#maruku-filter}
-### `:maruku`
+### `:maruku` {#maruku-filter}
+
 Parses the filtered text with [Maruku](https://github.com/nex3/maruku), which
 has some non-standard extensions to Markdown.
 
@@ -1157,39 +1193,39 @@ contrib](https://github.com/haml/haml-contrib) but is loaded automatically for
 historical reasons. In future versions of Haml it will likely not be loaded by
 default. This filter is implemented using Tilt.
 
-{#plain-filter}
-### `:plain`
+### `:plain` {#plain-filter}
+
 Does not parse the filtered text. This is useful for large blocks of text
 without HTML tags, when you don't want lines starting with `.` or `-` to be
 parsed.
 
-{#preserve-filter}
-### `:preserve`
+### `:preserve` {#preserve-filter}
+
 Inserts the filtered text into the template with whitespace preserved.
 `preserve`d blocks of text aren't indented, and newlines are replaced with the
 HTML escape code for newlines, to preserve nice-looking output. See also
 [Whitespace Preservation](#whitespace_preservation).
 
-{#ruby-filter}
-### `:ruby`
+### `:ruby` {#ruby-filter}
+
 Parses the filtered text with the normal Ruby interpreter. Creates an `IO`
 object named `haml_io`, anything written to it is output into the Haml document.
 Not available if the {Haml::Options#suppress_eval `:suppress_eval`} option is
 set to true. The Ruby code is evaluated in the same context as the Haml
 template.
 
-{#sass-filter}
-### `:sass`
+### `:sass` {#sass-filter}
+
 Parses the filtered text with [Sass](http://sass-lang.com/) to produce CSS
 output. This filter is implemented using Tilt.
 
-{#scss-filter}
-### `:scss`
+### `:scss` {#scss-filter}
+
 Parses the filtered text with Sass like the `:sass` filter, but uses the newer
 SCSS syntax to produce CSS output. This filter is implemented using Tilt.
 
-{#textile-filter}
-### `:textile`
+### `:textile` {#textile-filter}
+
 Parses the filtered text with [Textile](http://www.textism.com/tools/textile).
 Only works if [RedCloth](http://redcloth.org) is installed.
 
@@ -1209,8 +1245,8 @@ the whitespace removal methods allow. There are a few helper methods that are
 useful when dealing with inline content. All these methods take a Haml block to
 modify.
 
-{#surround}
-### surround
+### surround {#surround}
+
 Surrounds a Haml block with text. Expects 1 or 2 string arguments used to
 surround the Haml block. If a second argument is not provided, the first
 argument is used as the second.
@@ -1218,15 +1254,15 @@ argument is used as the second.
     = surround "(", ")" do
       = link_to "learn more", "#"
 
-{#precede}
-### precede
+### precede {#precede}
+
 Prepends a Haml block with text. Expects 1 argument.
 
     = precede "*" do
       %span Required
 
-{#succeed}
-### succeed
+### succeed {#succeed}
+
 Appends a Haml block with text. Expects 1 argument.
 
     Begin by