texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Sun Feb 13 19:22:01 EST 2005)


From: Karl Berry
Subject: texinfo update (Sun Feb 13 19:22:01 EST 2005)
Date: Sun, 13 Feb 2005 19:22:15 -0500

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.464
retrieving revision 1.465
diff -c -r1.464 -r1.465
*** ChangeLog   11 Feb 2005 13:35:14 -0000      1.464
--- ChangeLog   14 Feb 2005 00:20:27 -0000      1.465
***************
*** 1,3 ****
--- 1,20 ----
+ 2005-02-13  Karl Berry  <address@hidden>
+ 
+       * doc/texinfo.txi (frenchspacing): new code.
+       * makeinfo/cmds.c (command_table): add frenchspacing.
+       (cm_frenchspacing): new fn.
+       * util/texinfo.dtd (frenchspacing): new element.
+       (option.cmds): new entity; use in Inline.phrase, I guess.
+       * makeinfo/xml.h (xml_element): add FRENCHSPACING.
+       * makeinfo/xml.c (docbook_element_list, texinfoml_element_list): same.
+       * doc/texinfo.tex (\frenchspacing): new macro for new command.
+       (\onword, \offword): args to that command.
+       (\plainfrenchspacing, \plainnonfrenchspacing): the commands which
+               really do the work; change calls.
+       (\endofsentencespacefactor): set in \plain...frenchspacing to 3000
+               or 1000 as appropriate.
+       (\., \!, \?): use here, instead of hardwiring 3000.
+ 
  2005-02-10  Karl Berry  <address@hidden>
  
        * util/texi2dvi (findprog): also check for foo.exe, for Cygwin.
Index: NEWS
===================================================================
RCS file: /cvsroot/texinfo/texinfo/NEWS,v
retrieving revision 1.104
retrieving revision 1.105
diff -c -r1.104 -r1.105
*** NEWS        31 Dec 2004 21:43:12 -0000      1.104
--- NEWS        14 Feb 2005 00:20:27 -0000      1.105
***************
*** 1,9 ****
! $Id: NEWS,v 1.104 2004/12/31 21:43:12 karl Exp $
  This file records noteworthy changes, very tersely.
  See the manual for detailed information.
  
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
!   2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright
--- 1,9 ----
! $Id: NEWS,v 1.105 2005/02/14 00:20:27 karl Exp $
  This file records noteworthy changes, very tersely.
  See the manual for detailed information.
  
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
!   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright
***************
*** 22,27 ****
--- 22,32 ----
    
http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html
  
  
-------------------------------------------------------------------------------
+ * Language:
+   . new command @frenchspacing to control spacing after sentences.
+ * Distribution:
+   . automake 1.9.5.
+ 
  
  4.8 (31 December 2004)
  * Language:
Index: doc/makeinfo.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** doc/makeinfo.1      31 Dec 2004 21:43:12 -0000      1.41
--- doc/makeinfo.1      14 Feb 2005 00:20:27 -0000      1.42
***************
*** 1,5 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
! .TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
  .SH NAME
  makeinfo \- translate Texinfo documents
  .SH SYNOPSIS
--- 1,5 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
! .TH MAKEINFO "1" "February 2005" "makeinfo 4.8" "User Commands"
  .SH NAME
  makeinfo \- translate Texinfo documents
  .SH SYNOPSIS
Index: doc/texi2dvi.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** doc/texi2dvi.1      2 Jan 2005 13:48:17 -0000       1.37
--- doc/texi2dvi.1      14 Feb 2005 00:20:27 -0000      1.38
***************
*** 1,5 ****
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
! .TH TEXI2DVI "1" "December 2004" "texi2dvi 1.35" "User Commands"
  .SH NAME
  texi2dvi \- print Texinfo documents
  .SH SYNOPSIS
--- 1,5 ----
  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
! .TH TEXI2DVI "1" "February 2005" "texi2dvi 1.42" "User Commands"
  .SH NAME
  texi2dvi \- print Texinfo documents
  .SH SYNOPSIS
