fix(docs): pair comment ids with the document order, not the spec order (#92)

docx_comment.go

@@ -65,6 +65,7 @@ func InjectDocxComments(src []byte, author string, comments []DocxComment) ([]by
 	}
 
 	used := make([]bool, len(comments))
+	applied := make([]DocxComment, 0, len(comments))
 	id := 0
 	newDoc := docxParaRe.ReplaceAllStringFunc(string(doc), func(p string) string {
 		txt := docxPlain(p)
@@ -73,6 +74,9 @@ func InjectDocxComments(src []byte, author string, comments []DocxComment) ([]by
 				continue
 			}
 			used[i] = true
+			// Record in document order so comments.xml id N matches the marker
+			// with id N (the spec order may differ from the document order).
+			applied = append(applied, c)
 			p = docxAddMarkers(p, id)
 			id++
 			break
@@ -80,12 +84,6 @@ func InjectDocxComments(src []byte, author string, comments []DocxComment) ([]by
 		return p
 	})
 
-	applied := make([]DocxComment, 0, len(comments))
-	for i, c := range comments {
-		if used[i] {
-			applied = append(applied, c)
-		}
-	}
 	parts["word/document.xml"] = []byte(newDoc)
 	parts["word/comments.xml"] = docxBuildComments(author, applied)
 	parts["[Content_Types].xml"] = docxAddContentType(parts["[Content_Types].xml"])