refactoring in sgml-common
version bump for xinit
new xinit patch