***************
*** 77,83 ****
  general questions and discussion to <address@hidden>.
  Texinfo home page: http://www.gnu.org/software/texinfo/
  .SH COPYRIGHT
! Copyright \(co 2004 Free Software Foundation, Inc.
  There is NO warranty.  You may redistribute this software
  under the terms of the GNU General Public License.
  For more information about these matters, see the files named COPYING.
--- 77,83 ----
  general questions and discussion to <address@hidden>.
  Texinfo home page: http://www.gnu.org/software/texinfo/
  .SH COPYRIGHT
! Copyright \(co 2005 Free Software Foundation, Inc.
  There is NO warranty.  You may redistribute this software
  under the terms of the GNU General Public License.
  For more information about these matters, see the files named COPYING.
Index: doc/texinfo.tex
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.tex,v
retrieving revision 1.183
retrieving revision 1.184
diff -c -r1.183 -r1.184
*** doc/texinfo.tex     31 Jan 2005 01:05:43 -0000      1.183
--- doc/texinfo.tex     14 Feb 2005 00:20:27 -0000      1.184
***************
*** 3,9 ****
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-01-30.17}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
--- 3,9 ----
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
! \def\texinfoversion{2005-02-13.16}
  %
  % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
  % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
***************
*** 647,659 ****
  \let\/=\allowbreak
  
  % @. is an end-of-sentence period.
! \def\.{.\spacefactor=3000 }
  
  % @! is an end-of-sentence bang.
! \def\!{!\spacefactor=3000 }
  
  % @? is an end-of-sentence query.
! \def\?{?\spacefactor=3000 }
  
  % @w prevents a word break.  Without the \leavevmode, @w at the
  % beginning of a paragraph, when TeX is still in vertical mode, would
--- 647,674 ----
  \let\/=\allowbreak
  
  % @. is an end-of-sentence period.
! \def\.{.\spacefactor=\endofsentencespacefactor}
  
  % @! is an end-of-sentence bang.
! \def\!{!\spacefactor=\endofsentencespacefactor}
  
  % @? is an end-of-sentence query.
! \def\?{?\spacefactor=\endofsentencespacefactor}
! 
! % @frenchspacing on|off  says whether to put extra space after punctuation.
! % 
! \def\onword{on}
! \def\offword{off}
! %
! \parseargdef\frenchspacing{%
!   \def\temp{#1}%
!   \ifx\temp\onword \plainfrenchspacing
!   \else\ifx\temp\offword \plainnonfrenchspacing
!   \else
!     \errhelp = \EMsimple
!     \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
!   \fi\fi
! }
  
  % @w prevents a word break.  Without the \leavevmode, @w at the
  % beginning of a paragraph, when TeX is still in vertical mode, would
***************
*** 1092,1098 ****
  %
  \def\enddots{%
    \dots
!   \spacefactor=3000
  }
  
  % @comma{} is so commas can be inserted into text without messing up
--- 1107,1113 ----
  %
  \def\enddots{%
    \dots
!   \spacefactor=\endofsentencespacefactor
  }
  
  % @comma{} is so commas can be inserted into text without messing up
***************
*** 1749,1762 ****
  % sometimes \x has an active definition that messes things up.
  %
  address@hidden
!   \def\frenchspacing{%
      \sfcode\dotChar  address@hidden address@hidden address@hidden
      address@hidden \sfcode\semiChar address@hidden \sfcode\commaChar 
address@hidden
    }
  address@hidden
  
  \def\t#1{%
!   {\tt \rawbackslash \frenchspacing #1}%
    \null
  }
  \def\samp#1{`\tclose{#1}'\null}
--- 1764,1784 ----
  % sometimes \x has an active definition that messes things up.
  %
  address@hidden
!   \def\plainfrenchspacing{%
      \sfcode\dotChar  address@hidden address@hidden address@hidden
      address@hidden \sfcode\semiChar address@hidden \sfcode\commaChar 
address@hidden
+     \def\endofsentencespacefactor{1000}% for @. and friends
+   }
+   \def\plainnonfrenchspacing{%
+     \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+     \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+     \def\endofsentencespacefactor{3000}% for @. and friends
    }
  address@hidden
+ \def\endofsentencespacefactor{3000}% default
  
  \def\t#1{%
!   {\tt \rawbackslash \plainfrenchspacing #1}%
    \null
  }
  \def\samp#1{`\tclose{#1}'\null}
***************
*** 1793,1799 ****
      \nohyphenation
      %
      \rawbackslash
!     \frenchspacing
      #1%
    }%
    \null
--- 1815,1821 ----
      \nohyphenation
      %
      \rawbackslash
!     \plainfrenchspacing
      #1%
    }%
    \null
