summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2002-02-08 16:09:27 +0000
committerDaniel Veillard <veillard@src.gnome.org>2002-02-08 16:09:27 +0000
commitada89dddea264bb41fd5c0c293ce989eb90ef4da (patch)
treeaad11c8ee2473a75c1d81c5531281573f7572bb6
parent3146d5356fa192ef3f27f74ef634b3d7bd411c8e (diff)
downloadlibxslt-ada89dddea264bb41fd5c0c293ce989eb90ef4da.tar.gz
change the Licence to MIT Licence and release of 1.0.11 updates of theLIBXSLT_1_0_11
* Copyright Makefile.am configure.in libxslt.spec.in: change the Licence to MIT Licence and release of 1.0.11 * doc/FAQ.html doc/intro.html doc/libxslt-decl.txt doc/news.html doc/xslt.html: updates of the docs accordingly * libxslt/xsltwin32config.h: numbering * python/generator.py python/libxml_wrap.h python/libxsltclass.txt python/libxslt-python-api.xml: cleanup the dependancies with libxml2 * python/tests/extfunc.py: updated examples. Daniel
-rw-r--r--COPYING.LIB481
-rw-r--r--ChangeLog12
-rw-r--r--Copyright58
-rw-r--r--IPR45
-rw-r--r--Makefile.am2
-rw-r--r--configure.in9
-rw-r--r--doc/FAQ.html2
-rw-r--r--doc/intro.html6
-rw-r--r--doc/libxslt-decl.txt12
-rw-r--r--doc/news.html13
-rw-r--r--doc/xslt.html21
-rw-r--r--libxslt.spec.in10
-rw-r--r--libxslt/xsltwin32config.h6
-rwxr-xr-xpython/generator.py4
-rw-r--r--python/libxml_wrap.h2
-rw-r--r--python/libxslt-python-api.xml50
-rw-r--r--python/libxsltclass.txt6
-rwxr-xr-xpython/tests/extfunc.py3
18 files changed, 128 insertions, 614 deletions
diff --git a/COPYING.LIB b/COPYING.LIB
deleted file mode 100644
index eb685a5e..00000000
--- a/COPYING.LIB
+++ /dev/null
@@ -1,481 +0,0 @@
- GNU LIBRARY GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL. It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it. You can use it for
-your libraries, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
- Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library. If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software. To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
- Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs. This
-license, the GNU Library General Public License, applies to certain
-designated libraries. This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
- The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it. Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program. However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
- Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries. We
-concluded that weaker conditions might promote sharing better.
-
- However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves. This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them. (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.) The hope is that this
-will lead to faster development of free libraries.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, while the latter only
-works together with the library.
-
- Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-
- GNU LIBRARY GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License"). Each licensee is
-addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- c) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- d) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- Appendix: How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/ChangeLog b/ChangeLog
index 77ab5d33..efd54e46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb 8 17:01:10 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+ * Copyright Makefile.am configure.in libxslt.spec.in: change the
+ Licence to MIT Licence and release of 1.0.11
+ * doc/FAQ.html doc/intro.html doc/libxslt-decl.txt doc/news.html
+ doc/xslt.html: updates of the docs accordingly
+ * libxslt/xsltwin32config.h: numbering
+ * python/generator.py python/libxml_wrap.h python/libxsltclass.txt
+ python/libxslt-python-api.xml: cleanup the dependancies with
+ libxml2
+ * python/tests/extfunc.py: updated examples.
+
Thu Feb 7 23:21:18 CET 2002 Daniel Veillard <daniel@veillard.com>
* doc/libxslt-api.xml doc/libxslt-decl.txt doc/libxslt-refs.xml
diff --git a/Copyright b/Copyright
index f6995bb7..627eeff9 100644
--- a/Copyright
+++ b/Copyright
@@ -1,15 +1,53 @@
-This software is made available under 2 possible licences:
+Licence for libxslt except libexslt
+----------------------------------------------------------------------
+ Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.
- GNU LGPL, see COPYING.LIB
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
-or
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
- W3C IPR like licence see IPR
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-The (W3C) IPR seems more friendlier for commercial application.
-Pick the one you prefer. Note also that though I don't try to
-enforce it I prefer that improvement or bug fixes made to the
-code be provided back, check the http://xmlsoft.org/ page for
-details to contact the authors.
+Except as contained in this notice, the name of Daniel Veillard shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from him.
-Daniel Veillard, representing the AUTHORS (see enclosed file)
+----------------------------------------------------------------------
+
+Licence for libexslt
+----------------------------------------------------------------------
+ Copyright (C) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard.
+ All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the authors shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from him.
+----------------------------------------------------------------------
diff --git a/IPR b/IPR
deleted file mode 100644
index c9102508..00000000
--- a/IPR
+++ /dev/null
@@ -1,45 +0,0 @@
-SOFTWARE NOTICE AND LICENSE
-
-Copyright © 2000-2001 Daniel Veillard and respective authors.
-All Rights Reserved.
-
-This work (including software, documents, or other related items) is
-being provided by the copyright holders under the following license. By
-obtaining, using and/or copying this work, you (the licensee) agree
-that you have read, understood, and will comply with the following terms
-and conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-documentation, with or without modification, for any purpose and without
-fee or royalty is hereby granted, provided that you include the following
-on ALL copies of the software and documentation or portions thereof,
-including modifications, that you make:
-
- 1.The full text of this NOTICE in a location viewable to users of
- the redistributed or derivative work.
- 2.Notice of any changes or modifications to the distribution files,
- including the date changes were made. (We recommend you provide URIs
- to the location from which the code is derived.)
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION
-WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR
-OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
-OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific,
-written prior permission. Title to copyright in this software and any
-associated documentation will at all times remain with copyright holders.
-
-____________________________________
-
-This formulation is based on August 14 1998 W3C's notice and license
-This version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be distributed
-in GPL packages.
diff --git a/Makefile.am b/Makefile.am
index ef7ab876..88e821b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ dist-hook: libxslt.spec
(cd $(srcdir) ; tar -cf - --exclude CVS win32 vms) | (cd $(distdir); tar xf -)
EXTRA_DIST = xsltConf.sh.in xslt-config.in libxslt.spec libxslt.spec.in \
- FEATURES TODO COPYING.LIB Copyright IPR \
+ FEATURES TODO Copyright \
win32/libxslt/libxslt.def win32/libxslt/libxslt.dsw \
win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp
diff --git a/configure.in b/configure.in
index d4cde63e..5d872049 100644
--- a/configure.in
+++ b/configure.in
@@ -6,12 +6,12 @@ dnl libexslt is an extension
dnl
LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=0
-LIBXSLT_MICRO_VERSION=10
+LIBXSLT_MICRO_VERSION=11
PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=7
-LIBEXSLT_MICRO_VERSION=3
-LIBXML_REQUIRED_VERSION=2.4.13
+LIBEXSLT_MICRO_VERSION=4
+LIBXML_REQUIRED_VERSION=2.4.14
LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
@@ -373,6 +373,9 @@ AC_SUBST(EXTRA_LIBS)
AC_SUBST(M_LIBS)
AC_SUBST(XSLT_LIBS)
+rm -f rm COPYING.LIB COPYING
+ln -s Copyright COPYING
+
AC_OUTPUT([
Makefile
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 3b186ac8..f630e0f0 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -85,6 +85,8 @@ A:link, A:visited, A:active { text-decoration: underline }
matching this string. You really want -&gt;<code>'alpha'</code>&lt;- to
be passed to the processor. And to allow this you need to escape the
quotes at the shell level using -&gt;<code>&quot;'alpha'&quot;</code>&lt;- .</p>
+<p>or use</p>
+<p>xsltproc --stringparam test alpha foo.xsl foo.xml</p>
</li></ol>
<p><a href="mailto:daniel@veillard.com">Daniel Veillard</a></p>
</td></tr></table></td></tr></table></td></tr></table></td>
diff --git a/doc/intro.html b/doc/intro.html
index f40e9079..2e14305b 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -84,9 +84,9 @@ the <a href="http://www.w3.org/TR/xslt">XSLT</a> C library developed for the
<li>It is written in plain C, making as few assumptions as possible, and
sticking closely to ANSI C/POSIX for easy embedding. Should works on
Linux/Unix/Windows.</li>
-<li>This library is released under the <a href="http://www.gnu.org/copyleft/lesser.html">GNU LGPL</a> and a
- derivative of the W3C IPR (check the Copyright and the IPR files in the
- distribution). If you are not happy with this, drop me a mail.</li>
+<li>This library is released under the <a href="http://www.opensource.org/licenses/mit-license.html">MIT
+ Licence</a>
+</li>
<li>Though not designed primarily with performances in mind, libxslt seems
to be a relatively fast processor.</li>
</ul>
diff --git a/doc/libxslt-decl.txt b/doc/libxslt-decl.txt
index c22babf2..7a0a5e24 100644
--- a/doc/libxslt-decl.txt
+++ b/doc/libxslt-decl.txt
@@ -29,15 +29,15 @@ void
</FUNCTION>
<MACRO>
<NAME>LIBXSLT_DOTTED_VERSION</NAME>
-#define LIBXSLT_DOTTED_VERSION "1.0.10"
+#define LIBXSLT_DOTTED_VERSION "1.0.11"
</MACRO>
<MACRO>
<NAME>LIBXSLT_VERSION</NAME>
-#define LIBXSLT_VERSION 10010
+#define LIBXSLT_VERSION 10011
</MACRO>
<MACRO>
<NAME>LIBXSLT_VERSION_STRING</NAME>
-#define LIBXSLT_VERSION_STRING "10010"
+#define LIBXSLT_VERSION_STRING "10011"
</MACRO>
<MACRO>
<NAME>WITH_XSLT_DEBUG</NAME>
@@ -590,15 +590,15 @@ void *ctxt,const xmlChar *name,const xmlChar *ns_uri
</FUNCTION>
<MACRO>
<NAME>LIBXSLT_DOTTED_VERSION</NAME>
-#define LIBXSLT_DOTTED_VERSION "1.0.10"
+#define LIBXSLT_DOTTED_VERSION "1.0.11"
</MACRO>
<MACRO>
<NAME>LIBXSLT_VERSION</NAME>
-#define LIBXSLT_VERSION 10010
+#define LIBXSLT_VERSION 10011
</MACRO>
<MACRO>
<NAME>LIBXSLT_VERSION_STRING</NAME>
-#define LIBXSLT_VERSION_STRING "10010"
+#define LIBXSLT_VERSION_STRING "10011"
</MACRO>
<MACRO>
<NAME>WITH_XSLT_DEBUG</NAME>
diff --git a/doc/news.html b/doc/news.html
index f3b32dbb..eecab63b 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -75,7 +75,18 @@ A:link, A:visited, A:active { text-decoration: underline }
<td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd">
<h3>CVS only : check the <a href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
for a really accurate description</h3>
-<h3>1.0.10: Jan 14 2001</h3>
+<h3>1.0.11: Feb 8 2002</h3>
+<ul>
+<li>Change of Licence to the <a href="http://www.opensource.org/licenses/mit-license.html">MIT
+ Licence</a>
+</li>
+<li>Added a beta version of the Python bindings, including support to
+ extend the engine with functions written in Python</li>
+<li>A number of bug fixes</li>
+<li>Charlie Bozeman provided more EXSLT functions</li>
+<li>Portability fixes</li>
+</ul>
+<h3>1.0.10: Jan 14 2002</h3>
<ul>
<li>Windows fixes for Win32 from Igor</li>
<li>Fixed the Solaris compilation trouble (Albert)</li>
diff --git a/doc/xslt.html b/doc/xslt.html
index cef7e97a..4233b57c 100644
--- a/doc/xslt.html
+++ b/doc/xslt.html
@@ -48,9 +48,8 @@ the <a href="http://www.w3.org/TR/xslt">XSLT</a> C library developed for the
sticking closely to ANSI C/POSIX for easy embedding. Should works on
Linux/Unix/Windows.</li>
<li>This library is released under the <a
- href="http://www.gnu.org/copyleft/lesser.html">GNU LGPL</a> and a
- derivative of the W3C IPR (check the Copyright and the IPR files in the
- distribution). If you are not happy with this, drop me a mail.</li>
+ href="http://www.opensource.org/licenses/mit-license.html">MIT
+ Licence</a></li>
<li>Though not designed primarily with performances in mind, libxslt seems
to be a relatively fast processor.</li>
</ul>
@@ -224,6 +223,8 @@ platform, get in touch with me to upload the package. I will keep them in the
matching this string. You really want -&gt;<code>'alpha'</code>&lt;- to
be passed to the processor. And to allow this you need to escape the
quotes at the shell level using -&gt;<code>"'alpha'"</code>&lt;- .</p>
+ <p>or use</p>
+ <p>xsltproc --stringparam test alpha foo.xsl foo.xml</p>
</li>
</ol>
@@ -233,7 +234,19 @@ platform, get in touch with me to upload the package. I will keep them in the
href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
for a really accurate description</h3>
-<h3>1.0.10: Jan 14 2001</h3>
+<h3>1.0.11: Feb 8 2002</h3>
+<ul>
+ <li>Change of Licence to the <a
+ href="http://www.opensource.org/licenses/mit-license.html">MIT
+ Licence</a></li>
+ <li>Added a beta version of the Python bindings, including support to
+ extend the engine with functions written in Python</li>
+ <li>A number of bug fixes</li>
+ <li>Charlie Bozeman provided more EXSLT functions</li>
+ <li>Portability fixes</li>
+</ul>
+
+<h3>1.0.10: Jan 14 2002</h3>
<ul>
<li>Windows fixes for Win32 from Igor</li>
<li>Fixed the Solaris compilation trouble (Albert)</li>
diff --git a/libxslt.spec.in b/libxslt.spec.in
index f7690a28..6b3578c0 100644
--- a/libxslt.spec.in
+++ b/libxslt.spec.in
@@ -2,7 +2,7 @@ Summary: Library providing the Gnome XSLT engine
Name: libxslt
Version: @VERSION@
Release: 1
-Copyright: LGPL
+License: MIT
Group: Development/Libraries
Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
-%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO FEATURES
+%doc AUTHORS ChangeLog NEWS README Copyright TODO FEATURES
%doc doc/*.html doc/html doc/tutorial
%doc %{_mandir}/man1/xsltproc.1*
@@ -118,6 +118,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-, root, root)
+%doc AUTHORS ChangeLog NEWS README Copyright TODO FEATURES
%{prefix}/lib/lib*.so
%{prefix}/lib/*a
%{prefix}/lib/*.sh
@@ -127,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
%files python
%defattr(-, root, root)
+%doc AUTHORS ChangeLog NEWS README Copyright FEATURES
%{prefix}/lib/python*/site-packages/libxslt.py
%{prefix}/lib/python*/site-packages/_libxslt.so
%doc python/TODO
@@ -135,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Feb 8 2002 Daniel.Veillard <veillard@redhat.com>
+
+- added the python module
+-changed the Licence to MIT
* Sat Nov 10 2001 Daniel.Veillard <daniel@veillard.com>
diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index abddcdb0..8c3eb595 100644
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -21,21 +21,21 @@ extern "C" {
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.0.10"
+#define LIBXSLT_DOTTED_VERSION "1.0.11"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXSLT_VERSION 10010
+#define LIBXSLT_VERSION 10011
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXSLT_VERSION_STRING "10010"
+#define LIBXSLT_VERSION_STRING "10011"
/**
* WITH_XSLT_DEBUG:
diff --git a/python/generator.py b/python/generator.py
index ef857e8c..8f7332c6 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -214,9 +214,9 @@ py_types = {
'xmlChar': ('c', None, "int", "int", "libxml_"),
'unsigned char *': ('z', None, "charPtr", "char *", "libxml_"),
'char *': ('z', None, "charPtr", "char *", "libxml_"),
- 'const char *': ('z', None, "charPtr", "char *", "libxml_"),
+ 'const char *': ('z', None, "charPtrConst", "const char *", "libxml_"),
'xmlChar *': ('z', None, "xmlCharPtr", "xmlChar *", "libxml_"),
- 'const xmlChar *': ('z', None, "xmlCharPtr", "xmlChar *", "libxml_"),
+ 'const xmlChar *': ('z', None, "xmlCharPtrConst", "const xmlChar *", "libxml_"),
'xmlNodePtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr", "libxml_"),
'const xmlNodePtr': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr", "libxml_"),
'xmlNode *': ('O', "xmlNode", "xmlNodePtr", "xmlNodePtr", "libxml_"),
diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h
index fb8b79e8..77c07368 100644
--- a/python/libxml_wrap.h
+++ b/python/libxml_wrap.h
@@ -64,6 +64,8 @@ PyObject * libxml_xmlCharPtrWrap(xmlChar *str);
PyObject * libxml_constxmlCharPtrWrap(const xmlChar *str);
PyObject * libxml_charPtrWrap(char *str);
PyObject * libxml_constcharPtrWrap(const char *str);
+PyObject * libxml_charPtrConstWrap(const char *str);
+PyObject * libxml_xmlCharPtrConstWrap(const xmlChar *str);
PyObject * libxml_xmlDocPtrWrap(xmlDocPtr doc);
PyObject * libxml_xmlNodePtrWrap(xmlNodePtr node);
PyObject * libxml_xmlAttrPtrWrap(xmlAttrPtr attr);
diff --git a/python/libxslt-python-api.xml b/python/libxslt-python-api.xml
index 69621925..b3f18d8e 100644
--- a/python/libxslt-python-api.xml
+++ b/python/libxslt-python-api.xml
@@ -23,46 +23,19 @@
<info>Cleanup all libxslt and libxml2 memory allocated</info>
<return type='void'/>
</function>
+ <!-- xmlXPathParserContextPtr accessors -->
<function name='xsltXPathParserGetContext' file='python_accessor'>
<info>Get the xpathContext from an xpathParserContext</info>
<return type='xmlXPathContextPtr' info="The XPath context" field="context"/>
<arg name='ctxt' type='xmlXPathParserContextPtr' info='the XPath parser context'/>
</function>
- <function name='xsltXPathGetContextDoc' file='python_accessor'>
- <info>Get the doc from an xpathContext</info>
- <return type='xmlDocPtr' info="The doc context" field="doc"/>
- <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
- </function>
- <function name='xsltXPathGetContextNode' file='python_accessor'>
- <info>Get the current node from an xpathContext</info>
- <return type='xmlNodePtr' info="The node context" field="node"/>
- <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
- </function>
- <function name='xsltXPathGetContextPosition' file='python_accessor'>
- <info>Get the current node from an xpathContext</info>
- <return type='int' info="The node context" field="proximityPosition"/>
- <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
- </function>
- <function name='xsltXPathGetContextSize' file='python_accessor'>
- <info>Get the current node from an xpathContext</info>
- <return type='int' info="The node context" field="contextSize"/>
- <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
- </function>
- <function name='xsltXPathGetFunction' file='python_accessor'>
- <info>Get the current function name xpathContext</info>
- <return type='const xmlChar *' info="The function name" field="function"/>
- <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
- </function>
- <function name='xsltXPathGetFunctionURI' file='python_accessor'>
- <info>Get the current function name URI xpathContext</info>
- <return type='const xmlChar *' info="The function name URI" field="functionURI"/>
- <arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
- </function>
+ <!-- xmlXPathContextPtr accessors -->
<function name='xsltXPathGetTransformContext' file='python_accessor'>
<info>Get the transformation context from an xpathContext</info>
<return type='xsltTransformContextPtr' info="The node context" field="extra"/>
<arg name='ctxt' type='xmlXPathContextPtr' info='the XPath context'/>
</function>
+ <!-- xsltTransformContextPtr accessors -->
<function name='xsltTransformGetStyle' file='python_accessor'>
<info>Get the stylesheet from a transformation</info>
<return type='xsltStylesheetPtr' info="The stylesheet" field="style"/>
@@ -119,6 +92,7 @@
<arg name='ctxt' type='xsltTransformContextPtr' info='the transformation context'/>
<arg name='_private' type='pythonObject *' info='The private field'/>
</function>
+ <!-- xsltStylesheetPtr accessors -->
<function name='xsltStylesheetGetParent' file='python_accessor'>
<info>Get the parent of a stylesheet</info>
<return type='xsltStylesheetPtr' info="The parent" field="parent"/>
@@ -180,21 +154,5 @@
<arg name='style' type='xsltStylesheetPtr' info='the stylesheet'/>
<arg name='_private' type='pythonObject *' info='The private field'/>
</function>
- <!--
- <function name='xsltRegisterXPathFunction' file='python'>
- <info>Register a Python written function to the XPath interpreter</info>
- <return type='int' info="1 in case of success, 0 or -1 in case of error"/>
- <arg name='ctx' type='xmlXPathContextPtr' info='the xpathContext'/>
- <arg name='name' type='xmlChar *' info='the function name'/>
- <arg name='ns_uri' type='xmlChar *' info='the namespace or NULL'/>
- <arg name='f' type='pythonObject' info='the python function'/>
- </function>
- <function name='xsltRegisterErrorHandler' file='python'>
- <info>Register a Python written function to for error reporting. The function is called back as f(ctx, error).</info>
- <return type='int' info="1 in case of success, 0 or -1 in case of error"/>
- <arg name='f' type='pythonObject' info='the python function'/>
- <arg name='ctx' type='pythonObject' info='a context for the callback'/>
- </function>
- -->
</symbols>
</api>
diff --git a/python/libxsltclass.txt b/python/libxsltclass.txt
index abc5cd99..e359b1d7 100644
--- a/python/libxsltclass.txt
+++ b/python/libxsltclass.txt
@@ -65,12 +65,6 @@ Class xpathParserContext(libxml2.xpathParserContext)
Class xpathContext(libxml2.xpathContext)
# accessors
- contextDoc()
- contextNode()
- contextPosition()
- contextSize()
- function()
- functionURI()
transformContext()
# functions from module functions
diff --git a/python/tests/extfunc.py b/python/tests/extfunc.py
index c8f2fe24..fcf636d5 100755
--- a/python/tests/extfunc.py
+++ b/python/tests/extfunc.py
@@ -1,5 +1,6 @@
#!/usr/bin/python -u
import sys
+import string
import libxml2
import libxslt
@@ -22,7 +23,6 @@ def f(ctx, str):
except:
pass
- import string
return string.upper(str)
libxslt.registerExtModuleFunction("foo", "http://example.com/foo", f)
@@ -54,6 +54,7 @@ if root.content != "SUCCESS":
sys.exit(1)
if nodeName != 'article':
print "The function callback failed to access its context"
+ sys.exit(1)
result.freeDoc()