html5/spec-author-view Makefile,1.34,1.35 patch.anolis,1.5,1.6

Update of /sources/public/html5/spec-author-view
In directory hutz:/tmp/cvs-serv8147

Modified Files:
	Makefile patch.anolis 
Log Message:
it seems you actually need to commit things in order for them to have effect...


Index: patch.anolis
===================================================================
RCS file: /sources/public/html5/spec-author-view/patch.anolis,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- patch.anolis	18 Aug 2010 12:52:26 -0000	1.5
+++ patch.anolis	19 Aug 2010 22:24:01 -0000	1.6
@@ -1,6 +1,6 @@
 diff -r 16550726fd0d anolis
 --- a/anolis	Sun Aug 30 16:53:19 2009 -0500
-+++ anolis/anolis	Wed Aug 18 21:40:56 2010 +0900
++++ b/anolis	Fri Aug 20 03:49:06 2010 +0900
 @@ -70,10 +70,10 @@
  
  def getOptParser():
@@ -16,7 +16,7 @@
  
 diff -r 16550726fd0d anolislib/processes/filter.py
 --- a/anolislib/processes/filter.py	Sun Aug 30 16:53:19 2009 -0500
-+++ anolis/anolislib/processes/filter.py	Wed Aug 18 21:40:56 2010 +0900
++++ b/anolislib/processes/filter.py	Fri Aug 20 03:49:06 2010 +0900
 @@ -5,23 +5,4 @@
          return
      selector = cssselect.CSSSelector(kwargs["filter"])
@@ -44,8 +44,8 @@
 +        element.drop_tree()
 diff -r 16550726fd0d anolislib/processes/terms.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ anolis/anolislib/processes/terms.py	Wed Aug 18 21:40:56 2010 +0900
-@@ -0,0 +1,330 @@
++++ b/anolislib/processes/terms.py	Fri Aug 20 03:49:06 2010 +0900
+@@ -0,0 +1,332 @@
 +# coding=UTF-8
 +# Copyright (c) 2010 Michael(tm) Smith
 +#
@@ -80,7 +80,7 @@
 +    terms = None
 +
 +    def __init__(self, ElementTree, **kwargs):
-+        self.terms = etree.Element(u"div",{u"class": "index-of-terms",u"id": "index-of-terms_contents"})
++        self.terms = etree.Element(u"div",{u"class": "index-of-terms"})
 +        self.buildTerms(ElementTree, **kwargs)
 +        self.addTerms(ElementTree, **kwargs)
 +
@@ -107,10 +107,12 @@
 +                term = deepcopy(dfn)
 +                term.tail = None
 +                termID = None
++                dfnHasID = False
 +                if dfn.get("id"):
 +                    # if this <dfn> itself has an id, we'll use it as part of the
 +                    # id on the index entry for this term
 +                    termID = dfn.get("id")
++                    dfnHasID = True
 +                elif dfn.getparent().get("id"):
 +                    # if this <dfn> itself has no id, use the id of its parent
 +                    # node as the id on the index entry for this term, with or
@@ -126,7 +128,7 @@
 +                    # we need to further qualify the id attribute here to make
 +                    # it unique
 +                    dfnSiblings = int(dfn.xpath("count(preceding-sibling::dfn[not(@id)])"))
-+                    if dfnSiblings > 0:
++                    if not dfnHasID and dfnSiblings > 0:
 +                        indexEntry = etree.Element(u"dl",{u"id": termID+"_"+str(dfnSiblings)+"_index"})
 +                    else:
 +                        indexEntry = etree.Element(u"dl",{u"id": termID+"_index"})

Index: Makefile
===================================================================
RCS file: /sources/public/html5/spec-author-view/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- Makefile	19 Aug 2010 07:51:15 -0000	1.34
+++ Makefile	19 Aug 2010 22:24:01 -0000	1.35
@@ -118,7 +118,7 @@
 # this also relies on html5lib and lxml
 anolis/anolis:
 	$(HG) clone http://hg.hoppipolla.co.uk/anolis/
-	$(PATCH) $(PATCHFLAGS) -p0 < patch.anolis
+	$(PATCH) $(PATCHFLAGS) -p1 -d anolis < patch.anolis
 
 # tested with r169 2009-07-22 08:37:15 -0500
 # Repository UUID: fac1fef6-d828-0410-b4ea-9384b9858573

Received on Thursday, 19 August 2010 22:24:05 UTC