From 9024d6695972bddf8eca01812ee236f9b9939158 Mon Sep 17 00:00:00 2001 From: Tomas Hajny Date: Wed, 14 Mar 2007 00:13:22 +0000 Subject: [PATCH] * units htmlelements and htmlwriter moved from fcl-web to fcl-xml git-svn-id: trunk@6840 - --- .gitattributes | 12 +- packages/fcl-web/Makefile | 208 +++++++++--------- packages/fcl-web/Makefile.fpc | 4 +- packages/fcl-web/src/README | 45 +--- packages/fcl-xml/Makefile | 208 +++++++++--------- packages/fcl-xml/Makefile.fpc | 4 +- packages/fcl-xml/src/README | 61 ++++- packages/fcl-xml/src/fpmake.inc | 2 + .../{fcl-web => fcl-xml}/src/htmlelements.pp | 0 .../{fcl-web => fcl-xml}/src/htmlwriter.pp | 0 .../{fcl-web => fcl-xml}/src/tagsimpl.inc | 0 .../{fcl-web => fcl-xml}/src/tagsintf.inc | 0 .../{fcl-web => fcl-xml}/src/wtagsimpl.inc | 0 .../{fcl-web => fcl-xml}/src/wtagsintf.inc | 0 14 files changed, 277 insertions(+), 267 deletions(-) rename packages/{fcl-web => fcl-xml}/src/htmlelements.pp (100%) rename packages/{fcl-web => fcl-xml}/src/htmlwriter.pp (100%) rename packages/{fcl-web => fcl-xml}/src/tagsimpl.inc (100%) rename packages/{fcl-web => fcl-xml}/src/tagsintf.inc (100%) rename packages/{fcl-web => fcl-xml}/src/wtagsimpl.inc (100%) rename packages/{fcl-web => fcl-xml}/src/wtagsintf.inc (100%) diff --git a/.gitattributes b/.gitattributes index 1d20889e53..c26f2915f0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4266,15 +4266,9 @@ packages/fcl-web/src/fphtml.pp svneol=native#text/plain packages/fcl-web/src/fphttp.pp svneol=native#text/plain packages/fcl-web/src/fptemplate.pp svneol=native#text/plain packages/fcl-web/src/fpweb.pp svneol=native#text/plain -packages/fcl-web/src/htmlelements.pp svneol=native#text/plain -packages/fcl-web/src/htmlwriter.pp svneol=native#text/plain packages/fcl-web/src/httpdefs.pp svneol=native#text/plain -packages/fcl-web/src/tagsimpl.inc svneol=native#text/plain -packages/fcl-web/src/tagsintf.inc svneol=native#text/plain packages/fcl-web/src/websession.pp svneol=native#text/plain packages/fcl-web/src/webutil.pp svneol=native#text/plain -packages/fcl-web/src/wtagsimpl.inc svneol=native#text/plain -packages/fcl-web/src/wtagsintf.inc svneol=native#text/plain packages/fcl-xml/Makefile svneol=native#text/plain packages/fcl-xml/Makefile.fpc svneol=native#text/plain packages/fcl-xml/src/README -text @@ -4283,11 +4277,17 @@ packages/fcl-xml/src/dom_html.pp svneol=native#text/plain packages/fcl-xml/src/fpmake.inc svneol=native#text/plain packages/fcl-xml/src/fpmake.pp svneol=native#text/plain packages/fcl-xml/src/htmldefs.pp svneol=native#text/plain +packages/fcl-xml/src/htmlelements.pp svneol=native#text/plain +packages/fcl-xml/src/htmlwriter.pp svneol=native#text/plain packages/fcl-xml/src/htmwrite.pp svneol=native#text/plain packages/fcl-xml/src/names.inc svneol=native#text/plain packages/fcl-xml/src/sax.pp svneol=native#text/plain packages/fcl-xml/src/sax_html.pp svneol=native#text/plain packages/fcl-xml/src/sax_xml.pp svneol=native#text/plain +packages/fcl-xml/src/tagsimpl.inc svneol=native#text/plain +packages/fcl-xml/src/tagsintf.inc svneol=native#text/plain +packages/fcl-xml/src/wtagsimpl.inc svneol=native#text/plain +packages/fcl-xml/src/wtagsintf.inc svneol=native#text/plain packages/fcl-xml/src/xhtml.pp svneol=native#text/plain packages/fcl-xml/src/xmlcfg.pp svneol=native#text/plain packages/fcl-xml/src/xmlread.pp svneol=native#text/plain diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile index f4d060dfa0..0fb12bb825 100644 --- a/packages/fcl-web/Makefile +++ b/packages/fcl-web/Makefile @@ -233,316 +233,316 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F override PACKAGE_NAME=fcl-web override PACKAGE_VERSION=2.0.0 ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb htmlelements htmlwriter webutil fpdatasetform +override TARGET_UNITS+=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb webutil fpdatasetform endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=fpcgi fphtml fpweb htmlwriter websession +override TARGET_RSTS+=fpcgi fphtml fpweb websession endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) diff --git a/packages/fcl-web/Makefile.fpc b/packages/fcl-web/Makefile.fpc index fee67b9f42..5de12f2291 100644 --- a/packages/fcl-web/Makefile.fpc +++ b/packages/fcl-web/Makefile.fpc @@ -8,8 +8,8 @@ version=2.0.0 [target] units=httpdefs fphttp custcgi fpcgi fptemplate fphtml websession fpweb \ - htmlelements htmlwriter webutil fpdatasetform -rsts=fpcgi fphtml fpweb htmlwriter websession + webutil fpdatasetform +rsts=fpcgi fphtml fpweb websession [require] packages=fcl-base fcl-xml fcl-db diff --git a/packages/fcl-web/src/README b/packages/fcl-web/src/README index 6d2e683400..80f7c9b3ab 100644 --- a/packages/fcl-web/src/README +++ b/packages/fcl-web/src/README @@ -3,10 +3,6 @@ Although it is non-visual, it is geared towards use in Lazarus. Architecture: -htmldefs --------- -(in ../inc) contains basic HTML declarations. - httpdefs -------- contains the basic HTTP system definitions: @@ -106,45 +102,7 @@ THTMLDatasetSelectProducer TCustomHTMLModule: TCustomHTTPModule descendent which produces HTML content only. -htmlelements ------------- - -Implements a DOM for HTML content. Contains a TDOMElement descendent for -all valid HTML 4.1 tags. - -THtmlCustomElement: - Basis for all HTML tag elements. -THTMLDocument: - TDOMDocument descendent -THTMLIDElement: - element representing tag - -All tags are in tagsintf.inc. - -htmlwriter ----------- - -Implements a verified HTML producer. - -THTMLwriter: - This is a class which allows to write certified correct HTML. - It works using the DOM for HTML. - It also has forms support. - -Writing HTML is done as follows: - - StartBold; - Write('This text is bold'); - EndBold; -or - Bold('This text is bold'); - -But the following is also possible - Bold(Center('Bold centered text')); - -Open tags will be closed automatically. - -wtagsintf.inc contains all possible tags. +Note that classes for HTML document creation come from package fcl-xml. fpdatasetform ------------- @@ -160,7 +118,6 @@ THTMLDatasetFormGridProducer Creates a grid with data from a TDataset Complicated table formatting is possible. - custcgi: -------- CGI application base class. It knows nothing of the fp diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile index b590d91174..a7808853cd 100644 --- a/packages/fcl-xml/Makefile +++ b/packages/fcl-xml/Makefile @@ -233,316 +233,316 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F override PACKAGE_NAME=fcl-xml override PACKAGE_VERSION=2.0.0 ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=htmldefs htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath +override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=sax xpath +override TARGET_RSTS+=sax xpath htmlwriter endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) diff --git a/packages/fcl-xml/Makefile.fpc b/packages/fcl-xml/Makefile.fpc index 8d9eb80857..f0f2827cdd 100644 --- a/packages/fcl-xml/Makefile.fpc +++ b/packages/fcl-xml/Makefile.fpc @@ -7,8 +7,8 @@ name=fcl-xml version=2.0.0 [target] -units=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath -rsts=sax xpath +units=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter +rsts=sax xpath htmlwriter [require] packages=netdb fcl-base diff --git a/packages/fcl-xml/src/README b/packages/fcl-xml/src/README index 9f9b1c2f91..e59800c110 100644 --- a/packages/fcl-xml/src/README +++ b/packages/fcl-xml/src/README @@ -1,11 +1,14 @@ Free Pascal XML units ---------------------- +===================== -DOM: +DOM +--- Implements most of the DOM level 1 specification and supports some of the DOM level 2 extensions. -XMLRead: + +XMLRead +------- Provides a simple XML reader, which can read XML data from a file or stream. This simple parser will be replaced by a much improved one soon, which will be able to handle different character encodings, namespaces and entity references. @@ -18,7 +21,9 @@ Regarding whitespace handling: Whitespace directly after the beginning of a tag is discarded, and sections of the XML file which contain only whitespace and no other text content are discarded as well. -XMLWrite: + +XMLWrite +-------- Writes a DOM structure as XML data into a file or stream. It can deal both with XML files and XML fragments. At the moment it supports only the node types which can be read by XMLRead. @@ -35,6 +40,52 @@ The XML reader (in xmlread.pp) will convert these entity references back to their original characters. -XPath: +XPath +----- Just a XPath implementation. Should be fairly completed, but there hasn't been further development recently. + + +HTMLDefs +-------- +Contains basic HTML declarations. + + +HTMLElements +------------ +Implements a DOM for HTML content. Contains a TDOMElement descendent for +all valid HTML 4.1 tags. + +THtmlCustomElement: + Basis for all HTML tag elements. +THTMLDocument: + TDOMDocument descendent +THTMLIDElement: + element representing tag + +All tags are in tagsintf.inc. + + +HTMLWriter +---------- +Implements a verified HTML producer. + +THTMLwriter: + This is a class which allows to write certified correct HTML. + It works using the DOM for HTML. + It also has forms support. + +Writing HTML is done as follows: + + StartBold; + Write('This text is bold'); + EndBold; +or + Bold('This text is bold'); + +But the following is also possible + Bold(Center('Bold centered text')); + +Open tags will be closed automatically. + +wtagsintf.inc contains all possible tags. diff --git a/packages/fcl-xml/src/fpmake.inc b/packages/fcl-xml/src/fpmake.inc index 45a38e0731..2395ca613c 100644 --- a/packages/fcl-xml/src/fpmake.inc +++ b/packages/fcl-xml/src/fpmake.inc @@ -16,3 +16,5 @@ T:=Targets.AddUnit('xhtml'); T:=Targets.AddUnit('htmldefs'); T:=Targets.AddUnit('htmwrite'); T:=Targets.AddUnit('xpath'); +T:=Targets.AddUnit('htmlelements'); +T:=Targets.AddUnit('htmlwriter'); diff --git a/packages/fcl-web/src/htmlelements.pp b/packages/fcl-xml/src/htmlelements.pp similarity index 100% rename from packages/fcl-web/src/htmlelements.pp rename to packages/fcl-xml/src/htmlelements.pp diff --git a/packages/fcl-web/src/htmlwriter.pp b/packages/fcl-xml/src/htmlwriter.pp similarity index 100% rename from packages/fcl-web/src/htmlwriter.pp rename to packages/fcl-xml/src/htmlwriter.pp diff --git a/packages/fcl-web/src/tagsimpl.inc b/packages/fcl-xml/src/tagsimpl.inc similarity index 100% rename from packages/fcl-web/src/tagsimpl.inc rename to packages/fcl-xml/src/tagsimpl.inc diff --git a/packages/fcl-web/src/tagsintf.inc b/packages/fcl-xml/src/tagsintf.inc similarity index 100% rename from packages/fcl-web/src/tagsintf.inc rename to packages/fcl-xml/src/tagsintf.inc diff --git a/packages/fcl-web/src/wtagsimpl.inc b/packages/fcl-xml/src/wtagsimpl.inc similarity index 100% rename from packages/fcl-web/src/wtagsimpl.inc rename to packages/fcl-xml/src/wtagsimpl.inc diff --git a/packages/fcl-web/src/wtagsintf.inc b/packages/fcl-xml/src/wtagsintf.inc similarity index 100% rename from packages/fcl-web/src/wtagsintf.inc rename to packages/fcl-xml/src/wtagsintf.inc