Merge 2.6.3
authorClaudio Luck <claudio.luck@pep.foundation>
Thu, 19 Mar 2020 16:47:39 +0100
changeset 65 d659b8c2ed22
parent 62 00a196f8d14a (diff)
parent 64 4e4782144f4f (current diff)
child 66 701c5e980f33
Merge 2.6.3
.hgignore
MANIFEST.in
Makefile
setup.cfg
setup.py
yml2/__init__.py
yml2/backend.py
yml2/pyPEG.py
yml2/yslt.yml2
yml2c
yml2proc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/COPYING.txt	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, 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 software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, 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 redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+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 give any other recipients of the Program a copy of this License
+along with the Program.
+
+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 Program or any portion
+of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+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 Program, 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 Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) 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; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, 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 executable.  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.
+
+If distribution of executable or 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 counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program 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.
+
+  5. 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 Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program 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.
+
+  7. 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 Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program 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 Program.
+
+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.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program 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.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the 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 Program
+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 Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, 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
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE.txt	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,1 @@
+See COPTING.txt
--- a/MANIFEST.in	Thu Mar 19 15:20:28 2020 +0100
+++ b/MANIFEST.in	Thu Mar 19 16:47:39 2020 +0100
@@ -8,7 +8,9 @@
 include Makefile
 include *.yhtml2
 include format.css
