From d5f63b1771da4bb48de4f723afa445079ca1c389 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 2 Sep 2005 16:07:43 +0000
Subject: [PATCH] Support @frenchspacing, @euro, @sansserif.
 (texinfo-format-ordf): Fix typo.  From TAKAHASHI-san.

---
 ChangeLog         |    5 +++++
 texi/ptexinfmt.el |   13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ab44f77..53a643a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-02  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* texi/ptexinfmt.el: Support @frenchspacing, @euro, @sansserif.
+	(texinfo-format-ordf): Fix typo.
+
 2005-08-10  Romain Francoise  <romain@orebokech.com>
 
 	* GNUS-NEWS: Generated.
diff --git a/texi/ptexinfmt.el b/texi/ptexinfmt.el
index 267f545..36843c1 100644
--- a/texi/ptexinfmt.el
+++ b/texi/ptexinfmt.el
@@ -51,6 +51,7 @@
 ;;  @definfoenclose
 ;;  @deftypeivar
 ;;  @deftypeop
+;;  @allowcodebreaks
 
 ;;; Code:
 
@@ -197,6 +198,7 @@ DOCSTRING will be printed if ASSERTION is nil and
 (put 'setcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line)
 (put 'setshortcontentsaftertitlepage 'texinfo-format 'texinfo-discard-line)
 (put 'novalidate 'texinfo-format 'texinfo-discard-line-with-args)
+(put 'frenchspacing 'texinfo-format 'texinfo-discard-line-with-args)
 
 ;; head & foot
 (put 'headings 'texinfo-format 'texinfo-discard-line-with-args)
@@ -214,6 +216,9 @@ DOCSTRING will be printed if ASSERTION is nil and
 ;; @slanted{} (makeinfo 4.8 or later)
 (put 'slanted 'texinfo-format 'texinfo-format-noop)
 
+;; @sansserif{} (makeinfo 4.8 or later)
+(put 'sansserif 'texinfo-format 'texinfo-format-noop)
+
 ;; @tie{} (makeinfo 4.3 or later)
 (put 'tie 'texinfo-format 'texinfo-format-tie)
 (ptexinfmt-defun-if-void texinfo-format-tie ()
@@ -405,6 +410,12 @@ For example, @verb\{|@|\} results in @ and
   (insert "(R)"))
 
 ;;; Accents and Special characters
+;; @euro{}	==>	Euro
+(put 'euro 'texinfo-format 'texinfo-format-euro)
+(ptexinfmt-defun-if-void texinfo-format-euro ()
+  (texinfo-parse-arg-discard)
+  (insert "Euro "))
+
 ;; @pounds{}	==>	#	Pounds Sterling
 (put 'pounds 'texinfo-format 'texinfo-format-pounds)
 (ptexinfmt-defun-if-void texinfo-format-pounds ()
@@ -415,7 +426,7 @@ For example, @verb\{|@|\} results in @ and
 (put 'ordf 'texinfo-format 'texinfo-format-ordf)
 (ptexinfmt-defun-if-void texinfo-format-ordf ()
   (texinfo-parse-arg-discard)
-  (insert "o"))
+  (insert "a"))
 
 ;; @ordm{}	==>	o	Spanish masculine
 (put 'ordm 'texinfo-format 'texinfo-format-ordm)
-- 
1.7.10.4