11 files changed, 43 insertions, 28 deletions
diff --git a/website/templates/_download-edge.html b/website/templates/_download-edge.html
index 724efa58..b5e8af0b 100644
--- a/website/templates/_download-edge.html
+++ b/website/templates/_download-edge.html
@@ -2,7 +2,7 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div class="row text-center versionInfo">
-			<h1>Download 'Edgy Guinea Pig' – the Lombok Cutting Edge build</h1>
+			<@main.h1 title="Download 'Edgy Guinea Pig' - the Lombok Cutting Edge build" />
 		</div><div class="row versionInfo">
 			version: ${version} (${timestampString})
 		</div><div class="row" id="changelog">
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index cc7b0838..7de5e1d2 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -123,3 +123,18 @@ ga('send', 'pageview');
 	</body>
 </html>
 </#macro>
+
+<#macro h1 title class="">
+<#assign idvalue="*"?no_esc + "${title}"/>
+<h1 class="${class}" id="${idvalue?markup_string?replace("[ _]", "-", "r")?lower_case?replace("[^a-zA-Z0-9-]", "", "r")}">${title}</h1>
+</#macro>
+
+<#macro h2 title class="">
+<#assign idvalue="*"?no_esc + "${title}"/>
+<h2 class="${class}" id="${idvalue?markup_string?replace("[ _]", "-", "r")?lower_case?replace("[^a-zA-Z0-9-]", "", "r")}">${title}</h2>
+</#macro>
+
+<#macro h3 title class="">
+<#assign idvalue="*"?no_esc + "${title}"/>
+<h3 class="${class}" id="${idvalue?markup_string?replace("[ _]", "-", "r")?lower_case?replace("[^a-zA-Z0-9-]", "", "r")}">${title}</h3>
+</#macro>
diff --git a/website/templates/contributing.html b/website/templates/contributing.html
index 574e3aa8..dde6e3ff 100644
--- a/website/templates/contributing.html
+++ b/website/templates/contributing.html
@@ -3,7 +3,7 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div class="row text-center">
-			<h1>How to work on Project Lombok yourself</h1>
+			<@main.h1 title="How to work on Project Lombok yourself" />
 		</div><div class="row">
 			Project Lombok is being developed via the <a href="https://github.com/rzwitserloot/lombok">lombok git repository on github</a>.
 		</div><div class="row">
@@ -13,13 +13,13 @@
 				To produce a lombok jar, run <code>ant dist</code>; in general run <code>ant -p</code>; there's lots of stuff there, including downloading various versions of java runtimes to run the test suite against, and building this website.
 			</p>
 		</div><div class="row text-center">
-			<h2>Adding your own handlers and annotations to Lombok</h2>
+			<@main.h2 title="Adding your own handlers and annotations to Lombok" />
 		</div><div class="row">
 			<p>
 				If you want to extend lombok, we advise that you fork lombok and add handlers directly into the same place and package that lombok's handlers are in (<code>lombok.javac.handlers</code> and <code>lombok.eclipse.handlers</code>) – lombok does some fancy footwork to ensure various modular class loading systems don't interface with finding the lombok classes, but that system is not (currently) easily expanded to include separate jars.
 			</p>
 		</div><div class="row text-center">
-			<h2>Contributing to Project Lombok</h2>
+			<@main.h2 title="Contributing to Project Lombok" />
 		</div><div class="row">
 			<p>
 				To create new features and add them to project lombok itself, send us pull requests via github. However, before you start, discuss the feature or fix you'd like to contribute, preferably via the <a href="https://groups.google.com/forum/#!forum/project-lombok">Project Lombok Forum</a>. If you're going to add a new feature, make sure to post 2 snippets (one with the annotation, the other with what that would generate), similar to how the feature pages list 'with lombok' and 'without lombok' variants.
diff --git a/website/templates/credits.html b/website/templates/credits.html
index 9e929256..925ba2d4 100644
--- a/website/templates/credits.html
+++ b/website/templates/credits.html
@@ -3,12 +3,12 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div class="row text-center">
-			<h1>Project Lombok - About the authors and everyone that's helped us create Project Lombok.</h1>
+			<@main.h1 title="Project Lombok - About the authors and everyone that's helped us create Project Lombok." />
 		</div>
 		<div class="row">
 			<div class="credits">
 				<div class="committers personList">
