Added aux items 29 and 30. Made fast replies made by author show up first.

src/ChangeLog

 2001-01-28  Joel Rosdahl  <joel@rosdahl.net>
 
+	* view-text.el (lyskom-view-text): Show fast replies made by
+	author first.
+
+	* english-strings.el: New strings for fast replies.
+
+	* swedish-strings.el: Ditto.
+
+	* aux-items.el (lyskom-print-fast-reply): Removed.
+
+	* aux-items.el: Added recommended-conf and
+	allowed-content-type aux items.
+
 	* edit-text.el (lyskom-edit-mode): Fixed typo found by Per
 	Starbck.
 

src/aux-items.el

@@ -160,11 +160,9 @@ return non-nil if the item is to be included in the list."
   (info  . lyskom-aux-item-info))
 
 (def-aux-item fast-reply 2
-  (text-print-when . footer)
   (parse . nil)
   (parse-data . lyskom-aux-item-decode-data)
   (encode-data . lyskom-aux-item-encode-data)
-  (text-print . lyskom-print-fast-reply)
   (info . lyskom-aux-item-info))
 
 (def-aux-item cross-reference 3
@@ -280,6 +278,12 @@ return non-nil if the item is to be included in the list."
   (text-print-when . header)
   (info . lyskom-aux-item-info))
 
+(def-aux-item recommended-conf 29
+  (info . lyskom-aux-item-info))
+
+(def-aux-item allowed-content-type 30
+  (info . lyskom-aux-item-info))
+
 
 
 
@@ -347,12 +351,6 @@ return non-nil if the item is to be included in the list."
   (and (looking-at (lyskom-get-string 'content-type-regexp))
        (match-string 1)))
 
-(defun lyskom-print-fast-reply (item &optional obj)
-  (concat (lyskom-format 'fast-reply-aux
-                         (aux-item->data item)
-                         (aux-item->creator item))
-          (lyskom-aux-item-terminating-button item obj)))
-
 (defun lyskom-parse-cross-reference ()
   (or (and (looking-at (lyskom-get-string 'cross-reference-text-regexp))
            (concat "T" (match-string 1)))

src/english-strings.el

@@ -1306,7 +1306,10 @@ On since %#8s%#9s")
     
     (agreeing . "Agreeing with text %#1n...")
     (fast-replying . "Quick reply to text %#1n...")
-    (fast-reply-aux . "\"%#1t\" /%#2P/")
+    (author-fast-replies . "Information added by the author:")
+    (author-fast-reply-aux . "  \"%#1t\"")
+    (other-fast-replies . "Added information:")
+    (other-fast-reply-aux . "  \"%#1t\" /%#2P/")
     
     (faq-for-conf-aux . "FAQ for %#1M <%#1m>") 
     (faq-in-text-aux . "FAQ in text:                 %10#1n")

src/swedish-strings.el

@@ -1304,7 +1304,10 @@ Uppkopplad sedan %#8s%#9s")
     
     (agreeing . "Hller med om inlgg %#1n...")
     (fast-replying . "Kort replik till inlgg %#1n...")
-    (fast-reply-aux . "\"%#1t\" /%#2P/")
+    (author-fast-replies . "Av frfattaren tillagd information:")
+    (author-fast-reply-aux . "  \"%#1t\"")
+    (other-fast-replies . "Tillagd information:")
+    (other-fast-reply-aux . "  \"%#1t\" /%#2P/")
     
     (faq-for-conf-aux . "Texten r FAQ fr %#1M <%#1m>") 
     (faq-in-text-aux . "FAQ i inlgg:                   %10#1n")

src/view-text.el

@@ -126,7 +126,7 @@ Note that this function must not be called asynchronously."
                                                     text-stat)
                                                    'time-y-m-d-h-m))
 
-                     ;; Insert number of lines
+                   ;; Insert number of lines
 
 		   (lyskom-insert 
 		    (if (= 1 (text-stat->no-of-lines text-stat))
@@ -206,7 +206,9 @@ Note that this function must not be called asynchronously."
                              mx-reply-to)
                      )
 
-                   ;; All recipients and other header lines.
+
+
+                   ;; Insert all recipients and other header lines.
 
 		   (if (eq filter 'dontshow)
 		       (lyskom-mark-as-read
@@ -243,9 +245,7 @@ Note that this function must not be called asynchronously."
                                                      text-stat))
 			  )))
 
-                     ;;
-                     ;; Print aux-items that go in the header
-                     ;;
+                     ;; Insert aux-items that go in the header.
 
                      (let ((text nil))
                        (lyskom-traverse-aux aux
@@ -269,6 +269,8 @@ Note that this function must not be called asynchronously."
                            (lyskom-insert "\n"))))
 
 
+                     ;; If the text is marked, insert line saying so.
+
 		     (let ((num-marks (text-stat->no-of-marks text-stat))
 			   (is-marked-by-me (cache-text-is-marked
 					     (text-stat->text-no text-stat))))
@@ -284,10 +286,13 @@ Note that this function must not be called asynchronously."
 						      is-marked-by-me)))
 			   (lyskom-format-insert 'marked-by-several num-marks))))
 
+                     ;; Insert the text body.
+
 		     (lyskom-print-text text-stat text
 					mark-as-read text-no flat-review))
-		   
-		   
+
+                   ;; Insert aux-items that go in the footer.
+
                    (let ((text nil))
                        (lyskom-traverse-aux aux
                                             (text-stat->aux-items text-stat)
@@ -309,10 +314,58 @@ Note that this function must not be called asynchronously."
                            (lyskom-insert text)
                            (lyskom-insert "\n"))))
 
+                   ;; Insert fast replies.
+
+                   (let ((author-fast-replies nil)
+                         (other-fast-replies nil))
+                     (lyskom-traverse-aux aux (text-stat->aux-items text-stat)
+                      (when (eq (aux-item->tag aux) 2)
+                        (if (eq (text-stat->author text-stat)
+                                (aux-item->creator aux))
+                            (setq author-fast-replies
+                                  (cons aux author-fast-replies))
+                          (setq other-fast-replies
+                                (cons aux other-fast-replies)))))
+                     (when author-fast-replies
+                       (lyskom-insert
+                        (concat
+                         (lyskom-format 'author-fast-replies)
+                         "\n"
+                         (mapconcat (lambda (item)
+                                      (concat
+                                       (lyskom-format 'author-fast-reply-aux
+                                                      (aux-item->data item)
+                                                      (aux-item->creator item))
+                                       (lyskom-aux-item-terminating-button
+                                        item
+                                        text-stat)
+                                       "\n"))
+                                    (nreverse author-fast-replies)
+                                    ""))))
+                     (when other-fast-replies
+                       (lyskom-insert
+                        (concat
+                         (lyskom-format 'other-fast-replies)
+                         "\n"
+                         (mapconcat (lambda (item)
+                                      (concat
+                                       (lyskom-format 'other-fast-reply-aux
+                                                      (aux-item->data item)
+                                                      (aux-item->creator item))
+                                       (lyskom-aux-item-terminating-button
+                                        item
+                                        text-stat)
+                                       "\n"))
+                                    (nreverse other-fast-replies)
+                                    "")))))
+
+                   ;; Insert footnote/comment references.
 
 		   (if kom-reading-puts-comments-in-pointers-last
 		       (lyskom-view-text-handle-saved-comments text-stat))
-		   
+
+                   ;; Prefetch commented texts.
+
 		   (if (or follow-comments
 			   ;; Checking build-review-tree should not be
 			   ;; necessary, really /davidk