1 files changed, 42 insertions, 40 deletions

diff --git a/test/writer.context b/test/writer.context
index 1356fa464..78667813b 100644
--- a/test/writer.context
+++ b/test/writer.context
@@ -17,6 +17,7 @@
 
 % use microtypography
 \definefontfeature[default][default][script=latn, protrusion=quality, expansion=quality, itlc=yes, textitalics=yes, onum=yes, pnum=yes]
+\definefontfeature[default:tnum][default][tnum=yes, pnum=no]
 \definefontfeature[smallcaps][script=latn, protrusion=quality, expansion=quality, smcp=yes, onum=yes, pnum=yes]
 \setupalign[hz,hanging]
 \setupitaliccorrection[global, always]
@@ -48,11 +49,12 @@
 \setupitemize[autointro]    % prevent orphan list intro
 \setupitemize[indentnext=no]
 
+\defineitemgroup[enumerate]
+\setupenumerate[each][fit][itemalign=left,distance=.5em,style={\feature[+][default:tnum]}]
+
 \setupfloat[figure][default={here,nonumber}]
 \setupfloat[table][default={here,nonumber}]
 
-\setupthinrules[width=15em] % width of horizontal rules
-
 \setupxtable[frame=off]
 \setupxtable[head][topframe=on,bottomframe=on]
 \setupxtable[body][]
@@ -135,12 +137,12 @@ sub status {
 
 A list:
 
-\startitemize[n,packed][stopper=.]
+\startenumerate[n,packed][stopper=.]
 \item
   item one
 \item
   item two
-\stopitemize
+\stopenumerate
 
 Nested block quotes:
 
@@ -257,51 +259,51 @@ Minuses loose:
 
 Tight:
 
-\startitemize[n,packed][stopper=.]
+\startenumerate[n,packed][stopper=.]
 \item
   First
 \item
   Second
 \item
   Third
-\stopitemize
+\stopenumerate
 
 and:
 
-\startitemize[n,packed][stopper=.]
+\startenumerate[n,packed][stopper=.]
 \item
   One
 \item
   Two
 \item
   Three
-\stopitemize
+\stopenumerate
 
 Loose using tabs:
 
-\startitemize[n][stopper=.]
+\startenumerate[n][stopper=.]
 \item
   First
 \item
   Second
 \item
   Third
-\stopitemize
+\stopenumerate
 
 and using spaces:
 
-\startitemize[n][stopper=.]
+\startenumerate[n][stopper=.]
 \item
   One
 \item
   Two
 \item
   Three
-\stopitemize
+\stopenumerate
 
 Multiple paragraphs:
 
-\startitemize[n][stopper=.]
+\startenumerate[n][stopper=.]
 \item
   Item 1, graf one.
 
@@ -310,7 +312,7 @@ Multiple paragraphs:
   Item 2.
 \item
   Item 3.
-\stopitemize
+\stopenumerate
 
 \subsection[title={Nested},reference={nested}]
 
@@ -329,7 +331,7 @@ Multiple paragraphs:
 
 Here's another:
 
-\startitemize[n,packed][stopper=.]
+\startenumerate[n,packed][stopper=.]
 \item
   First
 \item
@@ -344,11 +346,11 @@ Here's another:
   \stopitemize
 \item
   Third
-\stopitemize
+\stopenumerate
 
 Same thing but with paragraphs:
 
-\startitemize[n][stopper=.]
+\startenumerate[n][stopper=.]
 \item
   First
 \item
@@ -364,7 +366,7 @@ Same thing but with paragraphs:
   \stopitemize
 \item
   Third
-\stopitemize
+\stopenumerate
 
 \subsection[title={Tabs and spaces},reference={tabs-and-spaces}]
 
@@ -384,7 +386,7 @@ Same thing but with paragraphs:
 
 \subsection[title={Fancy list markers},reference={fancy-list-markers}]
 
-\startitemize[n][start=2,left=(,stopper=),width=2.0em]
+\startenumerate[n][start=2,left=(,stopper=)]
 \item
   begins with 2
 \item
@@ -392,51 +394,51 @@ Same thing but with paragraphs:
 
   with a continuation
 
-  \startitemize[r,packed][start=4,stopper=.,width=2.0em]
+  \startenumerate[r,packed][start=4,stopper=.]
   \item
     sublist with roman numerals, starting with 4
   \item
     more items
-    \startitemize[A,packed][left=(,stopper=),width=2.0em]
+    \startenumerate[A,packed][left=(,stopper=)]
     \item
       a subsublist
     \item
       a subsublist
-    \stopitemize
-  \stopitemize
-\stopitemize
+    \stopenumerate
+  \stopenumerate
+\stopenumerate
 
 Nesting:
 
-\startitemize[A,packed][stopper=.]
+\startenumerate[A,packed][stopper=.]
 \item
   Upper Alpha
-  \startitemize[R,packed][stopper=.]
+  \startenumerate[R,packed][stopper=.]
   \item
     Upper Roman.
-    \startitemize[n,packed][start=6,left=(,stopper=),width=2.0em]
+    \startenumerate[n,packed][start=6,left=(,stopper=)]
     \item
       Decimal start with 6
-      \startitemize[a,packed][start=3,stopper=)]
+      \startenumerate[a,packed][start=3,stopper=)]
       \item
         Lower alpha with paren
-      \stopitemize
-    \stopitemize
-  \stopitemize
-\stopitemize
+      \stopenumerate
+    \stopenumerate
+  \stopenumerate
+\stopenumerate
 
 Autonumbering:
 
-\startitemize[n,packed]
+\startenumerate[n,packed]
 \item
   Autonumber.
 \item
   More.
-  \startitemize[a,packed]
+  \startenumerate[a,packed]
   \item
     Nested.
-  \stopitemize
-\stopitemize
+  \stopenumerate
+\stopenumerate
 
 Should not be a list item:
 
@@ -549,12 +551,12 @@ Blank line after term, indented marker, alternate markers:
 \startdescription{orange}
   orange fruit
 
-  \startitemize[n,packed][stopper=.]
+  \startenumerate[n,packed][stopper=.]
   \item
     sublist
   \item
     sublist
-  \stopitemize
+  \stopenumerate
 \stopdescription
 
 \section[title={HTML Blocks},reference={html-blocks}]
@@ -899,10 +901,10 @@ note{]} Here is an inline note.\footnote{This is {\em easier} to type. Inline
 Notes can go in quotes.\footnote{In quote.}
 \stopblockquote
 
-\startitemize[n,packed][stopper=.]
+\startenumerate[n,packed][stopper=.]
 \item
   And in list items.\footnote{In list.}
-\stopitemize
+\stopenumerate
 
 This paragraph should not be part of the note, as it is not indented.