***************
*** 1962,1968 ****
  % 
  \def\abbr#1{\doabbr #1,,\finish}
  \def\doabbr#1,#2,#3\finish{%
!   {\frenchspacing #1}%
    \def\temp{#2}%
    \ifx\temp\empty \else
      \space ({\unsepspaces \ignorespaces \temp \unskip})%
--- 1984,1990 ----
  % 
  \def\abbr#1{\doabbr #1,,\finish}
  \def\doabbr#1,#2,#3\finish{%
!   {\plainfrenchspacing #1}%
    \def\temp{#2}%
    \ifx\temp\empty \else
      \space ({\unsepspaces \ignorespaces \temp \unskip})%
***************
*** 4765,4770 ****
--- 4787,4793 ----
    \let\/=\ptexslash
    \let\*=\ptexstar
    \let\t=\ptext
+   \let\frenchspacing=\plainfrenchspacing
    %
    \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
    \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt 
\endldots\,$\fi}%
Index: doc/texinfo.txi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.134
retrieving revision 1.135
diff -c -r1.134 -r1.135
*** doc/texinfo.txi     26 Jan 2005 14:07:42 -0000      1.134
--- doc/texinfo.txi     14 Feb 2005 00:20:27 -0000      1.135
***************
*** 1,5 ****
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.134 2005/01/26 14:07:42 karl Exp $
  @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
  @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
  
--- 1,5 ----
  \input texinfo.tex    @c -*-texinfo-*-
! @c $Id: texinfo.txi,v 1.135 2005/02/14 00:20:27 karl Exp $
  @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
  @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
  
***************
*** 460,465 ****
--- 460,466 ----
  * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
  * Ending a Sentence::           Sometimes it does.
  * Multiple Spaces::             Inserting multiple spaces.
+ * frenchspacing::               Specifying end-of-sentence spacing.
  * dmn::                         How to format a dimension.
  
  Inserting Ellipsis and Bullets
***************
*** 10057,10065 ****
  macros (@pxref{Defining Macros}), can take more than one argument.  In
  these cases, the comma character is used to separate arguments.
  
! Since a comma chacter would confuse Texinfo's parsing for these
  commands, you must use the command @address@hidden instead if you want
! to have an actual comma in the output.  Here are some examples:
  
  @example
  @@address@hidden, A Bizarre @@address@hidden@address@hidden
--- 10058,10066 ----
  macros (@pxref{Defining Macros}), can take more than one argument.  In
  these cases, the comma character is used to separate arguments.
  
! Since a comma character would confuse Texinfo's parsing for these
  commands, you must use the command @address@hidden instead if you want
! to pass an actual comma.  Here are some examples:
  
  @example
  @@address@hidden, A Bizarre @@address@hidden@address@hidden
***************
*** 10067,10073 ****
  @@address@hidden argument@@address@hidden@} containing a address@hidden
  @end example
  
! Although @comma{} can be used anywhere, there is no need for it
  anywhere except in this unusual case.
  
  
--- 10068,10074 ----
  @@address@hidden argument@@address@hidden@} containing a address@hidden
  @end example
  
! Although @comma{} can be used nearly anywhere, there is no need for it
  anywhere except in this unusual case.
  
  
***************
*** 10083,10088 ****
--- 10084,10090 ----
  * Not Ending a Sentence::       Sometimes a . doesn't end a sentence.
  * Ending a Sentence::           Sometimes it does.
  * Multiple Spaces::             Inserting multiple spaces.
+ * frenchspacing::               Specifying end-of-sentence spacing.
  * dmn::                         How to format a dimension.
  @end menu
  
***************
*** 10237,10242 ****
--- 10239,10312 ----
  To produce a non-breakable space, see @ref{tie, @code{@@tie}}.
  
  
+ @node frenchspacing
+ @subsection @code{@@frenchspacing} @var{val}: Control sentence spacing
+ @findex frenchspacing
+ @cindex French spacing
+ @cindex Sentences, spacing after
+ @cindex Space, after sentences
+ 
+ In American typography, it is traditional and correct to put extra
+ space at the end of a sentence, after a semi-colon, and so on.  This
+ is the default in Texinfo.  In French typography (and many others),
+ this extra space is wrong; all spaces are uniform.
+ 
+ Therefore Texinfo provides the @code{@@frenchspacing} command to
+ control the spacing after punctuation.  It reads the rest of the line
+ as its argument, which must be the single word @samp{on} or @samp{off}
+ (always these words, regardless of the language) of the document.
+ Here is an example:
+ 
+ @example
+ @@frenchspacing on
+ This is text. Two sentences. Three sentences. French spacing.
+ 
+ @@frenchspacing off
+ This is text. Two sentences. Three sentences. Non-french spacing.
+ @end example
+ 
+ @noindent produces (there will be no difference in Info):
+ 
+ @frenchspacing on
+ This is text. Two sentences. Three sentences. French spacing.
+ 
+ @frenchspacing off
+ This is text. Two sentences. Three sentences. Non-french spacing.
+ 
+ @code{@@frenchspacing} mainly affects the printed output, including
+ the output after @code{@@.}, @code{@@!}, and @code{@@?} (@pxref{Ending
+ a Sentence}).
+ 
+ In Info, usually space characters in the input are written unaltered
+ to the output, and @code{@@frenchspacing} does not change this.  It
+ does change the one case where @command{makeinfo} outputs a space on
+ its own: when a sentence ends at a newline in the source.  Here's an
+ example:
+ 
+ @example
+ Some sentence.
+ Next sentence.
+ @end example
+ 
+ @noindent produces in Info output, with @code{@@frenchspacing off}
+ (the default), two spaces between the sentences:
+ 
+ @example
+ Some sentence.  Next sentence.
+ @end example
+ 
+ @noindent With @code{@@frenchspacing on}, @command{makeinfo} outputs
+ only a single space:
+ 
+ @example
+ Some sentence. Next sentence.
+ @end example
+ 
+ @code{@@frenchspacing} has no effect on the HTML or Docbook output;
+ for XML, it outputs a transliteration of itself (@pxref{Output
+ Formats}).
+ 
+ 
  @node dmn
  @subsection @code{@@address@hidden@address@hidden: Format a Dimension
  @cindex Thin space between number, dimension
***************
*** 18464,18470 ****
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.134 2005/01/26 14:07:42 karl Exp $
  @end example
  (This is useful in all sources that use version control, not just manuals.)
  You may wish to include the @samp{$Id:} comment in the @code{@@copying}
--- 18534,18540 ----
  Concurrent Versions System}) or RCS (see rcsintro(1)) version control
  systems, which expand it into a string such as:
  @example