-include gpl-2.0.txt
+include COPYING.txt
+include README.rst
+include README.md
 
 include samples/*
 include vim/syntax/*
--- a/Makefile	Thu Mar 19 15:20:28 2020 +0100
+++ b/Makefile	Thu Mar 19 16:47:39 2020 +0100
@@ -1,32 +1,49 @@
-YML_PATH=
-YML2C=yml2c
-PKGVER=$(shell python setup.py -V)
+YML_PATH  =
+DEBVER   := 1
+PYTHON   := python3
+PKGVER    = $(shell $(PYTHON) setup.py -V)
+TWINE    := $(PYTHON) -m twine
+YML2C     = $(PYTHON) yml2c
 
 all: homepage
 
 homepage: index.html features.html yslt.html toolchain.html programming.html hello.html
 
-update: homepage format.css gpl-2.0.txt
-	rsync -avC *.html *.yml2 format.css *.yhtml2 gpl-2.0.txt samples dragon:fdik.org/yml2/
+update: homepage format.css COPYING.txt
+	rsync -avC *.html *.yml2 format.css *.yhtml2 COPYING.txt samples dragon:fdik.org/yml2/
 
 update-all: update yml2c yml2.py pyPEG.py backend.py yml2proc
 	if test -z $(VERSION) ; then echo VERSION not set ; exit 1 ; fi
 	rsync -avC *.py yml2 yml2c Makefile yml2proc xml2yml.ysl2 standardlib.ysl2 samples dragon:fdik.org/yml2/
-	ssh dragon bash -c "cd ; cd fdik.org/; tar cvjf yml-$(VERSION).tar.bz2 yml2/{*.py,*.yml2,*.yhtml2,format.css,gpl-2.0.txt,yml2,yml2c,Makefile,yml2proc,xml2yml.ysl2,standardlib.ysl2,samples} ; rm yml2.tar.bz2 ; ln -s yml-$(VERSION).tar.bz2 yml2.tar.bz2"
+	ssh dragon bash -c "cd ; cd fdik.org/; tar cvjf yml-$(VERSION).tar.bz2 yml2/{*.py,*.yml2,*.yhtml2,format.css,COPYING.txt,yml2,yml2c,Makefile,yml2proc,xml2yml.ysl2,standardlib.ysl2,samples} ; rm yml2.tar.bz2 ; ln -s yml-$(VERSION).tar.bz2 yml2.tar.bz2"
 
 %.html: %.en.yhtml2 heading.en.yhtml2 homepage.en.yhtml2
 	$(YML2C) $< -o $@
 
+.PHONY: deb
+deb:  YML2_$(PKGVER).orig.tar.gz python-yml2_$(PKGVER)-$(DEBVER)_all.deb
+
+YML2_$(PKGVER).orig.tar.gz:
+	python setup.py sdist
+	mv -f dist/YML2-$(PKGVER).tar.gz YML2_$(PKGVER).orig.tar.gz
+
+python-yml2_$(PKGVER)-$(DEBVER)_all.deb:
+	$(PYTHON) setup.py --command-packages=stdeb.command bdist_deb
+	mv -f deb_dist/python-yml2_$(PKGVER)-$(DEBVER)_all.deb .
+
 clean:
 	rm -f *.html *.pyc *.pyo */*.pyc */*.pyo
 	rm -rf *.egg-info
+	rm -f YML2_$(PKGVER).orig.tar.gz
+	rm -f python-yml2_$(PKGVER)-$(DEBVER)_all.deb
 
+.PHONY: dist dist/YML2-$(PKGVER).tar.gz
+dist: dist/YML2-$(PKGVER).tar.gz
+	$(TWINE) check $<
 
-dist: dist/yml-$(PKGVER).tar.gz
-
-dist/yml-$(PKGVER).tar.gz:
-	python setup.py sdist
+dist/YML2-$(PKGVER).tar.gz:
+	$(PYTHON) setup.py sdist
 
 install:
 	pip install .
-	rm setup.py
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.rst	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,10 @@
+************
+What is YML?
+************
+
+Well, it's the idea not to need to define a grammar first when you want to use a Domain Specific Language. For that purpose, YML is being translated into XML. Let's make an example.
+
+Everything which comes close to a C like language, parses without a grammar definition.
+
+Please see README.md for more information.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/changelog	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,5 @@
+yml2 (5.8-1) unstable; urgency=low
+
+  * source package automatically created by stdeb 0.8.5
+
+ -- Volker Birk <vb@pep.foundation>  Tue, 04 Sep 2018 17:29:10 +0200
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/compat	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,1 @@
+9
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/control	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,18 @@
+Source: yml2
+Maintainer: Volker Birk <vb@pep.foundation>
+Section: python
+Priority: optional
+Build-Depends: dh-python, python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9)
+Standards-Version: 3.9.6
+Homepage: https://pep.foundation/dev/repos/yml2
+
+Package: python-yml2
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: YML 2 compiler
+ .
+ YML2 caters the idea not to need to define a grammar first when you want to
+ use a Domain Specific Language. For that purpose, YML is being translated into
+ XML. Let's make an example.
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/rules	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+# This file was automatically generated by stdeb 0.8.5 at
+# Tue, 04 Sep 2018 17:29:10 +0200
+export PYBUILD_NAME=yml2
+%:
+	dh $@ --with python2 --buildsystem=pybuild
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/format	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,1 @@
+3.0 (quilt)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/watch	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,4 @@
+# please also check http://pypi.debian.net/YML2/watch
+version=3
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/YML2/YML2-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file
--- a/gpl-2.0.txt	Thu Mar 19 15:20:28 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, 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 software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, 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 redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-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 give any other recipients of the Program a copy of this License
-along with the Program.
-
-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 Program or any portion
-of it, thus forming a work based on the Program, 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) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-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 Program, 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 Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) 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; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, 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 executable.  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.
-
-If distribution of executable or 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 counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program 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.
-
-  5. 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 Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program 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.
-
-  7. 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 Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program 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 Program.
-
-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.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program 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.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-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 Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, 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
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. 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 PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  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 program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/manpage.yml2	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,1 @@
+decl manpage(xmlns="http://docbook.org/ns/docbook", version="5.0", *title) alias article { title *title; content; };
--- a/setup.cfg	Thu Mar 19 15:20:28 2020 +0100
+++ b/setup.cfg	Thu Mar 19 16:47:39 2020 +0100
@@ -3,12 +3,13 @@
 
 [metadata]
 name         = yml2
-version      = 2.6.3
+version      = 2.6.4
 author	     = Volker Birk
 author_email = vb@pep-project.org
 url	     = https://pep.foundation/dev/repos/yml2/
-license	     = GPL v2
-license_file = gpl-2.0.txt
+license	     = GPL-2.0
+license_file = COPYING.txt
+description-file = README.rst
 
 [options]
 packages = yml2
@@ -18,3 +19,4 @@
 include_package_data = True
 zip_safe = False
 install_requires = lxml
+
--- a/setup.py	Thu Mar 19 15:20:28 2020 +0100
+++ b/setup.py	Thu Mar 19 16:47:39 2020 +0100
@@ -1,6 +1,29 @@
+# -*- coding: utf-8 -*-
 
 from setuptools import setup, find_packages
 
+with open('README.rst', 'r', encoding='utf-8') as f:
+    long_description = f.read()
+
 setup(
     setup_requires = ["setuptools >= 30.3.0"],  # release 2016-12-06
+    long_description=long_description,
+    entry_points = {
+        'console_scripts': [
+            'yml2c=yml2.yml2c:main',
+            'yml2proc=yml2.yml2proc:main'
+        ],
+    },
+    classifiers=[
+      'Development Status :: 5 - Production/Stable',
+      'Intended Audience :: Developers',
+      'Environment :: Console',
+      'Topic :: Software Development :: Build Tools',
+      'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
+      'Programming Language :: Python :: 3',
+      'Programming Language :: Python :: 3.4',
+      'Programming Language :: Python :: 3.5',
+      'Programming Language :: Python :: 3.6',
+    ],
 )
+
--- a/yml2/__init__.py	Thu Mar 19 15:20:28 2020 +0100
+++ b/yml2/__init__.py	Thu Mar 19 16:47:39 2020 +0100
@@ -1,109 +0,0 @@
-# YML 2.6.0 language definition
-
-# written by VB.
-
-import re
-from .pyPEG import keyword, _and, _not
-
-# pyPEG:
-#
-#   basestring:     terminal symbol (characters)
-#   keyword:        terminal symbol (keyword)
-#   matchobj:       terminal symbols (regex, use for scanning symbols)
-#   function:       named non-terminal symbol, recursive definition
-#                   if you don't want naming in output, precede name with an underscore
-#   tuple:          production sequence
-#   integer:        count in production sequence:
-#                    0: following element is optional
-#                   -1: following element can be omitted or repeated endless
-#                   -2: following element is required and can be repeated endless
-#   list:           options, choose one of them
-#   _not:           next element in production sequence is matched only if this would not
-#   _and:           next element in production sequence is matched only if this would, too
-
-newSyntax = True
-
-def oldSyntax():
-    global newSyntax
-    newSyntax = False
-
-def _if(cond, val):
-    if cond:
-        return val
-    else:
-        return ()
-
-def listing(x):     return x, -1, (",", x)
-r = re.compile
-
-comment = [r(r"//.*"), r(r"/\*.*?\*/", re.S)]
-_symbol = r"(?=\D)\w(\w|:)*"
-symbol = r(_symbol, re.U)
-pointer = r(r"\*" + _symbol, re.U)
-ppointer = r(r"\*\*" + _symbol, re.U)
-macro = r(r"\%" + _symbol, re.U)
-reference = r(r"\&" + _symbol, re.U)
-
-NameStartChar = r''':|[A-Z]|_|[a-z]|[\u00C0-\u00D6]|[\u00D8-\u00F6]|[\u00F8-\u02FF]|[\u0370-\u037D]|[\u037F-\u1FFF]|[\u200C-\u200D]|[\u2070-\u218F]|[\u2C00-\u2FEF]|[\u3001-\uD7FF]|[\uF900-\uFDCF]|[\uFDF0-\uFFFD]'''
-NameChar = NameStartChar + r'''|-|\.|[0-9]|\u00B7|[\u0300-\u036F]|[\u203F-\u2040]'''
-
-_xmlSymbol = "(" + NameStartChar + ")(" + NameChar + ")*"
-xmlSymbol = r(_xmlSymbol)
-aliasSymbol = r(r"-|(" + _xmlSymbol + r")")
-
-literal = [r(r'""".*?"""', re.S), r(r"'''.*?'''", re.S), r(r"""0x[a-f0-9]+|-?\d+\.\d*|-?\.\d+|-?\d+|".*?"|'.*?'""")]
-filename = [("'", r(r"[^']*"), "'"), ('"', r(r'[^"]*'), '"'), r(r"[^\s;]+")]
-ws = r(r"\s+", re.U)
-
-def pyExp():        return "!", r(r"(!=|\\!|[^!])+"), "!"
-value = [literal, pyExp]
-
-def tagQuote():     return r(r"\].*|\<.*?\>")
-def lineQuote():    return r(r"\|.*")
-def quote():        return [r(r"\d*>.*"), (literal, 0, [";", "."])]
-def parm():         return [([xmlSymbol, pyExp, pointer, macro], "=", [value, pointer, symbol]), value, pointer]
-def parm_eq():      return [xmlSymbol, pyExp, pointer, macro], "=", [value, pointer, symbol]
-parm_eq.__name__ = "parm"
-_func = [symbol, ppointer, pointer, reference], _if(newSyntax, (-1, ("[", listing(parm), "]"))), 0, ("(", listing(parm), ")"), 0, listing(parm), -1, parm_eq
-def pythonCall():   return keyword("python"), _func, [";", "."]
-def declParm():     return [pointer, macro, xmlSymbol], 0, ("=", [literal, symbol])
-def alias():        return keyword("alias"), aliasSymbol
-def descend():      return r(r"[+@*]" + _symbol, re.U)
-def base():         return keyword("is"), symbol
-def shape():        return symbol
-def decl():         return symbol, 0, base, 0, ("<", listing(shape), ">"), -1, descend, _if(newSyntax, (-1, ("[", 0, listing(declParm), "]"))), 0, ("(", 0, listing(declParm), ")"), 0, alias, 0, content
-def python():       return [r(r"!!.*?!!", re.S), r(r"!.*")]
-def operator():     return 0, keyword("define"), keyword("operator"), literal, keyword("as"), r(r".*")
-def constant():     return 0, keyword("define"), [pointer, symbol], "=", literal, 0, [";", "."]
-def in_ns():        return keyword("in"), xmlSymbol, [_decl, ("{", -2, _decl, "}")]
-_decl = keyword("decl"), listing(decl), [";", "."]
-def textsection():  return r(r'(\|\|(\>*)(.*?)\|\|(\>*))\s*$', re.S | re.M)
-def textsectionu(): return r(r'(\>\>.*?\>\>)', re.S)
-def include():      return keyword("include"), 0, reverse, 0, [ktext, kxml], filename, 0, [";", "."]
-def func():         return _func, 0, content
-def funclist():     return listing(func)
-_cmd = funclist, 0, [";", "."]
-_inner = [include, textsection, textsectionu, pythonCall, _cmd, quote, lineQuote, tagQuote, pyExp]
-_cc = "{", -1, _inner, "}"
-def content_plain(): return [ (_l, 0, _p, 0, _b, 0, _cc), (_p, 0, _b, 0, _cc), (_b, 0, _cc), _cc ]
-content_plain.__name__ = "content"
-def func_plain():   return _func, 0, content_plain
-func_plain.__name__ = "func"
-def flist_plain():  return -2, func_plain
-flist_plain.__name__ = "funclist"
-def xbase():        return flist_plain
-def generic():      return flist_plain
-def subscript():    return flist_plain
-def parentheses():  return "(", 0, funclist, ")"
-def fparm():        return flist_plain
-
-_l = _if(newSyntax, ("<", listing(generic), ">"))
-_p = _if(not newSyntax, parentheses), _if(newSyntax, ("(", 0, listing(fparm), ")"))
-_b = (":", listing(xbase))
-_c = [_inner, _cc]
-
-def content():      return [ (_l, 0, _p, 0, _b, 0, _c), (_p, 0, _b, 0, _c), (_b, 0, _c), _c ]
-def reverse():      return keyword("reverse")
-def ktext():        return keyword("text")
-def kxml():         return keyword("xml")
-def ymlCStyle():    return -1, [_decl, in_ns, include, python, operator, constant, tagQuote, lineQuote, quote, _cmd]
--- a/yml2/backend.py	Thu Mar 19 15:20:28 2020 +0100
+++ b/yml2/backend.py	Thu Mar 19 16:47:39 2020 +0100
@@ -8,8 +8,8 @@
 from xml.sax.saxutils import escape, quoteattr
 from copy import copy, deepcopy
 from glob import glob