-					<h3>Regular contributors to Project Lombok:</h3>
+					<@main.h3 title="Regular contributors to Project Lombok:" />
 
 					<div class="row text-center">
 						<div class="person col-md-2">
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html
index 2e338834..dcee152c 100644
--- a/website/templates/features/_features.html
+++ b/website/templates/features/_features.html
@@ -14,14 +14,14 @@
 
 <#macro overview>
 	<div class="row">
-		<h3>Overview</h3>
+		<@main.h3 title="Overview" />
 		<#nested>
 	</div>
 </#macro>
 
 <#macro experimental>
 	<div class="row">
-		<h3>Experimental</h3>
+		<@main.h3 title="Experimental" />
 
 		Experimental because:
 		<#nested>
@@ -31,13 +31,13 @@
 <#macro snippets name>
 	<div class="row container-fluid">
 		<div class="snippet-col first-snippet">
-			<h3>With Lombok</h3>
+			<@main.h3 title="With Lombok" />
 
 			<div class="snippet">${usages.pre(name)?no_esc}</div>
 		</div>
 		<div class="sep"></div>
 		<div class="snippet-col second-snippet">
-			<h3>Vanilla Java</h3>
+			<@main.h3 title="Vanilla Java" />
 
 			<div class="snippet">${usages.post(name)?no_esc}</div>
 		</div>
@@ -46,7 +46,7 @@
 
 <#macro confKeys>
 	<div class="row">
-		<h3>Supported configuration keys:</h3>
+		<@main.h3 title="Supported configuration keys:" />
 		<dl>
 			<#nested>
 		</dl>
@@ -55,7 +55,7 @@
 
 <#macro smallPrint>
 	<div class="row">
-		<h3>Small print</h3>
+		<@main.h3 title="Small print" />
 
 		<div class="smallprint">
 			<#nested>
@@ -68,9 +68,9 @@
 		<div class="page-header top5" id="featureContent">
 			<div class="row text-center">
 				<div class="header-group">
-					<h1>${title}</h1>
+					<@main.h1 title="${title}" />
 
-					<h3>${logline?no_esc}</h3>
+					<@main.h3 title="${logline?no_esc}" />
 				</div>
 			</div>
 			<#nested>
diff --git a/website/templates/features/configuration.html b/website/templates/features/configuration.html
index 642332a0..0491d832 100644
--- a/website/templates/features/configuration.html
+++ b/website/templates/features/configuration.html
@@ -70,7 +70,7 @@
 	</@f.overview>
 
 	<@f.featureSection>
-		<h3>Global config keys</h3>
+		<@f.main.h3 title="Global config keys" />
 
 		<p>
 			To stop lombok from looking at parent directories for more configuration files, the special key:
@@ -98,7 +98,7 @@
 	</@f.featureSection>
 
 	<@f.featureSection>
-		<h3>Config keys that can affect any source file</h3>
+		<@f.main.h3 title="Config keys that can affect any source file" />
 
 		<p>
 			These config keys can make lombok affect source files even if they have 0 lombok annotations in them.<br />
diff --git a/website/templates/features/delombok.html b/website/templates/features/delombok.html
index fc9dfddc..6f41fc46 100644
--- a/website/templates/features/delombok.html
+++ b/website/templates/features/delombok.html
@@ -13,7 +13,7 @@
 			Delombok's output format can be configured with command line options (use <code>--format-help</code> for a complete list). A few such options are automatically scanned from input if possible (such as indent). If delombok's formatting is not conforming to your preferred code style, have a look!
 		</p>
 
-		<h3>Running delombok on the command line</h3>
+		<@f.main.h3 title="Running delombok on the command line" />
 
 		<p>
 			Delombok is included in <code>lombok.jar</code>. To use it, all you need to run on the command line is:
@@ -28,7 +28,7 @@
 			</div>
 		</p>
 
-		<h3>Running delombok in ant</h3>
+		<@f.main.h3 title="Running delombok in ant" />
 
 		<p>
 			<code>lombok.jar</code> includes an ant task which can apply delombok for you. For example, to create javadoc for your project, your <code>build.xml</code> file would look something like:
@@ -45,13 +45,13 @@
 			Instead of a <code>from</code> attribute, you can also nest <code>&lt;fileset&gt;</code> nodes.
 		</p>
 