! $Id: texinfo.txi,v 1.135 2005/02/14 00:20:27 karl Exp $
  @end example
  (This is useful in all sources that use version control, not just manuals.)
  You may wish to include the @samp{$Id:} comment in the @code{@@copying}
***************
*** 18530,18536 ****
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.134 2005/01/26 14:07:42 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
--- 18600,18606 ----
  
  @verbatim
  \input texinfo   @c -*-texinfo-*-
! @comment $Id: texinfo.txi,v 1.135 2005/02/14 00:20:27 karl Exp $
  @comment %**start of header
  @setfilename sample.info
  @include version.texi
Index: doc/version-stnd.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version-stnd.texi,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** doc/version-stnd.texi       31 Dec 2004 21:43:12 -0000      1.12
--- doc/version-stnd.texi       14 Feb 2005 00:20:27 -0000      1.13
***************
*** 1,4 ****
! @set UPDATED 14 December 2004
! @set UPDATED-MONTH December 2004
  @set EDITION 4.8
  @set VERSION 4.8
--- 1,4 ----
! @set UPDATED 23 January 2005
! @set UPDATED-MONTH January 2005
  @set EDITION 4.8
  @set VERSION 4.8
Index: doc/version.texi
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** doc/version.texi    31 Dec 2004 21:43:12 -0000      1.27
--- doc/version.texi    14 Feb 2005 00:20:27 -0000      1.28
***************
*** 1,4 ****
! @set UPDATED 29 December 2004
! @set UPDATED-MONTH December 2004
  @set EDITION 4.8
  @set VERSION 4.8
