From: morioka <morioka>
Date: Tue, 10 Mar 1998 08:40:07 +0000 (+0000)
Subject: tm 7.100.
X-Git-Tag: tm-7_100~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6540c34270f441b2340fa72376325fdf4f20a75;p=elisp%2Fsinfo.git

tm 7.100.
---

diff --git a/ChangeLog b/ChangeLog
index 248b238..14175a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Dec 25 18:24:28 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* sinfo: Version 3.6 was released.
+
+	* sinfo.el (sinfo-to-texi): save case of reference.
+
+	* sinfo.el: (sinfo-to-texi):
+	 - move @cindex just after section tag.
+	 - unfold content of @ref and @strong tag.
+
+
 Mon Dec 23 20:13:11 1996  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
 	* sinfo: Version 3.4 was released.
diff --git a/sinfo.el b/sinfo.el
index 333d023..e970b67 100644
--- a/sinfo.el
+++ b/sinfo.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1996 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: sinfo.el,v 3.4 1996/12/23 20:11:18 morioka Exp $
+;; Version: $Id: sinfo.el,v 3.6 1996/12/25 18:24:28 morioka Exp $
 ;; Keywords: SGML, Texinfo
 
 ;; This file is part of sinfo (SGML based info system).
@@ -19,8 +19,8 @@
 ;; General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; Comment:
@@ -186,7 +186,7 @@
 		   (if (string= file "()")
 		       word
 		     (concat file word)
-		     ) "})"))
+		     ) "})") 'fixed-case)
 	  ))
       (goto-char (point-min))
       (while (re-search-forward
@@ -201,7 +201,7 @@
 	   (if (string= node "()")
 	       (concat "(" url ")")
 	     (concat "(@ref{" node "})")
-	     ))
+	     ) 'fixed-case)
 	  ))
       (sinfo-filter-for-standard)
       (goto-char (point-min))
@@ -219,13 +219,26 @@
 	(replace-match "@ref{")
 	)
       (goto-char (point-min))
-      (while (search-forward "@ref{}" nil t)
-	(replace-match "")
-	)
-      (goto-char (point-min))
-      (while (search-forward "@cindex{}" nil t)
-	(replace-match "")
-	)
+      (while (re-search-forward "@cindex{\\([^}]*\\)}" nil t)
+	(let ((str (buffer-substring (match-beginning 1)(match-end 1))))
+	  (replace-match "")
+	  (if (string= str "")
+	      ""
+	    (save-excursion
+	      (if (re-search-backward
+		   "@\\(chapter\\|\\(sub\\)*section\\)[ \t][^\n]*\n" nil t)
+		  (progn
+		    (goto-char (match-end 0))
+		    (insert
+		     (concat "@cindex "
+			     (mapconcat (function (lambda (chr)
+						    (if (eq chr ?\n)
+							" "
+						      (char-to-string chr)
+						      )))
+					str "")
+			     "\n"))
+		    ))))))
       (goto-char (point-min))
       (while (re-search-forward "{@refill}" nil t)
 	(replace-match "")
@@ -237,6 +250,36 @@
 	    )
 	  (fill-paragraph nil)
 	  ))
+      (goto-char (point-min))
+      (while (re-search-forward "@ref{\\([^}]*\\)}" nil t)
+	(let ((str (buffer-substring (match-beginning 1)(match-end 1))))
+	  (replace-match
+	   (if (string= str "")
+	       ""
+	     (concat "@ref{"
+		     (mapconcat (function (lambda (chr)
+					    (if (eq chr ?\n)
+						" "
+					      (char-to-string chr)
+					      )))
+				str "")
+		     "}")) 'fixed-case)
+	  ))
+      (goto-char (point-min))
+      (while (re-search-forward "@strong{\\([^}]*\\)}" nil t)
+	(let ((str (buffer-substring (match-beginning 1)(match-end 1))))
+	  (replace-match
+	   (if (string= str "")
+	       ""
+	     (concat "@strong{"
+		     (mapconcat (function (lambda (chr)
+					    (if (eq chr ?\n)
+						" "
+					      (char-to-string chr)
+					      )))
+				str "")
+		     "}")
+	     ))))
       (texinfo-every-node-update)
       (texinfo-all-menus-update)
       (texinfo-all-menu-titles-update)