-		<h3>Running delombok in maven</h3>
+		<@f.main.h3 title="Running delombok in maven" />
 
 		<p>
 			Anthony Whitford has written a <a href="https://github.com/awhitford/lombok.maven">maven plugin</a> for delomboking your source code.
 		</p>
 		
-		<h3>Limitations</h3>
+		<@f.main.h3 title="Limitations" />
 
 		<p>
 			Delombok tries to preserve your code as much as it can, but comments may move around a little bit, especially comments that are in the middle of a syntax node. For example, any comments appearing in the middle of a list of method modifiers, such as <code>public /*comment*/ static ...</code> will move towards the front of the list of modifiers. In practice, any java source parsing tool will not be affected.<br />
diff --git a/website/templates/features/experimental/index.html b/website/templates/features/experimental/index.html
index 11d48485..a1ea867a 100644
--- a/website/templates/features/experimental/index.html
+++ b/website/templates/features/experimental/index.html
@@ -4,7 +4,7 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div class="row text-center">
-			<h1>Lombok experimental features</h1>
+			<@main.h1 title="Lombok experimental features" />
 		</div>
 		<div class="row">
 			<p>
diff --git a/website/templates/features/index.html b/website/templates/features/index.html
index da3db634..a09c4b72 100644
--- a/website/templates/features/index.html
+++ b/website/templates/features/index.html
@@ -3,7 +3,7 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div class="row text-center">
-			<h1>Lombok features.</h1>
+			<@main.h1 title="Lombok features." />
 		</div>
 		<div class="row">
 			<@main.feature title="val" href="val">
@@ -69,7 +69,7 @@
 		</div>
 
 		<div class="row">
-			<h1>Configuration system</h1>
+			<@main.h1 title="Configuration system" />
 
 			<div class="text-center">
 				Lombok, made to order: <a href="configuration">Configure lombok features</a> in one place for your entire project or even your workspace.
@@ -77,7 +77,7 @@
 		</div>
 
 		<div class="row">
-			<h1 class="text-center">Running delombok</h1>
+			<@main.h1 title="Running delombok" />
 
 			<div>
 				Delombok copies your source files to another directory, replacing all lombok annotations with their desugared form. So, it'll turn <code>@Getter</code> back into the actual getter. It then removes the annotation. This is useful for all sorts of reasons; you can check out what's happening under the hood, if the unthinkable happens and you want to stop using lombok, you can easily remove all traces of it in your source, and you can use delombok to preprocess your source files for source-level tools such as javadoc and GWT. More information about how to run delombok, including instructions for build tools can be found at the <a href="delombok">delombok page</a>.
diff --git a/website/templates/main.html b/website/templates/main.html
index b836a3c9..374a5841 100644
--- a/website/templates/main.html
+++ b/website/templates/main.html
@@ -2,7 +2,7 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div class="row text-center">
-			<h1>Lombok Demo</h1>
+			<@main.h1 title="Lombok Demo" />
 		</div>
 		<div class="video text-center">
 			<video width="800" height="480" poster="/img/poster.png" controls="controls" preload="none">
@@ -16,7 +16,7 @@
 					<object width="800" height="500" type="application/x-shockwave-flash"
 							data="/videos/player.swf?image=poster.png&amp;file=lombok.mp4" allowfullscreen="true">
 						<!--<![endif]-->
-						<h1>Can't watch the video?</h1>
+						<@main.h1 title="Can't watch the video?" />
 						<p>
 							<a href="https://www.youtube.com/watch?v=y6zMyM-YTgg">See it on Youtube instead</a>.
 						</p><p>
diff --git a/website/templates/setup/_setup.html b/website/templates/setup/_setup.html
index e5c2c007..d5a88fb7 100644
--- a/website/templates/setup/_setup.html
+++ b/website/templates/setup/_setup.html
@@ -8,7 +8,7 @@
 
 <#macro section title>
 	<div class="row">
-		<h3>${title}</h3>
+		<@main.h3 title="${title}" />
 
 		<#nested>
 	</div>
@@ -19,7 +19,7 @@
 		<div class="page-header top5" id="featureContent">
 			<div class="row text-center">
 				<div class="header-group">
-					<h1>${title}</h1>
+					<@main.h1 title="${title}" />
 				</div>
 			</div>
 			<#nested>