--- 1,4 ----
! @set UPDATED 13 February 2005
! @set UPDATED-MONTH February 2005
  @set EDITION 4.8
  @set VERSION 4.8
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -c -r1.56 -r1.57
*** makeinfo/cmds.c     17 Jan 2005 00:20:22 -0000      1.56
--- makeinfo/cmds.c     14 Feb 2005 00:20:27 -0000      1.57
***************
*** 1,8 ****
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.56 2005/01/17 00:20:22 karl Exp $
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
!    Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,8 ----
  /* cmds.c -- Texinfo commands.
!    $Id: cmds.c,v 1.57 2005/02/14 00:20:27 karl Exp $
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
!    Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 39,49 ****
  #include <time.h>
  #endif
  
! /* Options. */
  static void cm_exampleindent (void),
       cm_firstparagraphindent (void),
!      cm_paragraphindent (void),
!      cm_novalidate (void);
  
  /* Internals. */
  static void cm_obsolete (int arg, int start, int end),
--- 39,50 ----
  #include <time.h>
  #endif
  
! /* Simple commands defined and only called here. */
  static void cm_exampleindent (void),
       cm_firstparagraphindent (void),
!      cm_frenchspacing (void),
!      cm_novalidate (void),
!      cm_paragraphindent (void);
  
  /* Internals. */
  static void cm_obsolete (int arg, int start, int end),
***************
*** 203,208 ****
--- 204,210 ----
    { "footnote", cm_footnote, NO_BRACE_ARGS}, /* self-arg eater */
    { "footnotestyle", cm_footnotestyle, NO_BRACE_ARGS },
    { "format", cm_format, NO_BRACE_ARGS },
+   { "frenchspacing", cm_frenchspacing, NO_BRACE_ARGS },
    { "ftable", cm_ftable, NO_BRACE_ARGS },
    { "group", cm_group, NO_BRACE_ARGS },
    { "heading", cm_heading, NO_BRACE_ARGS },
***************
*** 1822,1828 ****
  
    get_rest_of_line (1, &arg);
    if (set_firstparagraphindent (arg) != 0)
!     line_error (_("Bad argument to %c%s"), COMMAND_PREFIX, command);
  
    free (arg);
  }
--- 1824,1830 ----
  
    get_rest_of_line (1, &arg);
    if (set_firstparagraphindent (arg) != 0)
!     line_error (_("Bad argument to @%s: %s"), command, arg);
  
    free (arg);
  }
***************
*** 1887,1889 ****
--- 1889,1916 ----
        insert_self (arg);
      }
  }
+ 
+ /* If @frenchspacing is in effect, avoid outputting extra spaces after
+    sentence-ending periods.  Actually, we explicitly do this only in one
+    tiny case (see add_char in makeinfo.c).  Usually we just output
+    whatever the user gives us.  */
+ void
+ cm_frenchspacing (void)
+ {
+   char *val;
+   get_rest_of_line (1, &val);
+ 
+   if (STREQ (val, "on")) {
+     french_spacing = 1;
+   } else if (STREQ (val, "off")) {
+     french_spacing = 0;
+   } else {
+     line_error (_("Expected @%s on or off, not `%s'"), command, val);
+   }
+   
+   if (xml && !docbook) {
+     xml_insert_element_with_attribute (FRENCHSPACING, START,
+                                        "val=\"%s\"", val);
+     xml_insert_element (FRENCHSPACING, END);
+   }
+ }
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -c -r1.74 -r1.75
*** makeinfo/makeinfo.c 19 Dec 2004 17:15:42 -0000      1.74
--- makeinfo/makeinfo.c 14 Feb 2005 00:20:27 -0000      1.75
***************
*** 1,8 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.74 2004/12/19 17:15:42 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
!    2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,8 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.75 2005/02/14 00:20:27 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
!    2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 2609,2616 ****
              indent (output_column = current_indent);
            break;
          }
!       else if (end_of_sentence_p ())
!         /* CHARACTER is newline, and filling is enabled. */
          {
            insert (' ');
            output_column++;
--- 2609,2618 ----
              indent (output_column = current_indent);
            break;
          }
!       else if (end_of_sentence_p () && !french_spacing)
!         /* CHARACTER is newline, filling is enabled, and we're at the
!            end of a sentence.  Insert an extra space, unless
!            @frenchspacing is in effect.  */
          {
            insert (' ');
            output_column++;
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** makeinfo/makeinfo.h 30 Nov 2004 02:03:23 -0000      1.17
--- makeinfo/makeinfo.h 14 Feb 2005 00:20:27 -0000      1.18
***************
*** 1,8 ****
  /* makeinfo.h -- declarations for Makeinfo.
!    $Id: makeinfo.h,v 1.17 2004/11/30 02:03:23 karl Exp $
  
!    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
!    Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,8 ----
  /* makeinfo.h -- declarations for Makeinfo.
!    $Id: makeinfo.h,v 1.18 2005/02/14 00:20:27 karl Exp $
  
!    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
!    2005 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 109,114 ****
--- 109,117 ----
  /* The column at which long lines are broken. */
  DECLARE (int, fill_column, 72);
  
+ /* Nonzero means we're doing one space after sentences (@frenchspacing).  */
+ DECLARE (int, french_spacing, 0);
+ 
  /* Nonzero means that words are not to be split, even in long lines.  This
     gets changed for cm_w (). */
  DECLARE (int, non_splitting_words, 0);
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** makeinfo/xml.c      5 Feb 2005 17:44:01 -0000       1.54
--- makeinfo/xml.c      14 Feb 2005 00:20:27 -0000      1.55
***************
*** 1,5 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.54 2005/02/05 17:44:01 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.55 2005/02/14 00:20:27 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
***************
*** 249,254 ****
--- 249,255 ----
    { "defclass",            0, 0, 0 },
    { "defclassvar",         0, 0, 0 },
    { "defoperation",        0, 0, 0 },
+   { "frenchspacing",       0, 0, 0 },
  
    { "para",                0, 0, 0 } /* Must be last */
    /* name / contains para / contained in para / preserve space */
***************
*** 462,467 ****
--- 463,469 ----
    { "classname",           0, 0, 0 }, /* DEFCLASS */
    { "property",            0, 0, 0 }, /* DEFCLASSVAR */
    { "methodname",          0, 0, 0 }, /* DEFOPERATION */
+   { "",                    0, 0, 0 }, /* FRENCHSPACING */
  
    { "para",                0, 0, 0 } /* Must be last */
    /* name / contains para / contained in para / preserve space */
Index: makeinfo/xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** makeinfo/xml.h      26 Nov 2004 00:48:35 -0000      1.24
--- makeinfo/xml.h      14 Feb 2005 00:20:27 -0000      1.25
***************
*** 1,7 ****
  /* xml.h -- xml output declarations.
!    $Id: xml.h,v 1.24 2004/11/26 00:48:35 karl Exp $
  
!    Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
  /* xml.h -- xml output declarations.
!    $Id: xml.h,v 1.25 2005/02/14 00:20:27 karl Exp $
  
!    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 100,105 ****
--- 100,106 ----
    DEFINITION, DEFINITIONTERM, DEFINITIONITEM,
    DEFCATEGORY, DEFFUNCTION, DEFVARIABLE, DEFPARAM, DEFDELIMITER, DEFTYPE,
    DEFPARAMTYPE, DEFDATATYPE, DEFCLASS, DEFCLASSVAR, DEFOPERATION,
+   FRENCHSPACING,
    PARA
  };
  
Index: util/texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** util/texinfo.dtd    13 Feb 2005 23:02:13 -0000      1.5
--- util/texinfo.dtd    14 Feb 2005 00:20:27 -0000      1.6
***************
*** 1,4 ****
! <!-- $Id: texinfo.dtd,v 1.5 2005/02/13 23:02:13 karl Exp $
     Document Type Definition for Texinfo (makeinfo --xml).
  
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
--- 1,4 ----
! <!-- $Id: texinfo.dtd,v 1.6 2005/02/14 00:20:27 karl Exp $
     Document Type Definition for Texinfo (makeinfo --xml).
  
    Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
***************
*** 91,96 ****
--- 91,99 ----
                                      | %lang; | %variables;
                                      | %headings;)*">
  
+ <!-- Options (many missing) -->
+ <!ENTITY % onoff "on|off">
+ <!ENTITY % option.cmds "frenchspacing">
  
  <!-- Inline -->
  <!ENTITY % Inline.emphasize "strong | emph">
***************
*** 103,111 ****
  <!ENTITY % Inline.smallcaps "sc">
  
  <!ENTITY % Inline.phrase
!            "%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
!             | %Inline.markup; | %Inline.math; | %Inline.reference;
!             | %Inline.footnote; ">
  
  
  <!--  * ELEMENTS * -->
--- 106,114 ----
  <!ENTITY % Inline.smallcaps "sc">
  
  <!ENTITY % Inline.phrase
!            "%Inline.emphasize;  | %Inline.smallcaps; | %Inline.fonts;
!             | %Inline.markup;   | %Inline.math; | %Inline.reference;
!             | %Inline.footnote; | %option.cmds; ">
  
  
  <!--  * ELEMENTS * -->
***************
*** 282,290 ****
  <!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- INLINE Elements -->
- <!-- *************** -->
  
! <!-- Emphasize -->
  <!ELEMENT strong (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT emph   (#PCDATA | %Inline.phrase;)*>
  
--- 285,296 ----
  <!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- INLINE Elements -->
  
! <!-- options -->
! <!ELEMENT frenchspacing (#PCDATA)> <!-- must be on or off -->
! <!ATTLIST frenchspacing val (%onoff;) 'off'>
! 
! <!-- emphasize -->
  <!ELEMENT strong (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT emph   (#PCDATA | %Inline.phrase;)*>
  
***************
*** 292,303 ****
  <!ELEMENT sc (#PCDATA | %Inline.phrase;)*>
  
  <!-- fonts -->
- <!ELEMENT i  (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT b  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT tt (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT r  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT notfixedwidth (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT titlefont   (#PCDATA | %Inline.phrase;)*>
  
  <!-- markup -->
  <!ELEMENT code    (#PCDATA | %Inline.phrase;)*>
--- 298,310 ----
  <!ELEMENT sc (#PCDATA | %Inline.phrase;)*>
  
  <!-- fonts -->
  <!ELEMENT b  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT i  (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT r  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT sansserif   (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT slanted     (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT titlefont   (#PCDATA | %Inline.phrase;)*>
+ <!ELEMENT tt (#PCDATA | %Inline.phrase;)*>
  
  <!-- markup -->
  <!ELEMENT code    (#PCDATA | %Inline.phrase;)*>
P ChangeLog
P NEWS
P doc/makeinfo.1
P doc/texi2dvi.1
P doc/texinfo.tex
P doc/texinfo.txi
P doc/version-stnd.texi
P doc/version.texi
P makeinfo/cmds.c
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
P makeinfo/xml.c
P makeinfo/xml.h
P util/texinfo.dtd


reply via email to

[Prev in Thread] Current Thread [Next in Thread]