-from .pyPEG import code, parse, parseLine, u, Symbol
-from . import ymlCStyle, comment, _inner
+from yml2.pyPEG import code, parse, parseLine, u, Symbol
+from yml2.yml2 import ymlCStyle, comment, _inner
 
 ymlFunc, pointers, pythonFunc = {}, {}, {}
 in_ns = ""
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/yml2/yml2.py	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,109 @@
+# YML 2.6.0 language definition
+
+# written by VB.
+
+import re
+from yml2.pyPEG import keyword, _and, _not
+
+# pyPEG:
+#
+#   basestring:     terminal symbol (characters)
+#   keyword:        terminal symbol (keyword)
+#   matchobj:       terminal symbols (regex, use for scanning symbols)
+#   function:       named non-terminal symbol, recursive definition
+#                   if you don't want naming in output, precede name with an underscore
+#   tuple:          production sequence
+#   integer:        count in production sequence:
+#                    0: following element is optional
+#                   -1: following element can be omitted or repeated endless
+#                   -2: following element is required and can be repeated endless
+#   list:           options, choose one of them
+#   _not:           next element in production sequence is matched only if this would not
+#   _and:           next element in production sequence is matched only if this would, too
+
+newSyntax = True
+
+def oldSyntax():
+    global newSyntax
+    newSyntax = False
+
+def _if(cond, val):
+    if cond:
+        return val
+    else:
+        return ()
+
+def listing(x):     return x, -1, (",", x)
+r = re.compile
+
+comment = [r(r"//.*"), r(r"/\*.*?\*/", re.S)]
+_symbol = r"(?=\D)\w(\w|:)*"
+symbol = r(_symbol, re.U)
+pointer = r(r"\*" + _symbol, re.U)
+ppointer = r(r"\*\*" + _symbol, re.U)
+macro = r(r"\%" + _symbol, re.U)
+reference = r(r"\&" + _symbol, re.U)
+
+NameStartChar = r''':|[A-Z]|_|[a-z]|[\u00C0-\u00D6]|[\u00D8-\u00F6]|[\u00F8-\u02FF]|[\u0370-\u037D]|[\u037F-\u1FFF]|[\u200C-\u200D]|[\u2070-\u218F]|[\u2C00-\u2FEF]|[\u3001-\uD7FF]|[\uF900-\uFDCF]|[\uFDF0-\uFFFD]'''
+NameChar = NameStartChar + r'''|-|\.|[0-9]|\u00B7|[\u0300-\u036F]|[\u203F-\u2040]'''
+
+_xmlSymbol = "(" + NameStartChar + ")(" + NameChar + ")*"
+xmlSymbol = r(_xmlSymbol)
+aliasSymbol = r(r"-|(" + _xmlSymbol + r")")
+
+literal = [r(r'""".*?"""', re.S), r(r"'''.*?'''", re.S), r(r"""0x[a-f0-9]+|-?\d+\.\d*|-?\.\d+|-?\d+|".*?"|'.*?'""")]
+filename = [("'", r(r"[^']*"), "'"), ('"', r(r'[^"]*'), '"'), r(r"[^\s;]+")]
+ws = r(r"\s+", re.U)
+
+def pyExp():        return "!", r(r"(!=|\\!|[^!])+"), "!"
+value = [literal, pyExp]
+
+def tagQuote():     return r(r"\].*|\<.*?\>")
+def lineQuote():    return r(r"\|.*")
+def quote():        return [r(r"\d*>.*"), (literal, 0, [";", "."])]
+def parm():         return [([xmlSymbol, pyExp, pointer, macro], "=", [value, pointer, symbol]), value, pointer]
+def parm_eq():      return [xmlSymbol, pyExp, pointer, macro], "=", [value, pointer, symbol]
+parm_eq.__name__ = "parm"
+_func = [symbol, ppointer, pointer, reference], _if(newSyntax, (-1, ("[", listing(parm), "]"))), 0, ("(", listing(parm), ")"), 0, listing(parm), -1, parm_eq
+def pythonCall():   return keyword("python"), _func, [";", "."]
+def declParm():     return [pointer, macro, xmlSymbol], 0, ("=", [literal, symbol])
+def alias():        return keyword("alias"), aliasSymbol
+def descend():      return r(r"[+@*]" + _symbol, re.U)
+def base():         return keyword("is"), symbol
+def shape():        return symbol
+def decl():         return symbol, 0, base, 0, ("<", listing(shape), ">"), -1, descend, _if(newSyntax, (-1, ("[", 0, listing(declParm), "]"))), 0, ("(", 0, listing(declParm), ")"), 0, alias, 0, content
+def python():       return [r(r"!!.*?!!", re.S), r(r"!.*")]
+def operator():     return 0, keyword("define"), keyword("operator"), literal, keyword("as"), r(r".*")
+def constant():     return 0, keyword("define"), [pointer, symbol], "=", literal, 0, [";", "."]
+def in_ns():        return keyword("in"), xmlSymbol, [_decl, ("{", -2, _decl, "}")]
+_decl = keyword("decl"), listing(decl), [";", "."]
+def textsection():  return r(r'(\|\|(\>*)(.*?)\|\|(\>*))\s*$', re.S | re.M)
+def textsectionu(): return r(r'(\>\>.*?\>\>)', re.S)
+def include():      return keyword("include"), 0, reverse, 0, [ktext, kxml], filename, 0, [";", "."]
+def func():         return _func, 0, content
+def funclist():     return listing(func)
+_cmd = funclist, 0, [";", "."]
+_inner = [include, textsection, textsectionu, pythonCall, _cmd, quote, lineQuote, tagQuote, pyExp]
+_cc = "{", -1, _inner, "}"
+def content_plain(): return [ (_l, 0, _p, 0, _b, 0, _cc), (_p, 0, _b, 0, _cc), (_b, 0, _cc), _cc ]
+content_plain.__name__ = "content"
+def func_plain():   return _func, 0, content_plain
+func_plain.__name__ = "func"
+def flist_plain():  return -2, func_plain
+flist_plain.__name__ = "funclist"
+def xbase():        return flist_plain
+def generic():      return flist_plain
+def subscript():    return flist_plain
+def parentheses():  return "(", 0, funclist, ")"
+def fparm():        return flist_plain
+
+_l = _if(newSyntax, ("<", listing(generic), ">"))
+_p = _if(not newSyntax, parentheses), _if(newSyntax, ("(", 0, listing(fparm), ")"))
+_b = (":", listing(xbase))
+_c = [_inner, _cc]
+
+def content():      return [ (_l, 0, _p, 0, _b, 0, _c), (_p, 0, _b, 0, _c), (_b, 0, _c), _c ]
+def reverse():      return keyword("reverse")
+def ktext():        return keyword("text")
+def kxml():         return keyword("xml")
+def ymlCStyle():    return -1, [_decl, in_ns, include, python, operator, constant, tagQuote, lineQuote, quote, _cmd]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/yml2/yml2c.py	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# vim: set fileencoding=utf-8 :
+
+"""\
+YML 2 compiler version 6.2
+Copyleft (c), 2009-2020, Volker Birk  http://fdik.org/yml/
+
+"""
+
+import sys, os, codecs, locale
+import fileinput, unicodedata
+from optparse import OptionParser
+
+if __name__ == "__main__":
+    sys.path.insert(0, os.path.dirname(__file__))
+
+from yml2.pyPEG import parse, u
+from yml2.yml2 import ymlCStyle, comment, oldSyntax
+import yml2.backend as backend
+
+YML_DEFAULT_PATH = [os.path.dirname(backend.__file__)]
+
+def printInfo(option, opt_str, value, parser):
+    sys.stdout.write(__doc__)
+    sys.exit(0)
+
+def w(msg):
+    if isinstance(msg, BaseException):
+        msg = str(msg) + "\n"
+    if type(msg) is bytes:
+        msg = codecs.encode(msg, sys.stderr.encoding)
+    sys.stderr.write(msg)
+
+def main():
+    optParser = OptionParser()
+    optParser.add_option("-C", "--old-syntax", action="store_true", dest="old_syntax",
+            help="syntax of YML 2 version 1.x (compatibility mode)", default=False)
+    optParser.add_option("-D", "--emit-linenumbers", action="store_true", dest="emitlinenumbers",
+            help="emit line numbers into the resulting XML for debugging purposes", default=False)
+    optParser.add_option("-E", "--encoding", dest="encoding", metavar="ENCODING", default=locale.getdefaultlocale()[1],
+            help="encoding of input files (default to locale)")
+    optParser.add_option("-I", "--include", dest="includePathText", metavar="INCLUDE_PATH",
+            help="precede YML_PATH by a colon separated INCLUDE_PATH to search for include files")
+    optParser.add_option("-m", "--omit-empty-parm-tags", action="store_true", dest="omitemptyparm",
+            help="does nothing (only there for compatibility reasons)", default=False)
+    optParser.add_option("-n", "--normalization", dest="normalization", metavar="NORMALIZATION", default="NFC",
+            help="Unicode normalization (none, NFD, NFKD, NFC, NFKC, FCD, default is NFC)")
+    optParser.add_option("-o", "--output", dest="outputFile", metavar="FILE",
+            help="place output in file FILE")
+    optParser.add_option("-p", "--parse-only", action="store_true", dest="parseonly",
+            help="parse only, then output pyAST as text to stdout", default=False)
+    optParser.add_option("-V", "--version", action="callback", callback=printInfo, help="show version info")
+    (options, args) = optParser.parse_args()
+
+    if options.old_syntax:
+        oldSyntax()
+
+    if options.emitlinenumbers:
+        backend.emitlinenumbers = True
+
+    backend.encoding = options.encoding
+
+    try:
+        if options.includePathText:
+            backend.includePath = options.includePathText.split(':')
+
+        dirs = os.environ.get('YML_PATH', '.').split(':') + YML_DEFAULT_PATH
+        backend.includePath.extend(dirs)
+
+        files = fileinput.input(args, mode="rU", openhook=fileinput.hook_encoded(options.encoding))
+
+        ymlC = ymlCStyle()
+        result = parse(ymlC, files, True, comment, packrat=True)
+
+        if options.parseonly:
+            print(result)
+        else:
+            result = backend.finish(result)
+            if options.normalization != "none":
+                result = unicodedata.normalize(options.normalization, result)
+
+            if options.outputFile and options.outputFile != "-":
+                outfile = open(options.outputFile, "wb")
+                outfile.write(codecs.encode(result, options.encoding))
+                outfile.close()
+            else:
+                sys.stdout.buffer.write(codecs.encode(result, options.encoding))
+                print()
+
+    except KeyboardInterrupt:
+        w("\n")
+        sys.exit(1)
+    except KeyError as msg:
+        w("not found: " + u(msg) + "\n")
+        sys.exit(4)
+    except LookupError as msg:
+        w("not found: " + u(msg) + "\n")
+        sys.exit(4)
+    except Exception as msg:
+        w(msg)
+        sys.exit(5)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/yml2/yml2proc.py	Thu Mar 19 16:47:39 2020 +0100
@@ -0,0 +1,252 @@
+#!/usr/bin/env python3
+# vim: set fileencoding=utf-8 :
+
+"""\
+YML/YSLT 2 processor version 6.2
+Copyleft (c), 2009-2020 Volker Birk  http://fdik.org/yml/
+
+"""
+
+import sys, os, codecs, locale
+import fileinput, unicodedata
+from optparse import OptionParser
+
+try:
+    from lxml import etree
+except:
+    sys.stderr.write("This program needs lxml, see http://codespeak.net/lxml/\n")
+    sys.exit(1)
+
+if __name__ == "__main__":
+    sys.path.insert(0, os.path.dirname(__file__))
+
+from yml2.yml2 import ymlCStyle, comment, oldSyntax
+from yml2.pyPEG import parse, u
+import yml2.backend as backend
+
+YML_DEFAULT_PATH = [os.path.dirname(backend.__file__)]
+
+def printInfo(option, opt_str, value, parser):
+    sys.stdout.write(__doc__)
+    sys.exit(0)
+
+class YMLAssert(Exception): pass
+
+def w(msg):
+    if isinstance(msg, BaseException):
+        try:
+            msg = str(msg) + "\n"
+        except:
+            msg = u(msg) + "\n"
+    sys.stderr.write(msg)
+
+def main():
+    optParser = OptionParser()
+    optParser.add_option("-C", "--old-syntax", action="store_true", dest="old_syntax",
+            help="syntax of YML 2 version 1.x (compatibility mode)", default=False)
+    optParser.add_option("-D", "--emit-linenumbers", action="store_true", dest="emitlinenumbers",
+            help="emit line numbers into the resulting XML for debugging purposes", default=False)
+    optParser.add_option("--debug", action="store_true", dest="trace",
+            help="switch on tracing to stderr", default=False)
+    optParser.add_option("-d", "--paramdict", dest="params", metavar="PARAMS",
+            help="call X/YSLT script with dictionary PARAMS as parameters")
+    optParser.add_option("-e", "--xpath", dest="xpath", metavar="XPATH",
+            help="execute XPath expression XPATH and print result")
+    optParser.add_option("-E", "--encoding", dest="encoding", metavar="ENCODING", default=locale.getdefaultlocale()[1],
+            help="encoding of input files (default to locale)")
+    optParser.add_option("-I", "--include", dest="includePathText", metavar="INCLUDE_PATH",
+            help="precede YML_PATH by a colon separated INCLUDE_PATH to search for include files")
+    optParser.add_option("-m", "--omit-empty-parm-tags", action="store_true", dest="omitemptyparm",
+            help="does nothing (only there for compatibility reasons)", default=False)
+    optParser.add_option("-M", "--empty-input-document", action="store_true", dest="emptyinput",
+            help="use an empty input document", default=False)
+    optParser.add_option("-n", "--normalization", dest="normalization", metavar="NORMALIZATION", default="NFC",
+            help="Unicode normalization (none, NFD, NFKD, NFC, NFKC, FCD, default is NFC)")
+    optParser.add_option("-o", "--output", dest="outputFile", metavar="FILE",
+            help="place output in file FILE")
+    optParser.add_option("-p", "--parse-only", action="store_true", dest="parseonly",
+            help="parse only, then output pyAST as text to stdout", default=False)
+    optParser.add_option("-P", "--pretty", action="store_true", default=False,
+            help="pretty print output adding whitespace")
+    optParser.add_option("-s", "--stringparamdict", dest="stringparams", metavar="STRINGPARAMS",
+            help="call X/YSLT script with dictionary STRINGPARAMS as string parameters")
+    optParser.add_option("-x", "--xml", action="store_true", default=False,
+            help="input document is XML already")
+    optParser.add_option("-X", "--xslt", dest="xslt", metavar="XSLTSCRIPT",
+            help="execute XSLT script XSLTSCRIPT")
+    optParser.add_option("-y", "--yslt", dest="yslt", metavar="YSLTSCRIPT",
+            help="execute YSLT script YSLTSCRIPT")
+    optParser.add_option("-Y", "--xml2yml", action="store_true", default=False,
+            help="convert XML to normalized YML code")
+    optParser.add_option("-V", "--version", action="callback", callback=printInfo, help="show version info and exit")
+    (options, args) = optParser.parse_args()
+
+    if options.old_syntax:
+        oldSyntax()
+
+    if options.trace:
+        backend.enable_tracing = True
+
+    if options.emitlinenumbers:
+        backend.emitlinenumbers = True
+
+    if options.includePathText:
+        backend.includePath = options.includePathText.split(':')
+
+    backend.encoding = options.encoding
+
+    dirs = os.environ.get('YML_PATH', '.').split(':') + YML_DEFAULT_PATH
+    backend.includePath.extend(dirs)
+
+    if options.xml2yml:
+        for directory in backend.includePath:
+            name = os.path.join(directory, "xml2yml.ysl2")
+            if os.path.isfile(name):
+                options.yslt = name
+                options.xml = True
+                break
+        else:
+            sys.stderr.write("Error: Stylesheet xml2yml.ysl2 required for --xml2yml not found\n")
+            sys.stderr.write("Please check your YML_PATH\n")
+            sys.exit(1)
+
+    if  (options.xslt and options.yslt) or (options.xslt and options.xpath) or (options.yslt and options.xpath):
+        sys.stderr.write("Cannot combine --xpath, --xslt and --yslt params\n")
+        sys.exit(1)
+
+    try:
+        ymlC = ymlCStyle()
+
+        rtext = ""
+
+        if not options.emptyinput:
+            files = fileinput.input(args, mode="rU", openhook=fileinput.hook_encoded(options.encoding))
+
+            if options.xml:
+                rtext = ""
+                for line in files:
+                    rtext += line
+            else:
+                result = parse(ymlC, files, True, comment)
+                if options.parseonly:
+                    print(result)
+                    sys.exit(0)
+                else:
+                    rtext = backend.finish(result)
+
+        if not rtext:
+            rtext = "<empty/>"
+
+        def ymldebug(context, text):
+            if options.trace:
+                sys.stderr.write("Debug: " + codecs.encode(u(text), options.encoding) + "\n")
+            return ""
+
+        def ymlassert(context, value, msg):
+            if options.trace:
+                if not value:
+                    raise YMLAssert(msg)
+            return ""
+
+        ymlns = etree.FunctionNamespace("http://fdik.org/yml")
+        ymlns.prefix = "yml"
+        ymlns['debug'] = ymldebug
+        ymlns['assert'] = ymlassert
+
+        if options.xpath:
+            tree = etree.fromstring(rtext)
+            ltree = tree.xpath(codecs.decode(options.xpath, options.encoding))
+            rtext = ""
+            try:
+                for rtree in ltree:
+                    rtext += etree.tostring(rtree, pretty_print=options.pretty, encoding=unicode)
+            except:
+                rtext = ltree
+
+        elif options.yslt or options.xslt:
+            params = {}
+
+            if options.yslt:
+                backend.clearAll()
+                yscript = fileinput.input(options.yslt, mode="rU", openhook=fileinput.hook_encoded(options.encoding))
+                yresult = parse(ymlC, yscript, True, comment)
+                ytext = backend.finish(yresult)
+            else:
+                yscript = fileinput.input(options.xslt, mode="rU")
+                ytext = ""
+                for line in yscript:
+                    ytext += line
+
+            doc = etree.fromstring(rtext)
+
+            xsltree = etree.XML(ytext, base_url=os.path.abspath(yscript.filename()))
+            transform = etree.XSLT(xsltree)
+            
+            if options.params:
+                params = eval(options.params)
+                for key, value in params.iteritems():
+                    if type(value) is not str:
+                        params[key] = u(value)
+            if options.stringparams:
+                for key, value in eval(options.stringparams).iteritems():
+                    params[key] = "'" + u(value) + "'"
+
+            rresult = transform(doc, **params)
+            # lxml is somewhat buggy
+            try:
+                rtext = u(rresult)
+            except:
+                rtext = etree.tostring(rresult, encoding=unicode)
+                if not rtext:
+                    rtext = codecs.decode(str(rresult), "utf-8")
+
+        if options.normalization != "none":
+            rtext = unicodedata.normalize(options.normalization, rtext)
+
+        if options.pretty:
+            plaintext = etree.tostring(etree.fromstring(rtext), pretty_print=True, xml_declaration=True, encoding=options.encoding)
+        else:
+            if isinstance(rtext, str):
+                plaintext = codecs.encode(rtext, options.encoding)
+            else:
+                plaintext = rtext
+
+        try:
+            if plaintext[-1] == "\n":
+                plaintext = plaintext[:-1]
+        except: pass
+
+        if options.outputFile and options.outputFile != "-":
+            outfile = open(options.outputFile, "wb")
+            outfile.write(plaintext)
+            outfile.close()
+        else:
+            sys.stdout.buffer.write(plaintext)
+            if not options.pretty:
+                print()
+
+    except KeyboardInterrupt:
+        w("\n")
+        sys.exit(1)
+    except YMLAssert as msg:
+        w("YML Assertion failed: " + u(msg) + "\n")
+        sys.exit(2)
+    except KeyError as msg:
+        w("not found: " + u(msg) + "\n")
+        sys.exit(4)
+    except LookupError as msg:
+        w("not found: " + u(msg) + "\n")
+        sys.exit(4)
+    except etree.XMLSyntaxError as e:
+        log = e.error_log.filter_from_level(etree.ErrorLevels.FATAL)
+        for entry in log:
+            w("XML error: " + u(entry.message) + "\n")
+        sys.exit(5)
+    except Exception as msg:
+        w(msg)
+        sys.exit(5)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
+
--- a/yml2c	Thu Mar 19 15:20:28 2020 +0100
+++ b/yml2c	Thu Mar 19 16:47:39 2020 +0100
@@ -1,103 +1,10 @@
 #!/usr/bin/env python3
