[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Wed Dec 15 13:22:02 EST 2004)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Wed Dec 15 13:22:02 EST 2004) |
|
Date: |
Wed, 15 Dec 2004 13:22:19 -0500 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.435
retrieving revision 1.436
diff -c -r1.435 -r1.436
*** ChangeLog 15 Dec 2004 16:53:59 -0000 1.435
--- ChangeLog 15 Dec 2004 18:21:47 -0000 1.436
***************
*** 1,3 ****
--- 1,8 ----
+ 2004-12-15 Karl Berry <address@hidden>
+
+ * util/texinfo.dtd: merge with makeinfo/texinfo.dtd.
+ * makeinfo/texinfo.dtd, makeinfo/texinfo.xsl: remove.
+
2004-12-15 Stepan Kasal <address@hidden>
* Makefile.am (EXTRA_DIST): Removed po/Makevars.template, sorry.
Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** configure.ac 8 Dec 2004 16:52:47 -0000 1.47
--- configure.ac 15 Dec 2004 18:23:53 -0000 1.48
***************
*** 1,5 ****
# Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.47 2004/12/08 16:52:47 karl Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
--- 1,5 ----
# Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.48 2004/12/15 18:23:53 karl Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
***************
*** 11,17 ****
#
AC_PREREQ(2.59)# Minimum Autoconf version required.
#
! AC_INIT([GNU Texinfo], [4.7.91])
AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS.
AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
AM_INIT_AUTOMAKE([dist-bzip2])
--- 11,17 ----
#
AC_PREREQ(2.59)# Minimum Autoconf version required.
#
! AC_INIT([GNU Texinfo], [4.7.92])
AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS.
AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
AM_INIT_AUTOMAKE([dist-bzip2])
cvs diff: Tag HEAD refers to a dead (removed) revision in file
`makeinfo/texinfo.dtd'.
cvs diff: No comparison available. Pass `-N' to `cvs diff'?
cvs diff: Tag HEAD refers to a dead (removed) revision in file
`makeinfo/texinfo.xsl'.
cvs diff: No comparison available. Pass `-N' to `cvs diff'?
Index: util/texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** util/texinfo.dtd 31 Jul 2004 18:49:51 -0000 1.2
--- util/texinfo.dtd 15 Dec 2004 18:21:47 -0000 1.3
***************
*** 1,4 ****
! <!-- $Id: texinfo.dtd,v 1.2 2004/07/31 18:49:51 karl Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (address@hidden)
--- 1,4 ----
! <!-- $Id: texinfo.dtd,v 1.3 2004/12/15 18:21:47 karl Exp $
Document Type Definition for Texinfo.
Author: Philippe Martin (address@hidden)
***************
*** 17,23 ****
<!-- ENTITIES -->
<!-- Meta-information -->
! <!ENTITY % metainformation "setfilename | settitle | dircategory">
<!ENTITY % variables "setvalue | clearvalue">
<!-- Document language -->
--- 17,24 ----
<!-- ENTITIES -->
<!-- Meta-information -->
! <!ENTITY % metainformation "setfilename | settitle | dircategory
! | documentdescription">
<!ENTITY % variables "setvalue | clearvalue">
<!-- Document language -->
***************
*** 38,44 ****
| smalllisp | cartouche | copying
| format | smallformat | display
| smalldisplay | itemize | enumerate | sp | center | group
! | float | table | multitable | definition | verbatim">
<!-- API definitions -->
<!-- *************** -->
--- 39,45 ----
| smalllisp | cartouche | copying
| format | smallformat | display
| smalldisplay | itemize | enumerate | sp | center | group
! | table | multitable | definition">
<!-- API definitions -->
<!-- *************** -->
***************
*** 60,66 ****
<!ENTITY % section.level3 "subsection | unnumberedsubsec | appendixsubsec">
! <!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec
| appendixsubsubsec">
<!ENTITY % section.all "%section.level1; | %section.level2; | %section.level3;
--- 61,67 ----
<!ENTITY % section.level3 "subsection | unnumberedsubsec | appendixsubsec">
! <!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec
| appendixsubsubsec">
<!ENTITY % section.all "%section.level1; | %section.level2; | %section.level3;
***************
*** 71,111 ****
| %section.level2;
| %section.level3;
| %section.level4;
! | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;
! | printindex | listoffloats)*">
<!ENTITY % section.level2.content "(%block;
| %section.level3;
| %section.level4;
! | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level3.content "(%block;
| %section.level4;
! | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level4.content "(%block;
! | titlepage | image
! | %toc; | %lang; | %variables;
| %headings;)*">
<!-- Inline -->
<!-- ****** -->
<!ENTITY % Inline.emphasize "strong | emph">
! <!ENTITY % Inline.smallcaps "sc">
! <!ENTITY % Inline.fonts "i | b | tt | r | titlefont">
! <!ENTITY % Inline.markup "code | command | env | file | option | samp
! | dfn | cite | key | kbd | var | acronym
! | abbrev | url | dmn">
! <!ENTITY % Inline.math "math">
! <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref |
anchor">
<!ENTITY % Inline.footnote "footnote">
<!ENTITY % Inline.phrase
"%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
--- 72,111 ----
| %section.level2;
| %section.level3;
| %section.level4;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;
! | printindex)*">
<!ENTITY % section.level2.content "(%block;
| %section.level3;
| %section.level4;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level3.content "(%block;
| %section.level4;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;)*">
<!ENTITY % section.level4.content "(%block;
! | verbatim | titlepage | %toc;
! | %lang; | %variables;
| %headings;)*">
<!-- Inline -->
<!-- ****** -->
<!ENTITY % Inline.emphasize "strong | emph">
! <!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | titlefont | tt">
<!ENTITY % Inline.footnote "footnote">
+ <!ENTITY % Inline.markup "code | command | env | file | option | samp
+ | dfn | cite | key | kbd | var | acronym | url">
+ <!ENTITY % Inline.math "math">
+ <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref">
+ <!ENTITY % Inline.smallcaps "sc">
<!ENTITY % Inline.phrase
"%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
***************
*** 125,131 ****
<!-- meta-information -->
<!ELEMENT setfilename (#PCDATA)>
! <!ELEMENT settitle (#PCDATA | %Inline.phrase;)*>
<!ELEMENT dircategory (#PCDATA)>
<!ELEMENT setvalue (#PCDATA | %Inline.phrase;)*>
--- 125,131 ----
<!-- meta-information -->
<!ELEMENT setfilename (#PCDATA)>
! <!ELEMENT settitle (#PCDATA | %Inline.phrase; | footnote)*>
<!ELEMENT dircategory (#PCDATA)>
<!ELEMENT setvalue (#PCDATA | %Inline.phrase;)*>
***************
*** 152,158 ****
<!-- NODES -->
<!-- ***** -->
<!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
! (%section.all; | %block; | image | %toc; | %lang;)*) >
<!ELEMENT nodename (#PCDATA)>
<!ELEMENT nodenext (#PCDATA)>
--- 152,158 ----
<!-- NODES -->
<!-- ***** -->
<!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
! (%section.all; | %block; | %toc; | %lang; | image)*) >
<!ELEMENT nodename (#PCDATA)>
<!ELEMENT nodenext (#PCDATA)>
***************
*** 180,191 ****
<!ELEMENT appendixsubsubsec (title?, (%section.level4.content;))>
<!-- Headings and titles -->
! <!ELEMENT majorheading (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT chapheading (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT heading (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT subheading (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT subsubheading (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT title (#PCDATA | %Inline.phrase;)*>
<!-- Negative Indentation in Blocks -->
<!ELEMENT exdent (#PCDATA | %Inline.phrase;)*>
--- 180,191 ----
<!ELEMENT appendixsubsubsec (title?, (%section.level4.content;))>
<!-- Headings and titles -->
! <!ELEMENT majorheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT chapheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT heading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT subheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT title (#PCDATA | %Inline.phrase; | footnote)*>
<!-- Negative Indentation in Blocks -->
<!ELEMENT exdent (#PCDATA | %Inline.phrase;)*>
***************
*** 193,199 ****
<!-- BLOCK Elements -->
<!-- ************** -->
! <!ELEMENT quotation (%block; | %Inline.phrase; | exdent )*>
<!ELEMENT example (#PCDATA | %block; | %Inline.phrase; | exdent)*>
<!ELEMENT smallexample (#PCDATA | %block; | %Inline.phrase; | exdent)*>
<!ELEMENT lisp (#PCDATA | %block; | %Inline.phrase; | exdent)*>
--- 193,200 ----
<!-- BLOCK Elements -->
<!-- ************** -->
! <!ELEMENT quotation (%block; | %Inline.phrase; | exdent)*>
! <!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
<!ELEMENT example (#PCDATA | %block; | %Inline.phrase; | exdent)*>
<!ELEMENT smallexample (#PCDATA | %block; | %Inline.phrase; | exdent)*>
<!ELEMENT lisp (#PCDATA | %block; | %Inline.phrase; | exdent)*>
***************
*** 228,234 ****
<!ELEMENT verbatim (#PCDATA)>
<!ATTLIST verbatim xml:space (preserve) #FIXED 'preserve'>
! <!ELEMENT para (#PCDATA | %Inline.phrase;)*>
<!ATTLIST para
role CDATA #IMPLIED>
--- 229,235 ----
<!ELEMENT verbatim (#PCDATA)>
<!ATTLIST verbatim xml:space (preserve) #FIXED 'preserve'>
! <!ELEMENT para (#PCDATA | %Inline.phrase; | footnote | %lang;)*>
<!ATTLIST para
role CDATA #IMPLIED>
***************
*** 237,243 ****
<!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
<!ELEMENT menunode (#PCDATA)>
<!ELEMENT menutitle (#PCDATA)>
! <!ELEMENT menucomment (#PCDATA | %Inline.phrase;)*>
<!-- Floating displays -->
<!ELEMENT float (floattype, floatpos, (%block;)*, caption?)>
--- 238,244 ----
<!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
<!ELEMENT menunode (#PCDATA)>
<!ELEMENT menutitle (#PCDATA)>
! <!ELEMENT menucomment (#PCDATA | para)*>
<!-- Floating displays -->
<!ELEMENT float (floattype, floatpos, (%block;)*, caption?)>
***************
*** 278,294 ****
<!ELEMENT definitionterm (%definition.cmds; | indexterm)+>
<!ELEMENT definitionitem (%block;)*>
! <!ELEMENT defcategory (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT deffunction (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defvariable (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defparam (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defdelimiter (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT deftype (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defparamtype (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defdatatype (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defclass (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defclassvar (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defoperation (#PCDATA | %Inline.phrase;)*>
<!-- INLINE Elements -->
<!-- *************** -->
--- 279,295 ----
<!ELEMENT definitionterm (%definition.cmds; | indexterm)+>
<!ELEMENT definitionitem (%block;)*>
! <!ELEMENT defcategory (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT deffunction (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defvariable (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defparam (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defdelimiter (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT deftype (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defparamtype (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defdatatype (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defclass (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defclassvar (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*>
<!-- INLINE Elements -->
<!-- *************** -->
***************
*** 321,327 ****
<!ELEMENT kbd (#PCDATA | %Inline.phrase;)*>
<!ELEMENT var (#PCDATA | %Inline.phrase;)*>
<!ELEMENT url (#PCDATA | %Inline.phrase;)*>
- <!ELEMENT dmn (#PCDATA | %Inline.phrase;)*>
<!ELEMENT acronym (acronymword, acronymdesc?)>
<!ELEMENT acronymword (#PCDATA | %Inline.phrase;)*>
--- 322,327 ----
***************
*** 377,382 ****
--- 377,384 ----
<!ENTITY bullet "">
<!ENTITY copyright "">
<!ENTITY registered "">
+ <!ENTITY euro "">
+ <!ENTITY pounds "">
<!ENTITY minus "">
<!ENTITY linebreak "">
<!ENTITY space "">
***************
*** 479,482 ****
lines CDATA #IMPLIED>
<!ELEMENT printindex (#PCDATA)>
- <!-- vim: set expandtab: -->
--- 481,483 ----
P ChangeLog
P configure.ac
cvs update: makeinfo/texinfo.dtd is no longer in the repository
cvs update: makeinfo/texinfo.xsl is no longer in the repository
P util/texinfo.dtd
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Wed Dec 15 13:22:02 EST 2004),
Karl Berry <=