Commit 1d6f331d authored by gerd's avatar gerd

Last minute changes


git-svn-id: https://godirepo.camlcity.org/svn/lib-pxp/trunk@709 dbe99aee-44db-0310-b2b3-d33182c8eb97
parent 00c678aa
......@@ -51,16 +51,28 @@ for PXP; if you are looking for the stable distribution, please go
<title>Version History</title>
<ul>
<li><p><em>XXX:</em>Addition of ulex lexing.</p>
<li><p><em>1.1.95:</em> Addition of ulex lexing.</p>
<p>Fix in Pxp_reader.combine.</p>
<p>Revised namespace handling: There are now namespace_scope
objects keeping the scoping structure of the namespaces.
The namespace_info stuff has been removed.</p>
The namespace_info stuff has been removed. The "display"
methods can print XML while respecting the scoping structure.
</p>
<p>New exceptions Namespace_not_managed, Namespace_prefix_not_managed,
Namespace_not_in_scope (all replacing Not_found). Methods
of namespace_manager may raise these exceptions.
</p>
<p>The event-based representation of XML is now symmetrical
to the tree-based representation, such that it is possible
to convert one representation into the other without loss.
The type of events had to be changed to achieve this effect.
</p>
<p>The new module Pxp_event contains functions for the event-based
representation.</p>
<p>Addition of pxp-pp, the PXP preprocessor.</p>
<p><em>This release requires Ocamlnet 0.98. You should also
install ulex. There are no longer precompiled wlex lexers
(use ulex instead).</em></p>
</li>
<li><p><em>1.1.94.2:</em> Again fixes for the combination of
......
......@@ -12,15 +12,17 @@
<sect1><title>The "pxp" package</title>
<sect2><title>Prerequisites</title>
<p>
&m; requires that the <a href="&url.netstring-project;">netstring package
</a> is already installed. &m; works
only with O'Caml 3.00 (the support for 2.04 has been dropped).
The installation
procedure defined in the Makefile requires <a
href="&url.findlib-project;">findlib</a> to work<footnote><em>Findlib</em> is a
package manager, see the file ABOUT-FINDLIB.</footnote>. &m; may
now be optionally compiled with support for Alain Frisch's patch of
ocamllex called <a href="&url.ocaml.frisch;">"wlex"</a>.
&m; requires that the <a
href="&url.netstring-project;">ocamlnet/netstring package </a> is
already installed (version 0.98 required). &m; works only with O'Caml
>= 3.07. The installation procedure defined in the Makefile requires
<a href="&url.findlib-project;">findlib</a> to
work<footnote><em>Findlib</em> is a package manager, see the file
ABOUT-FINDLIB.</footnote>. &m; may be optionally compiled with
support for Alain Frisch's patch of ocamllex called <a
href="&url.ocaml.frisch;">"wlex"</a>. There is now also support
for ulex, Alain's Unicode-aware replacement for ocamllex (same
link), which is simpler to build and now highly recommended.
</p>
</sect2>
......@@ -51,8 +53,7 @@ option (see below).</p>
<p>-with-wlex</p>
<p>Enables the lexical analyzer that works for UTF-8 as internal encoding, and that is based on Alain Frisch's wlex tool. It
is relatively small and almost as fast as the ocamllex-based lexers. I
recommend it if it is ok to install another library (wlex). Note that you only need
the runtime part of wlex, and not the "wlex" command itself.</p>
recommend it if it is ok to install another library (wlex).</p>
</li>
<li>
<p>-with-wlex-compat</p>
......@@ -63,21 +64,24 @@ for UTF8 and ISO-8859-1 (may be required to build old software)</p>
<p>-with-ulex</p>
<p>Enables the lexical analyzer that works for UTF-8 as internal encoding, and that is based on Alain Frisch's ulex tool. It
is relatively small, but a bit slower than the ocamllex-based lexers.
ulex will supersede wlex soon.</p>
ulex will supersede wlex soon. ulex is required for the preprocessor
(see below).</p>
</li>
<li>
<p>-with-pp</p>
<p>Enables the PXP preprocessor (installed as package pxp-pp).
See the file PREPROCESSOR for details. The preprocessor also requires ulex.</p>
See the file PREPROCESSOR for details. The preprocessor requires ulex.</p>
</li>
<li>
<p>-lexlist &lt;list-of-encodings&gt;</p>
<p>Specifies the character encodings to support by the ocamllex-
based lexers. You need only the encodings you are going to use for the internal
representation of the XML data in memory. It is not necessary to mention
a character set here if you only want to read an external file. Note that
utf8 is also provided by -with-wlex, and it is reasonable to omit it here
if -with-wlex is in effect.</p>
<p>-lexlist &lt;list-of-encodings&gt;</p> <p>Specifies the
character encodings to support by the ocamllex- based
lexers. You need only the encodings you are going to use for
the internal representation of the XML data in memory. It is
not necessary to mention a character set here if you only
want to read an external file. Note that utf8 is also
provided by both -with-wlex and -with-ulex, and it is
reasonable to omit it here if one of the mentioned options
is in effect.</p>
</li>
</ul>
......
......@@ -27,6 +27,10 @@ enables camlp4, on which the preprocessor is based. It is also
possible to use it together with the revised syntax, use
"-syntax camlp4r" in this case.</p>
<p><em>Important:</em> Up to version 1.0.4, findlib (ocamlfind)
has a problem with the definition for pxp-pp. There is an easy
workaround: Use "-syntax camlp4o,byte".</p>
<p>In the toploop, type
<code>
......
#! /bin/sh
# (*
exec ocamlfattop "$0" "$@"
exec ocaml "$0" "$@"
*) directory ".";;
#use "topfind";;
#require "netstring";;
#require "str";;
(*
* <ID:id-string>
......
#! /bin/sh
# (*
exec ocamlfattop "$0"
exec ocaml str.cma "$0"
*) directory ".";;
open Str;;
......
......@@ -38,28 +38,28 @@ f doc/README
f doc/DEV
f doc/EXTENSIONS
f doc/PREPROCESSOR
f doc/RELEASE-NOTES
#f doc/RELEASE-NOTES
f doc/SPEC
f doc/design.txt
d doc/manual
f doc/manual/Makefile
d doc/manual/html
p doc/manual/html/.*\.html
p doc/manual/html/.*\.css
d doc/manual/html/pic
p doc/manual/html/pic/.*\.gif
d doc/manual/ps
f doc/manual/ps/pxp.ps
d doc/manual/src
f doc/manual/src/extract.ml
f doc/manual/src/getcode.ml
f doc/manual/src/markup.css
f doc/manual/src/markup.dsl
f doc/manual/src/markup.sgml
d doc/manual/src/extracted
d doc/manual/src/pic
p doc/manual/src/pic/.*\.fig
#d doc/manual
#f doc/manual/Makefile
#d doc/manual/html
#p doc/manual/html/.*\.html
#p doc/manual/html/.*\.css
#d doc/manual/html/pic
#p doc/manual/html/pic/.*\.gif
#d doc/manual/ps
#f doc/manual/ps/pxp.ps
#d doc/manual/src
#f doc/manual/src/extract.ml
#f doc/manual/src/getcode.ml
#f doc/manual/src/markup.css
#f doc/manual/src/markup.dsl
#f doc/manual/src/markup.sgml
#d doc/manual/src/extracted
#d doc/manual/src/pic
#p doc/manual/src/pic/.*\.fig
d examples
f examples/Makefile
......@@ -129,6 +129,10 @@ d examples/xhtml2html
f examples/xhtml2html/Makefile
f examples/xhtml2html/main.ml
d examples/preprocessor
f examples/preprocessor/Makefile
f examples/preprocessor/library.ml
d src
f src/Makefile
......@@ -160,6 +164,8 @@ f src/pxp-engine/pxp_entity.ml
f src/pxp-engine/pxp_entity_manager.ml
f src/pxp-engine/pxp_ev_parser.mli
f src/pxp-engine/pxp_ev_parser.ml
f src/pxp-engine/pxp_event.mli
f src/pxp-engine/pxp_event.ml
f src/pxp-engine/pxp_lex_aux.ml
f src/pxp-engine/pxp_lexer_types.ml
f src/pxp-engine/pxp_lexer_types.mli
......@@ -185,52 +191,13 @@ f src/pxp-engine/pxp_types.mli
f src/pxp-engine/pxp_yacc.ml
f src/pxp-engine/pxp_yacc.mli
#d src/pxp-lex-generic
#f src/pxp-lex-generic/pxp_lex_aux.ml
#f src/pxp-lex-generic/pxp_lex_content.src
#f src/pxp-lex-generic/pxp_lex_content_string.src
#f src/pxp-lex-generic/pxp_lex_declaration.src
#f src/pxp-lex-generic/pxp_lex_defs_generic.def
#f src/pxp-lex-generic/pxp_lex_document.src
#f src/pxp-lex-generic/pxp_lex_document_type.src
#f src/pxp-lex-generic/pxp_lex_dtd_string.src
#f src/pxp-lex-generic/pxp_lex_misc.src
#f src/pxp-lex-generic/pxp_lex_name_string.src
#f src/pxp-lex-generic/pxp_lex_within_tag.src
#d src/pxp-lex-iso88591
#f src/pxp-lex-iso88591/META.in
#f src/pxp-lex-iso88591/Makefile
#f src/pxp-lex-iso88591/Makefile.code
#f src/pxp-lex-iso88591/open_pxp_lex_aux_iso88591.src
#f src/pxp-lex-iso88591/open_pxp_lex_misc_iso88591.src
#f src/pxp-lex-iso88591/pxp_lex_defs_iso88591.def
#f src/pxp-lex-iso88591/pxp_lex_link_iso88591.ml
#d src/pxp-lex-utf8
#f src/pxp-lex-utf8/META.in
#f src/pxp-lex-utf8/Makefile
#f src/pxp-lex-utf8/Makefile.code
#f src/pxp-lex-utf8/open_pxp_lex_aux_utf8.src
#f src/pxp-lex-utf8/open_pxp_lex_misc_utf8.src
#f src/pxp-lex-utf8/pxp_lex_defs_drv_utf8.def
#f src/pxp-lex-utf8/pxp_lex_link_utf8.ml
#d src/pxp-wlex
#f src/pxp-wlex/META.in
#f src/pxp-wlex/Makefile
#f src/pxp-wlex/Makefile.code
#f src/pxp-wlex/pxp_wlex.mlw
#f src/pxp-wlex/pxp_wlex.ml
#f src/pxp-wlex/pxp_wlex_aux.ml
#f src/pxp-wlex/pxp_wlex_link.ml
d src/pxp-lex
f src/pxp-lex/char_classes_generic.def
f src/pxp-lex/char_classes_wlex.def
f src/pxp-lex/lex.src
f src/pxp-lex/link_generic.src
f src/pxp-lex/link_ocamllex.src
f src/pxp-lex/link_wlex.src
f src/pxp-lex/link_ulex.src
d gensrc
d gensrc/pxp-lex-pattern
......@@ -245,17 +212,18 @@ f gensrc/pxp-wlex/META.in
d gensrc/pxp-wlex-utf8
f gensrc/pxp-wlex-utf8/Makefile
f gensrc/pxp-wlex-utf8/META.in
#f gensrc/pxp-wlex-utf8/gen_done
#f gensrc/pxp-wlex-utf8/pxp_wlex_link_utf8.ml
#f gensrc/pxp-wlex-utf8/pxp_wlex_utf8_01.ml
#f gensrc/pxp-wlex-utf8/pxp_wlex_utf8_01.mll
d gensrc-pre
d gensrc-pre/pxp-wlex-utf8
f gensrc-pre/pxp-wlex-utf8/pxp_wlex_link_utf8.ml
f gensrc-pre/pxp-wlex-utf8/pxp_wlex_utf8_01.mll
f gensrc-pre/pxp-wlex-utf8/pxp_wlex_utf8_01.ml.306
f gensrc-pre/pxp-wlex-utf8/pxp_wlex_utf8_01.ml.307
d gensrc/pxp-ulex-utf8
f gensrc/pxp-ulex-utf8/Makefile
f gensrc/pxp-ulex-utf8/META.in
# No longer distributed since 1.1.95:
#d gensrc-pre
#d gensrc-pre/pxp-wlex-utf8
#f gensrc-pre/pxp-wlex-utf8/pxp_wlex_link_utf8.ml
#f gensrc-pre/pxp-wlex-utf8/pxp_wlex_utf8_01.mll
#f gensrc-pre/pxp-wlex-utf8/pxp_wlex_utf8_01.ml.306
#f gensrc-pre/pxp-wlex-utf8/pxp_wlex_utf8_01.ml.307
d src/pxp-pp
f src/pxp-pp/Makefile
......@@ -331,7 +299,7 @@ p rtests/canonxml/data_valid/optional_decls/out/.*\.xml
d rtests/codewriter
f rtests/codewriter/Makefile
f rtests/codewriter/compile.ml
f rtests/codewriter/xmlcompile.ml
f rtests/codewriter/marshal_namespace.ml
f rtests/codewriter/marshal_simple.ml
f rtests/codewriter/marshal_recode.ml
......@@ -344,6 +312,7 @@ f rtests/dynamic/Makefile
f rtests/dynamic/create_element.ml
f rtests/dynamic/modify.ml
f rtests/dynamic/strip.ml
f rtests/dynamic/symmetry.ml
f rtests/dynamic/run
d rtests/negative
......@@ -394,9 +363,6 @@ d tools
f tools/Makefile
f tools/collect_files
f tools/ifdef
#f tools/insert_variant
#f tools/m2parsergen
#f tools/ucs2_to_utf8
d tools/src
f tools/src/Makefile
......@@ -409,19 +375,12 @@ f tools/src/m2parsergen/generator.ml
f tools/src/m2parsergen/lexer.mll
f tools/src/m2parsergen/parser.mly
#d tools/src/ucs2_to_utf8
#f tools/src/ucs2_to_utf8/Makefile
#f tools/src/ucs2_to_utf8/README
#f tools/src/ucs2_to_utf8/lexer.mll
#f tools/src/ucs2_to_utf8/parser.mly
#f tools/src/ucs2_to_utf8/types.ml
#f tools/src/ucs2_to_utf8/ucs2_to_utf8.ml
d tools/src/lexpp
f tools/src/lexpp/Makefile
f tools/src/lexpp/file.ml
f tools/src/lexpp/lexer.mll
f tools/src/lexpp/main.ml
f tools/src/lexpp/parser.mly
f tools/src/lexpp/types.ml
f tools/src/lexpp/lexpp_file.ml
f tools/src/lexpp/mll_lexer.mll
f tools/src/lexpp/uni_lexer.mll
f tools/src/lexpp/uni_parser.mly
f tools/src/lexpp/uni_types.ml
f tools/src/lexpp/ucs2_to_utf8.ml
......@@ -5,7 +5,7 @@ set -e
version=`./configure -version 2>/dev/null`
destdir="pxp-$version"
echo "Ensure the gensrc-pre lexers are up to date!"
#echo "Ensure the gensrc-pre lexers are up to date!"
mkdir -p packages
rm -rf "packages/$destdir"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment