Fixed ordering on tutorial. Should work remotely too this time.

heathermiller · heathermiller · commit 700684e3a4c9 · 2011-10-23T15:25:28.000+02:00
diff --git a/_layouts/category_index.html b/_layouts/category_index.html
diff --git a/_plugins/generate_categories.rb b/_plugins/generate_categories.rb
diff --git a/tutorials/index.md b/tutorials/index.md
@@ -6,13 +6,21 @@ title: Tutorials
 <div class="page-header-index">
   <h1>A Tour of Scala <small>Bite-size pieces of all of the essentials...</small></h1>
 </div>
-<ul>
 {% for pg in site.pages %}
-  {% if pg.tutorial == "scala-tour" %}
-  <li><a href="{{ pg.url }}">{{ pg.title }}</a></li>
+  {% if pg.tutorial == "scala-tour" and pg.outof %}
+    {% assign totalPages = pg.outof %}  
   {% endif %}
 {% endfor %}
-</ul>
-
-
 
+{% if totalPages %}
+  <ul>
+  {% for i in (1..totalPages) %}
+    {% for pg in site.pages %}
+      {% if pg.tutorial == "scala-tour" and pg.num and pg.num == i %}
+        <li><a href="{{ pg.url }}">{{ pg.title }}</a></li> 
+      {% endif %}
+    {% endfor %}
+  {% endfor %}
+  </ul>
+{% else %} **ERROR**. Couldn't find the total number of pages in this set of tutorial articles. Have you declared the `outof` tag in your YAML front matter?
+{% endif %}
diff --git a/tutorials/tour/abstract-types.md b/tutorials/tour/abstract-types.md
@@ -2,9 +2,9 @@
 layout: tutorial
 title: Abstract Types
 
-category: scala-tour
 tutorial: scala-tour
-no: 2
+num: 2
+outof: 33
 ---
 
 In Scala, classes are parameterized with values (the constructor parameters) and with types (if classes are [generic](generic-classes.html)). For reasons of regularity, it is not only possible to have values as object members; types along with values are members of objects. Furthermore, both forms of members can be concrete and abstract.
diff --git a/tutorials/tour/annotations.md b/tutorials/tour/annotations.md
@@ -2,9 +2,8 @@
 layout: tutorial
 title: Annotations
 
-category: scala-tour
 tutorial: scala-tour
-no: 3
+num: 3
 ---
 
 Annotations associate meta-information with definitions.
diff --git a/tutorials/tour/anonymous-function-syntax.md b/tutorials/tour/anonymous-function-syntax.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Anonymous Function Syntax
 
 tutorial: scala-tour
-no: 14
+num: 14
 ---
 
 Scala provides a relatively lightweight syntax for defining anonymous functions. The following expression creates a successor function for integers:
diff --git a/tutorials/tour/automatic-closures.md b/tutorials/tour/automatic-closures.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Automatic Type-Dependent Closure Construction
 
 tutorial: scala-tour
-no: 16
+num: 16
 ---
 
 Scala allows parameterless function names as parameters of methods. When such a method is called, the actual parameters for parameterless function names are not evaluated and a nullary function is passed instead which encapsulates the computation of the corresponding parameter (so-called *call-by-name* evalutation).
diff --git a/tutorials/tour/case-classes.md b/tutorials/tour/case-classes.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Case Classes
 
 tutorial: scala-tour
-no: 5
+num: 5
 ---
 
 Scala supports the notion of _case classes_. Case classes are regular classes which export their constructor parameters and which provide a recursive decomposition mechanism via [pattern matching](pattern-matching.html).
diff --git a/tutorials/tour/classes.md b/tutorials/tour/classes.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Classes
 
 tutorial: scala-tour
-no: 4
+num: 4
 ---
 
 Classes in Scala are static templates that can be instantiated into many objects at runtime.
diff --git a/tutorials/tour/compound-types.md b/tutorials/tour/compound-types.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Compound Types
 
 tutorial: scala-tour
-no: 6
+num: 6
 ---
 
 Sometimes it is necessary to express that the type of an object is a subtype of several other types. In Scala this can be expressed with the help of *compound types*, which are intersections of object types.
diff --git a/tutorials/tour/currying.md b/tutorials/tour/currying.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Currying
 
 tutorial: scala-tour
-no: 15
+num: 15
 ---
 
 Methods may define multiple parameter lists. When a method is called with a fewer number of parameter lists, then this will yield a function taking the missing parameter lists as its arguments.
diff --git a/tutorials/tour/explicitly-typed-self-references.md b/tutorials/tour/explicitly-typed-self-references.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Explicitly Typed Self References
 
 tutorial: scala-tour
-no: 27
+num: 27
 ---
 
 When developing extensible software it is sometimes handy to declare the type of the value `this` explicitly. To motivate this, we will derive a small extensible representation of a graph data structure in Scala.
diff --git a/tutorials/tour/extractor-objects.md b/tutorials/tour/extractor-objects.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Extractor Objects
 
 tutorial: scala-tour
-no: 8
+num: 8
 ---
 
 In Scala, patterns can be defined independently of case classes. To this end, a method named unapply is defined to yield a so-called extractor. For instance, the following code defines an extractor object Twice.
diff --git a/tutorials/tour/generic-classes.md b/tutorials/tour/generic-classes.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Generic Classes
 
 tutorial: scala-tour
-no: 9
+num: 9
 ---
 
 Like in Java 5 (aka. [JDK 1.5](http://java.sun.com/j2se/1.5/)), Scala has built-in support for classes parameterized with types. Such generic classes are particularly useful for the development of collection classes.
diff --git a/tutorials/tour/higher-order-functions.md b/tutorials/tour/higher-order-functions.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Higher-order Functions
 
 tutorial: scala-tour
-no: 18
+num: 18
 ---
 
 Scala allows the definition of higher-order functions. These are functions that _take other functions as parameters_, or whose _result is a function_. Here is a function `apply` which takes another function `f` and a value `v` and applies function `f` to `v`:
diff --git a/tutorials/tour/implicit-parameters.md b/tutorials/tour/implicit-parameters.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Implicit Parameters
 
 tutorial: scala-tour
-no: 10
+num: 10
 ---
 
 A method with _implicit parameters_ can be applied to arguments just like a normal method. In this case the implicit label has no effect. However, if such a method misses arguments for its implicit parameters, such arguments will be automatically provided.
diff --git a/tutorials/tour/inner-classes.md b/tutorials/tour/inner-classes.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Inner Classes
 
 tutorial: scala-tour
-no: 11
+num: 11
 ---
 
 In Scala it is possible to let classes have other classes as members. Opposed to Java-like languages where such inner classes are members of the enclosing class, in Scala such inner classes are bound to the outer object. To illustrate the difference, we quickly sketch the implementation of a graph datatype:
diff --git a/tutorials/tour/local-type-inference.md b/tutorials/tour/local-type-inference.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Local Type Inference
 
 tutorial: scala-tour
-no: 29
+num: 29
 ---
 Scala has a built-in type inference mechanism which allows the programmer to omit certain type annotations. It is, for instance, often not necessary in Scala to specify the type of a variable, since the compiler can deduce the type from the initialization expression of the variable. Also return types of methods can often be omitted since they corresponds to the type of the body, which gets inferred by the compiler.
 
diff --git a/tutorials/tour/lower-type-bounds.md b/tutorials/tour/lower-type-bounds.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Lower Type Bounds
 
 tutorial: scala-tour
-no: 26
+num: 26
 ---
 
 While [upper type bounds](upper-type-bounds.html) limit a type to a subtype of another type, *lower type bounds* declare a type to be a supertype of another type. The term `T >: A` expresses that the type parameter `T` or the abstract type `T` refer to a supertype of type `A`.
diff --git a/tutorials/tour/mixin-class-composition.md b/tutorials/tour/mixin-class-composition.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Mixin Class Composition
 
 tutorial: scala-tour
-no: 12
+num: 12
 ---
 
 As opposed to languages that only support _single inheritance_, Scala has a more general notion of class reuse. Scala makes it possible to reuse the _new member definitions of a class_ (i.e. the delta in relationship to the superclass) in the definition of a new class. This is expressed as a _mixin-class composition_. Consider the following abstraction for iterators.
diff --git a/tutorials/tour/nested-functions.md b/tutorials/tour/nested-functions.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Nested Functions
 
 tutorial: scala-tour
-no: 13
+num: 13
 ---
 
 In Scala it is possible to nest function definitions. The following object provides a `filter` function for extracting values from a list of integers that are below a threshold value:
diff --git a/tutorials/tour/operators.md b/tutorials/tour/operators.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Operators
 
 tutorial: scala-tour
-no: 17
+num: 17
 ---
 
 Any method which takes a single parameter can be used as an *infix operator* in Scala. Here is the definition of class `MyBool` which defines three methods `and`, `or`, and `negate`.
diff --git a/tutorials/tour/pattern-matching.md b/tutorials/tour/pattern-matching.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Pattern Matching
 
 tutorial: scala-tour
-no: 20
+num: 20
 ---
 
 Scala has a built-in general pattern matching mechanism. It allows to match on any sort of data with a first-match policy. 
diff --git a/tutorials/tour/polymorphic-methods.md b/tutorials/tour/polymorphic-methods.md
@@ -3,7 +3,7 @@ layout: tutorial
 title: Polymorphic Methods
 
 tutorial: scala-tour
-no: 21
+num: 21
 ---
 
 Methods in Scala can be parameterized with both values and types. Like on the class level, value parameters are enclosed in a pair of parentheses, while type parameters are declared within a pair of brackets.
diff --git a/tutorials/tour/regular-expression-patterns.md b/tutorials/tour/regular-expression-patterns.md
diff --git a/tutorials/tour/sequence-comprehensions.md b/tutorials/tour/sequence-comprehensions.md
diff --git a/tutorials/tour/tour-of-scala.md b/tutorials/tour/tour-of-scala.md
diff --git a/tutorials/tour/traits.md b/tutorials/tour/traits.md
diff --git a/tutorials/tour/unified_types.md b/tutorials/tour/unified_types.md
diff --git a/tutorials/tour/upper-type-bounds.md b/tutorials/tour/upper-type-bounds.md
diff --git a/tutorials/tour/variances.md b/tutorials/tour/variances.md
diff --git a/tutorials/tour/views.md b/tutorials/tour/views.md
diff --git a/tutorials/tour/xml-processing.md b/tutorials/tour/xml-processing.md