-# vim: set fileencoding=utf-8 :
-
-"""\
-YML 2 compiler version 6.2
-Copyleft (c), 2009-2020, Volker Birk  http://fdik.org/yml/
-
-"""
-
-import sys, os, codecs, locale
-import fileinput, unicodedata
-from optparse import OptionParser
-
-from yml2.pyPEG import parse, u
-from yml2 import ymlCStyle, comment, oldSyntax
-import yml2.backend as backend
-
-YML_DEFAULT_PATH = [os.path.dirname(backend.__file__)]
-
-def printInfo(option, opt_str, value, parser):
-    sys.stdout.write(__doc__)
-    sys.exit(0)
-
-def w(msg):
-    if isinstance(msg, BaseException):
-        msg = str(msg) + "\n"
-    if type(msg) is bytes:
-        msg = codecs.encode(msg, sys.stderr.encoding)
-    sys.stderr.write(msg)
-
-def main():
-    optParser = OptionParser()
-    optParser.add_option("-C", "--old-syntax", action="store_true", dest="old_syntax",
-            help="syntax of YML 2 version 1.x (compatibility mode)", default=False)
-    optParser.add_option("-D", "--emit-linenumbers", action="store_true", dest="emitlinenumbers",
-            help="emit line numbers into the resulting XML for debugging purposes", default=False)
-    optParser.add_option("-E", "--encoding", dest="encoding", metavar="ENCODING", default=locale.getdefaultlocale()[1],
-            help="encoding of input files (default to locale)")
-    optParser.add_option("-I", "--include", dest="includePathText", metavar="INCLUDE_PATH",
-            help="precede YML_PATH by a colon separated INCLUDE_PATH to search for include files")
-    optParser.add_option("-m", "--omit-empty-parm-tags", action="store_true", dest="omitemptyparm",
-            help="does nothing (only there for compatibility reasons)", default=False)
-    optParser.add_option("-n", "--normalization", dest="normalization", metavar="NORMALIZATION", default="NFC",
-            help="Unicode normalization (none, NFD, NFKD, NFC, NFKC, FCD, default is NFC)")
-    optParser.add_option("-o", "--output", dest="outputFile", metavar="FILE",
-            help="place output in file FILE")
-    optParser.add_option("-p", "--parse-only", action="store_true", dest="parseonly",
-            help="parse only, then output pyAST as text to stdout", default=False)
-    optParser.add_option("-V", "--version", action="callback", callback=printInfo, help="show version info")
-    (options, args) = optParser.parse_args()
-
-    if options.old_syntax:
-        oldSyntax()
-
-    if options.emitlinenumbers:
-        backend.emitlinenumbers = True
-
-    backend.encoding = options.encoding
-
-    try:
-        if options.includePathText:
-            backend.includePath = options.includePathText.split(':')
-
-        dirs = os.environ.get('YML_PATH', '.').split(':') + YML_DEFAULT_PATH
-        backend.includePath.extend(dirs)
-
-        files = fileinput.input(args, mode="rU", openhook=fileinput.hook_encoded(options.encoding))
-
-        ymlC = ymlCStyle()
-        result = parse(ymlC, files, True, comment, packrat=True)
-
-        if options.parseonly:
-            print(result)
-        else:
-            result = backend.finish(result)
-            if options.normalization != "none":
-                result = unicodedata.normalize(options.normalization, result)
-
-            if options.outputFile and options.outputFile != "-":
-                outfile = open(options.outputFile, "wb")
-                outfile.write(codecs.encode(result, options.encoding))
-                outfile.close()
-            else:
-                sys.stdout.buffer.write(codecs.encode(result, options.encoding))
-                print()
-
-    except KeyboardInterrupt:
-        w("\n")
-        sys.exit(1)
-    except KeyError as msg:
-        w("not found: " + u(msg) + "\n")
-        sys.exit(4)
-    except LookupError as msg:
-        w("not found: " + u(msg) + "\n")
-        sys.exit(4)
-    except Exception as msg:
-        w(msg)
-        sys.exit(5)
-
-
-if __name__ == "__main__":
-    sys.exit(main())
-
+import sys, os
+sys.path.insert(0, os.path.dirname(__file__))
+try:
+    from yml2 import yml2c
+except ImportError as e:
+    import pkg_resources
+    pkg_resources.require('YML2')
+    from yml2 import yml2c
+sys.exit(yml2c.main())
--- a/yml2proc	Thu Mar 19 15:20:28 2020 +0100
+++ b/yml2proc	Thu Mar 19 16:47:39 2020 +0100
@@ -1,249 +1,10 @@
 #!/usr/bin/env python3
