From 68a01cc603473036619305964680117a7bbd3232 Mon Sep 17 00:00:00 2001
From: Jean-Tiare Le Bigot <jtlebi@gmail.com>
Date: Thu, 1 Dec 2011 18:35:26 +0100
Subject: [PATCH] added numbrering logic + trigger on style update + visual
 render

---
 static/js/ace2_inner.js      | 71 +++++++++++++++++++++++++++++++++++-
 static/js/domline.js         |  4 +-
 static/js/linestylefilter.js |  4 ++
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/static/js/ace2_inner.js b/static/js/ace2_inner.js
index 1e2701f21..282c42fdc 100644
--- a/static/js/ace2_inner.js
+++ b/static/js/ace2_inner.js
@@ -5169,7 +5169,74 @@ function OUTER(gscope)
       [lineNum, listType]
     ]);
   }
-
+  
+  function renumberList(lineNum){
+    //1-check we are in a list
+    if(!getLineListType(lineNum))
+    {
+      return null;
+    }
+    
+    //2-find the first line of the list
+    while(lineNum-1 >= 0 && getLineListType(lineNum-1))
+    {
+      lineNum--;
+    }
+    
+    //3-renumber every list item of the same level from the beginning, level 1
+    //IMPORTANT: never skip a level because there imbrication may be arbitrary
+    var builder = Changeset.builder(rep.lines.totalWidth());
+    loc = [0,0];
+    function applyNumberList(line, level)
+    {
+      //init
+      var position = 1;
+      var curLevel = level;
+      var listType;
+      //loop over the lines
+      while(listType = getLineListType(line))
+      {
+        //apply new num
+        curLevel = /[a-z]+([12345678])/.exec(listType);
+        curLevel = Number(curLevel[1]);
+        if(isNaN(curLevel))
+        {
+          return line;
+        }
+        else if(curLevel == level)
+        {
+          buildKeepRange(builder, loc, (loc = [line, 0]));
+          buildKeepRange(builder, loc, (loc = [line, 1]), [
+            ['start', position]
+          ], rep.apool);
+          
+          position++;
+          line++;
+        }
+        else if(curLevel < level)
+        {
+          return line;//back to parent
+        }
+        else
+        {
+          line = applyNumberList(line, level+1);//recursive call
+        }
+      }
+      return line;
+    }
+    
+    applyNumberList(lineNum, 1);
+    var cs = builder.toString();
+    if (!Changeset.isIdentity(cs))
+    {
+      performDocumentApplyChangeset(cs);
+    }
+    
+    //4-apply the modifications
+    
+    
+  }
+  
   function setLineListTypes(lineNumTypePairsInOrder)
   {
     var loc = [0, 0];
@@ -5216,6 +5283,8 @@ function OUTER(gscope)
     {
       performDocumentApplyChangeset(cs);
     }
+    
+    renumberList(lineNum);
   }
 
   function doInsertList(type)
diff --git a/static/js/domline.js b/static/js/domline.js
index 7732805fd..dce45f48a 100644
--- a/static/js/domline.js
+++ b/static/js/domline.js
@@ -89,12 +89,14 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
     if (cls.indexOf('list') >= 0)
     {
       var listType = /(?:^| )list:(\S+)/.exec(cls);
+      var start = /(?:^| )start:(\S+)/.exec(cls);
       if (listType)
       {
         listType = listType[1];
+        start = start?'start="'+start[1]+'"':'';
         if (listType)
         {
-          preHtml = '<ul class="list-' + listType + '"><li>';
+          preHtml = '<ul '+start+' class="list-' + listType + '"><li>';
           postHtml = '</li></ul>';
         }
         result.lineMarker += txt.length;
diff --git a/static/js/linestylefilter.js b/static/js/linestylefilter.js
index f6cf9f357..ace55f38d 100644
--- a/static/js/linestylefilter.js
+++ b/static/js/linestylefilter.js
@@ -84,6 +84,10 @@ linestylefilter.getLineStyleFilter = function(lineLength, aline, textAndClassFun
             {
               classes += ' list:' + value;
             }
+            else if (key == 'start')
+            {
+              classes += ' start:' + value;
+            }
             else if (linestylefilter.ATTRIB_CLASSES[key])
             {
               classes += ' ' + linestylefilter.ATTRIB_CLASSES[key];