-# vim: set fileencoding=utf-8 :
-
-"""\
-YML/YSLT 2 processor version 6.2
-Copyleft (c), 2009-2020 Volker Birk  http://fdik.org/yml/
-
-"""
-
-import sys, os, codecs, locale
-import fileinput, unicodedata
-from optparse import OptionParser
-
+import sys, os
+sys.path.insert(0, os.path.dirname(__file__))
 try:
-    from lxml import etree
-except:
-    sys.stderr.write("This program needs lxml, see http://codespeak.net/lxml/\n")
-    sys.exit(1)
-
-from yml2 import ymlCStyle, comment, oldSyntax
-from yml2.pyPEG import parse, u
-import yml2.backend as backend
-
-YML_DEFAULT_PATH = [os.path.dirname(backend.__file__)]
-
-def printInfo(option, opt_str, value, parser):
-    sys.stdout.write(__doc__)
-    sys.exit(0)
-
-class YMLAssert(Exception): pass
-
-def w(msg):
-    if isinstance(msg, BaseException):
-        try:
-            msg = str(msg) + "\n"
-        except:
-            msg = u(msg) + "\n"
-    sys.stderr.write(msg)
-
-def main():
-    optParser = OptionParser()
-    optParser.add_option("-C", "--old-syntax", action="store_true", dest="old_syntax",
-            help="syntax of YML 2 version 1.x (compatibility mode)", default=False)
-    optParser.add_option("-D", "--emit-linenumbers", action="store_true", dest="emitlinenumbers",
-            help="emit line numbers into the resulting XML for debugging purposes", default=False)
-    optParser.add_option("--debug", action="store_true", dest="trace",
-            help="switch on tracing to stderr", default=False)
-    optParser.add_option("-d", "--paramdict", dest="params", metavar="PARAMS",
-            help="call X/YSLT script with dictionary PARAMS as parameters")
-    optParser.add_option("-e", "--xpath", dest="xpath", metavar="XPATH",
-            help="execute XPath expression XPATH and print result")
-    optParser.add_option("-E", "--encoding", dest="encoding", metavar="ENCODING", default=locale.getdefaultlocale()[1],
-            help="encoding of input files (default to locale)")
-    optParser.add_option("-I", "--include", dest="includePathText", metavar="INCLUDE_PATH",
-            help="precede YML_PATH by a colon separated INCLUDE_PATH to search for include files")
-    optParser.add_option("-m", "--omit-empty-parm-tags", action="store_true", dest="omitemptyparm",
-            help="does nothing (only there for compatibility reasons)", default=False)
-    optParser.add_option("-M", "--empty-input-document", action="store_true", dest="emptyinput",
-            help="use an empty input document", default=False)
-    optParser.add_option("-n", "--normalization", dest="normalization", metavar="NORMALIZATION", default="NFC",
-            help="Unicode normalization (none, NFD, NFKD, NFC, NFKC, FCD, default is NFC)")
-    optParser.add_option("-o", "--output", dest="outputFile", metavar="FILE",
-            help="place output in file FILE")
-    optParser.add_option("-p", "--parse-only", action="store_true", dest="parseonly",
-            help="parse only, then output pyAST as text to stdout", default=False)
-    optParser.add_option("-P", "--pretty", action="store_true", default=False,
-            help="pretty print output adding whitespace")
-    optParser.add_option("-s", "--stringparamdict", dest="stringparams", metavar="STRINGPARAMS",
-            help="call X/YSLT script with dictionary STRINGPARAMS as string parameters")
-    optParser.add_option("-x", "--xml", action="store_true", default=False,
-            help="input document is XML already")
-    optParser.add_option("-X", "--xslt", dest="xslt", metavar="XSLTSCRIPT",
-            help="execute XSLT script XSLTSCRIPT")
-    optParser.add_option("-y", "--yslt", dest="yslt", metavar="YSLTSCRIPT",
-            help="execute YSLT script YSLTSCRIPT")
-    optParser.add_option("-Y", "--xml2yml", action="store_true", default=False,
-            help="convert XML to normalized YML code")
-    optParser.add_option("-V", "--version", action="callback", callback=printInfo, help="show version info and exit")
-    (options, args) = optParser.parse_args()
-
-    if options.old_syntax:
-        oldSyntax()
-
-    if options.trace:
-        backend.enable_tracing = True
-
-    if options.emitlinenumbers:
-        backend.emitlinenumbers = True
-
-    if options.includePathText:
-        backend.includePath = options.includePathText.split(':')
-
-    backend.encoding = options.encoding
-
-    dirs = os.environ.get('YML_PATH', '.').split(':') + YML_DEFAULT_PATH
-    backend.includePath.extend(dirs)
-
-    if options.xml2yml:
-        for directory in backend.includePath:
-            name = os.path.join(directory, "xml2yml.ysl2")
-            if os.path.isfile(name):
-                options.yslt = name
-                options.xml = True
-                break
-        else:
-            sys.stderr.write("Error: Stylesheet xml2yml.ysl2 required for --xml2yml not found\n")
-            sys.stderr.write("Please check your YML_PATH\n")
-            sys.exit(1)
-
-    if  (options.xslt and options.yslt) or (options.xslt and options.xpath) or (options.yslt and options.xpath):
-        sys.stderr.write("Cannot combine --xpath, --xslt and --yslt params\n")
-        sys.exit(1)
-
-    try:
-        ymlC = ymlCStyle()
-
-        rtext = ""
-
-        if not options.emptyinput:
-            files = fileinput.input(args, mode="rU", openhook=fileinput.hook_encoded(options.encoding))
-
-            if options.xml:
-                rtext = ""
-                for line in files:
-                    rtext += line
-            else:
-                result = parse(ymlC, files, True, comment)
-                if options.parseonly:
-                    print(result)
-                    sys.exit(0)
-                else:
-                    rtext = backend.finish(result)
-
-        if not rtext:
-            rtext = "<empty/>"
-
-        def ymldebug(context, text):
-            if options.trace:
-                sys.stderr.write("Debug: " + codecs.encode(u(text), options.encoding) + "\n")
-            return ""
-
-        def ymlassert(context, value, msg):
-            if options.trace:
-                if not value:
-                    raise YMLAssert(msg)
-            return ""
-
-        ymlns = etree.FunctionNamespace("http://fdik.org/yml")
-        ymlns.prefix = "yml"
-        ymlns['debug'] = ymldebug
-        ymlns['assert'] = ymlassert
-
-        if options.xpath:
-            tree = etree.fromstring(rtext)
-            ltree = tree.xpath(codecs.decode(options.xpath, options.encoding))
-            rtext = ""
-            try:
-                for rtree in ltree:
-                    rtext += etree.tostring(rtree, pretty_print=options.pretty, encoding=unicode)
-            except:
-                rtext = ltree
-
-        elif options.yslt or options.xslt:
-            params = {}
-
-            if options.yslt:
-                backend.clearAll()
-                yscript = fileinput.input(options.yslt, mode="rU", openhook=fileinput.hook_encoded(options.encoding))
-                yresult = parse(ymlC, yscript, True, comment)
-                ytext = backend.finish(yresult)
-            else:
-                yscript = fileinput.input(options.xslt, mode="rU")
-                ytext = ""
-                for line in yscript:
-                    ytext += line
-
-            doc = etree.fromstring(rtext)
-
-            xsltree = etree.XML(ytext, base_url=os.path.abspath(yscript.filename()))
-            transform = etree.XSLT(xsltree)
-            
-            if options.params:
-                params = eval(options.params)
-                for key, value in params.iteritems():
-                    if type(value) is not str:
-                        params[key] = u(value)
-            if options.stringparams:
-                for key, value in eval(options.stringparams).iteritems():
-                    params[key] = "'" + u(value) + "'"
-
-            rresult = transform(doc, **params)
-            # lxml is somewhat buggy
-            try:
-                rtext = u(rresult)
-            except:
-                rtext = etree.tostring(rresult, encoding=unicode)
-                if not rtext:
-                    rtext = codecs.decode(str(rresult), "utf-8")
-
-        if options.normalization != "none":
-            rtext = unicodedata.normalize(options.normalization, rtext)
-
-        if options.pretty:
-            plaintext = etree.tostring(etree.fromstring(rtext), pretty_print=True, xml_declaration=True, encoding=options.encoding)
-        else:
-            if isinstance(rtext, str):
-                plaintext = codecs.encode(rtext, options.encoding)
-            else:
-                plaintext = rtext
-
-        try:
-            if plaintext[-1] == "\n":
-                plaintext = plaintext[:-1]
-        except: pass
-
-        if options.outputFile and options.outputFile != "-":
-            outfile = open(options.outputFile, "wb")
-            outfile.write(plaintext)
-            outfile.close()
-        else:
-            sys.stdout.buffer.write(plaintext)
-            if not options.pretty:
-                print()
-
-    except KeyboardInterrupt:
-        w("\n")
-        sys.exit(1)
-    except YMLAssert as msg:
-        w("YML Assertion failed: " + u(msg) + "\n")
-        sys.exit(2)
-    except KeyError as msg:
-        w("not found: " + u(msg) + "\n")
-        sys.exit(4)
-    except LookupError as msg:
-        w("not found: " + u(msg) + "\n")
-        sys.exit(4)
-    except etree.XMLSyntaxError as e:
-        log = e.error_log.filter_from_level(etree.ErrorLevels.FATAL)
-        for entry in log:
-            w("XML error: " + u(entry.message) + "\n")
-        sys.exit(5)
-    except Exception as msg:
-        w(msg)
-        sys.exit(5)
-
-
-if __name__ == "__main__":
-    sys.exit(main())
-
+    from yml2 import yml2proc
+except ModuleNotFoundError:
+    import pkg_resources
+    pkg_resources.require('YML2')
+    from yml2 import yml2proc
+sys.exit(yml2proc.main())