From owner-sw-wml-dev@engelschall.com Fri Sep 15 23:48:53 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id XAA17439; Fri, 15 Sep 2000 23:48:51 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id XAA17432; Fri, 15 Sep 2000 23:48:41 +0200 (MET DST) Received: (qmail 15478 invoked by uid 66); 15 Sep 2000 21:57:16 -0000 Received: from en by slarti with UUCP; Fri Sep 15 21:57:16 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8FLkU817885; Fri, 15 Sep 2000 23:46:30 +0200 (CEST) Date: Fri, 15 Sep 2000 23:46:30 +0200 From: "Ralf S. Engelschall" To: sw-wml-dev@engelschall.com Subject: Initial test posting to sw-wml-dev Message-ID: <20000915234630.A17873@engelschall.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Organization: Engelschall, Germany. X-Web-Homepage: http://www.engelschall.com/ X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: "Ralf S. Engelschall" X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev Just ignore this message. It is just the initial test posting to make sure sw-wml-dev@engelschall.com operates correctly. Ralf S. Engelschall rse@engelschall.com www.engelschall.com ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Sat Sep 16 13:16:56 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id NAA05719; Sat, 16 Sep 2000 13:16:56 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id NAA05706; Sat, 16 Sep 2000 13:16:48 +0200 (MET DST) Received: (qmail 23867 invoked by uid 66); 16 Sep 2000 11:25:22 -0000 Received: from en by slarti with UUCP; Sat Sep 16 11:25:22 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8GB4Mx42692; Sat, 16 Sep 2000 13:04:22 +0200 (CEST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id BAA24004; Sat, 16 Sep 2000 01:06:34 +0200 (MET DST) Date: Sat, 16 Sep 2000 01:06:34 +0200 (MET DST) Message-Id: <200009152306.BAA24004@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_backend/p7_htmlfix htmlfix.src To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 16-Sep-2000 01:06:32 Modified: . ChangeLog wml_backend/p7_htmlfix htmlfix.src Log: *) Make wml_p7_htmlfix customizable (16-Sep-2000): Two new options let the user decide which fixups are performed or skipped. [Denis Barbier] Revision Changes Path 1.210 +5 -0 wml/ChangeLog Index: ChangeLog =================================================================== RCS file: /e/wml/cvs/wml/ChangeLog,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- ChangeLog 2000/09/13 22:29:20 1.209 +++ ChangeLog 2000/09/15 23:06:24 1.210 @@ -10,6 +10,11 @@ Changes between 2.0.3 and 2.0.4: + *) Make wml_p7_htmlfix customizable (16-Sep-2000): + Two new options let the user decide which fixups are performed + or skipped. + [Denis Barbier] + *) Fix wml_p7_htmlfix (13-Sep-2000): The version shipped with WML 2.0.3 is broken, there are problems with unquoted attributes containing a slash sign. 1.13 +67 -33 wml/wml_backend/p7_htmlfix/htmlfix.src Index: htmlfix.src =================================================================== RCS file: /e/wml/cvs/wml/wml_backend/p7_htmlfix/htmlfix.src,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- htmlfix.src 2000/09/13 22:29:23 1.12 +++ htmlfix.src 2000/09/15 23:06:30 1.13 @@ -26,15 +26,30 @@ print STDERR "\n"; print STDERR "Options:\n"; print STDERR " -o, --outputfile= set output file instead of stdout\n"; - print STDERR " -v, --verbose verbose mode\n"; + print STDERR " -F, --fix= select which fix to apply\n"; + print STDERR " -S, --skip= skip specified fixes\n"; + print STDERR " -v, --verbose verbose mode\n\n"; + print STDERR "Fixes are a comma separated list of (default is to process them all)\n"; + print STDERR " imgalt : add ALT attributes to IMG tags\n"; + print STDERR " imgsize: add WIDTH/HEIGHT attributes to IMG tags\n"; + print STDERR " summary: add SUMMARY attribute to TABLE tags\n"; + print STDERR " center : change proprietary CENTER tag to standard DIV tag\n"; + print STDERR " quotes : add missing quotes for attributes and missing '#' character\n to color attributes\n"; + print STDERR " indent : indent paragraphs\n"; + print STDERR " comment: out-comment tags\n"; + print STDERR " tagcase: perform tag case-conversion\n"; exit(1); } $opt_v = 0; $opt_o = '-'; +$opt_F = 'imgalt,imgsize,summary,center,quotes,indent,comment,tagcase'; +$opt_S = ''; $Getopt::Long::bundling = 1; $Getopt::Long::getopt_compat = 0; if (not Getopt::Long::GetOptions( "v|verbose", + "F|fix=s", + "S|skip=s", "o|outputfile=s")) { &usage; } @@ -100,13 +115,6 @@ $atime,$mtime,$ctime,$blksize,$blocks) = stat($image); $bytes += $size; - # add an ALT="" tag to make HTML lints happy - if ( $attr !~ m|ALT\s*=\s*"[^"]*"|is - and $attr !~ m|ALT\s*=\s*\S+|is) { - &verbose("adding ALT for $image"); - $attr .= ' alt=""'; - } - # add WIDTH and HEIGHT to speed up display $width = -1; $height = -1; @@ -194,8 +202,21 @@ } return $attr; +} +sub Fixup_imgalt { + $bufferN = ''; + while ($buffer =~ s|^(.*?)(<[iI][mM][gG]\s+)([^>]+?)(/?>)||s) { + ($pre, $tag, $attr, $end) = ($1, $2, $3, $4); + if ( $attr !~ m|ALT\s*=\s*"[^"]*"|is + and $attr !~ m|ALT\s*=\s*\S+|is) { + &verbose("adding ALT for $image"); + $attr .= ' alt=""'; + } + $bufferN .= $pre . $tag . $attr . $end; + } + $buffer = $bufferN . $buffer; } -sub FixupImg { +sub Fixup_imgsize { $bufferN = ''; while ($buffer =~ s|^(.*?)(<[iI][mM][gG]\s+)([^>]+?)(/?>)||s) { ($pre, $tag, $attr, $end) = ($1, $2, $3, $4); @@ -207,7 +228,7 @@ # # FIXUP 2: add summary attribute to -tags # -sub FixupTable { +sub Fixup_summary { &verbose("adding summary attribute to
"); my $last = 0; @@ -228,7 +249,7 @@ # # FIXUP 3: change
..
to
..
# -sub FixupCenter { +sub Fixup_center { &verbose("replacing
..
by
..
"); $buffer =~ s|<[cC][eE][nN][tT][eE][rR]>|
|g; @@ -239,7 +260,7 @@ # FIXUP 4: add quotations to attribute values and # add missing '#' char to color attributes # -sub FixupQuotes { +sub Fixup_quotes { &verbose("add quotes to attributes"); my $last = 0; @@ -281,7 +302,7 @@ } return $data; } -sub FixupIndent { +sub Fixup_indent { &verbose("paragraph indentation"); if ($buffer =~ m|<[iI][nN][dD][eE][nN][tT][\s>]|) { @@ -297,7 +318,7 @@ # # FIXUP 6: out-commenting tags # -sub FixupComment { +sub Fixup_comment { &verbose("remove commenting tags"); $buffer =~ s|<[a-zA-Z_][a-zA-Z0-9-]*#.*?>||sg; $buffer =~ s|||sg; @@ -339,7 +360,7 @@ } return $data; } -sub FixupTagcase { +sub Fixup_tagcase { &verbose("tag case translation"); if ($buffer =~ m|<[tT][aA][gG][cC][oO][nN][vV][\s>]|) { @@ -355,9 +376,12 @@ # # process all required fixups # -foreach (qw(Img Table Center Quotes Indent Comment Tagcase)) { - $fixup = 'Fixup' . $_; - &$fixup; +foreach (split(',', $opt_S)) { + $opt_F =~ s/\b$_\b//; +} +foreach (split(',', $opt_F)) { + $fixup = 'Fixup_' . $_; + &$fixup if defined (&$fixup); } # @@ -392,17 +416,19 @@ B [B<-o> I] +[B<-F> I] +[B<-S> I] [B<-v>] [I] =head1 DESCRIPTION The F program reads I or from C and performs the -following actions: +following actions (name of each fixup is within parentheses): =over 4 -=item B +=item (B) : B For all C tags which don't already have both C and C attributes (matched case insensitive), the size of the image (taken from the @@ -425,39 +451,37 @@ scale the given or determined width and height values by multiplying with I or multiplying with I/100. -=item B +=item (B) : B For all C tags which don't already have a C tag an C attribute is added. The intention is to both make HTML checkers like weblint(1) happy and to demystify the final webpage for lynx(1) users. -=item B +=item (B) : B This attribute helps non-visual rendering of tables by adding a hint on its contents, and it makes tidy(1) quiet. -=item B +=item (B
) : B All proprietary (Netscape) C
tags are replaced by the HTML 3.2 conforming construct ``CDIV ALIGN=CENTERE>''. -=item B +=item (B) : B -All attributes of the form ``C<...=123>'' are replaced by ``C<...="123">''. +All attributes of the form ``C<...=xyz>'' are replaced by ``C<...="xyz">''. +Furthermore all (color) attributes of the form ``C<...="XXYYZZ">'' +(XX,YY,ZZ elements of set {0,..,9,a,..,f} are fixed to +``C<...="#XXYYZZ">''. -=item B +=item (B) : B -All (color) attributes of the form ``C<...="XXYYZZ">'' (XX,YY,ZZ elements of -set {0,..,9,a,..,f} are fixed to ``C<...="#XXYYZZ">''. - -=item B - Paragraphs enclosed in Cindent [num=N] [size=S]E>...C/indentE> containers are indented by N*S spaces. When N=0 then the whitespace block in front of the paragraph is removed. Default is a 4 space indentation (N=1, S=4). -=item B +=item (B) : B Sometimes it is useful to temporarily out-comment a tag instead of completely removing it. This can be done by just adding a sharp (``C<#>'') character @@ -465,7 +489,7 @@ commented out. For container-tags you have to comment out the end-tag explicitly, too. Example: ``ECE''. -=item B +=item (B) : B Some people like their HTML markup code either to be all uppercase or all lowercase. This tag case-conversion is supported by the internal @@ -483,6 +507,16 @@ This redirects the output to I. Usually the output will be send to C if no such option is specified or I is "C<->". + +=item B<-F> I + +This option specifies which specifix fixups are performed. Its argument +is a comma separated list of fixup names, and by default all fixups are +performed. + +=item B<-S> I + +This option does the inverse job, it skips specified fixups. =item B<-v> ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Sat Sep 16 21:10:43 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id VAA05575; Sat, 16 Sep 2000 21:10:40 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id VAA05564; Sat, 16 Sep 2000 21:10:31 +0200 (MET DST) Date: Sat, 16 Sep 2000 21:10:31 +0200 (MET DST) Message-Id: <200009161910.VAA05564@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_include/des navbar.src To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 16-Sep-2000 21:10:30 Modified: . ChangeLog wml_include/des navbar.src Log: *) Improve wml::des::navbar (16-Sep-2000): By default (called `inner' mode), epilog is put after sub-menu buttons, i.e. navbars are nested. When is called with attribute `menumode=outer', then sub-menus are inserted after epilog. [Tobias Oetiker] Revision Changes Path 1.211 +7 -0 wml/ChangeLog Index: ChangeLog =================================================================== RCS file: /e/wml/cvs/wml/ChangeLog,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- ChangeLog 2000/09/15 23:06:24 1.210 +++ ChangeLog 2000/09/16 19:10:18 1.211 @@ -10,6 +10,13 @@ Changes between 2.0.3 and 2.0.4: + *) Improve wml::des::navbar (16-Sep-2000): + By default (called `inner' mode), epilog is put after sub-menu + buttons, i.e. navbars are nested. When is called + with attribute `menumode=outer', then sub-menus are inserted after + epilog. + [Tobias Oetiker] + *) Make wml_p7_htmlfix customizable (16-Sep-2000): Two new options let the user decide which fixups are performed or skipped. 1.33 +18 -7 wml/wml_include/des/navbar.src Index: navbar.src =================================================================== RCS file: /e/wml/cvs/wml/wml_include/des/navbar.src,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- navbar.src 2000/08/12 19:32:41 1.32 +++ navbar.src 2000/09/16 19:10:26 1.33 @@ -324,8 +324,9 @@ # navbar rendering # - + + @@ -336,7 +337,7 @@ sub navbar_render_ { my($name, $select, $subselected, $txtcol_n, $txtcol_s, - $txtonly, $nohints, $nbcount) = @_; + $menumode, $txtonly, $nohints, $nbcount) = @_; # select the correct navigation bar configuration my $CFG = $NAVBAR{$name}; @@ -517,11 +518,10 @@ } } - if ($menu ne '' and $NAVBAR{"$menu"}->{OPEN}) { + if ($menumode eq 'inner' and $menu ne '' and $NAVBAR{"$menu"}->{OPEN}) { $O .= &navbar_render_($menu, $select, $subselected, - $txtcol_n, $txtcol_s, $txtonly, $nohints, $nbcount); + $txtcol_n, $txtcol_s, $menumode, $txtonly, $nohints, $nbcount); } - # # EPILOG @@ -540,6 +540,12 @@ } } + if ($menumode ne 'inner' and $menu ne '' and $NAVBAR{"$menu"}->{OPEN}) { + $O .= &navbar_render_($menu, $select, $subselected, + $txtcol_n, $txtcol_s, $menumode, $txtonly, $nohints, $nbcount); + } + + } # output the global footer @@ -592,10 +598,10 @@ "&navbar_render_('', $select, $subselected, '', '', - $txtonly, $nohints, )" /> + $menumode, $txtonly, $nohints, )" /> } - + @@ -943,6 +949,11 @@ This is the corresponding tag to C because we want to have a homogen configuration style. + +=item menumode=I + +With B (default), a selected sub-menu is inserted +before epilog of current entry, otherwise it is put after. =item txtonly ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Mon Sep 18 00:04:35 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id AAA09496; Mon, 18 Sep 2000 00:04:33 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id AAA09482; Mon, 18 Sep 2000 00:04:15 +0200 (MET DST) Date: Mon, 18 Sep 2000 00:04:15 +0200 (MET DST) Message-Id: <200009172204.AAA09482@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_aux/linklint linklint.src To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 18-Sep-2000 00:04:14 Modified: wml_aux/linklint linklint.src Log: Remove the SHAREWARE word when showing usage, with Jim Bowlin's agreement. Revision Changes Path 1.3 +1 -1 wml/wml_aux/linklint/linklint.src Index: linklint.src =================================================================== RCS file: /e/wml/cvs/wml/wml_aux/linklint/linklint.src,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linklint.src 2000/09/10 10:15:43 1.2 +++ linklint.src 2000/09/17 22:04:00 1.3 @@ -121,7 +121,7 @@ ~; $Usage1 = - qq~$prog $version $date. SHAREWARE by Jim Bowlin (bowlin\@sirius.com)\n~; + qq~$prog $version $date by Jim Bowlin (bowlin\@sirius.com)\n~; $Usage2 = qq~Updates available at http://www.goldwarp.com/bowlin/linklint/\n\n~; ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Mon Sep 18 10:43:14 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id KAA29765; Mon, 18 Sep 2000 10:43:12 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id KAA29758; Mon, 18 Sep 2000 10:43:06 +0200 (MET DST) Date: Mon, 18 Sep 2000 10:43:06 +0200 (MET DST) Message-Id: <200009180843.KAA29758@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml Makefile.in To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 18-Sep-2000 10:43:06 Modified: . Makefile.in Log: Fix shtool's arguments when updating the VERSION file Revision Changes Path 1.46 +2 -2 wml/Makefile.in Index: Makefile.in =================================================================== RCS file: /e/wml/cvs/wml/Makefile.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- Makefile.in 2000/09/03 23:03:15 1.45 +++ Makefile.in 2000/09/18 08:43:04 1.46 @@ -287,14 +287,14 @@ cd $$_cwd && ls -l $${_tarball} _NEWVERS = \ - $(VERSION_TOOL) -l txt -p WML $$OPT VERSION; \ + $(VERSION_TOOL) -l txt -n WML $$OPT VERSION; \ V=`$(VERSION_TOOL) -l txt -d long VERSION`;\ sed -e "s/Version .*(.*)/Version $$V/g" README.n && mv README.n README; \ sed -e "s/Version .*(.*)/Version $$V/g" wml_frontend/wmd.txt.n && mv wml_frontend/wmd.txt.n wml_frontend/wmd.txt _UPDATEVERS = \ V=`$(VERSION_TOOL) -l txt -d short VERSION`;\ - $(VERSION_TOOL) -l txt -p WML -s $$V VERSION; \ + $(VERSION_TOOL) -l txt -n WML -s $$V VERSION; \ V=`$(VERSION_TOOL) -l txt -d long VERSION`;\ sed -e "s/Version .*(.*)/Version $$V/g" README.n && mv README.n README; \ sed -e "s/Version .*(.*)/Version $$V/g" wml_frontend/wmd.txt.n && mv wml_frontend/wmd.txt.n wml_frontend/wmd.txt ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Mon Sep 18 10:46:55 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id KAA00069; Mon, 18 Sep 2000 10:46:54 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id KAA00064; Mon, 18 Sep 2000 10:46:50 +0200 (MET DST) Date: Mon, 18 Sep 2000 10:46:50 +0200 (MET DST) Message-Id: <200009180846.KAA00064@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_frontend wmd.txt To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 18-Sep-2000 10:46:50 Modified: . VERSION VERSION.HISTORY README wml_frontend wmd.txt Log: Update version numbers and release date for WML 2.0.4. If all checks are right, it will be released tomorrow 19-Sep-2000. Revision Changes Path 1.42 +2 -2 wml/VERSION 1.17 +1 -0 wml/VERSION.HISTORY 1.39 +1 -1 wml/README Index: VERSION =================================================================== RCS file: /e/wml/cvs/wml/VERSION,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- VERSION 2000/09/03 23:03:17 1.41 +++ VERSION 2000/09/18 08:46:46 1.42 @@ -1,6 +1,6 @@ - VERSION -- Version Information for unknown (syntax: Text) + VERSION -- Version Information for WML (syntax: Text) [automatically generated and maintained by GNU shtool] - This is unknown, Version 2.0.3 (04-Sep-2000) + This is WML, Version 2.0.4 (19-Sep-2000) Index: VERSION.HISTORY =================================================================== RCS file: /e/wml/cvs/wml/VERSION.HISTORY,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- VERSION.HISTORY 2000/09/05 08:14:37 1.16 +++ VERSION.HISTORY 2000/09/18 08:46:46 1.17 @@ -6,6 +6,7 @@ release date. Take this list for detailed reference about the release history of WML. + 2.0.4 20000919 2.0.3 20000904 2.0.2 20000622 2.0.1 20000523 Index: README =================================================================== RCS file: /e/wml/cvs/wml/README,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- README 2000/09/03 23:03:17 1.38 +++ README 2000/09/18 08:46:46 1.39 @@ -4,7 +4,7 @@ \ V V /| | | | |___ ``WML is the Unix toolkit for getting \_/\_/ |_| |_|_____| your webdesigner's HTML job done.'' - Website META Language, Version 2.0.3 (04-Sep-2000) + Website META Language, Version 2.0.4 (19-Sep-2000) Copyright (c) 1996-2000 Ralf S. Engelschall Copyright (c) 1999-2000 Denis Barbier 1.53 +1 -1 wml/wml_frontend/wmd.txt Index: wmd.txt =================================================================== RCS file: /e/wml/cvs/wml/wml_frontend/wmd.txt,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- wmd.txt 2000/09/05 09:04:15 1.52 +++ wmd.txt 2000/09/18 08:46:48 1.53 @@ -1,5 +1,5 @@ -Website META Language, Version 2.0.3 (04-Sep-2000) +Website META Language, Version 2.0.4 (19-Sep-2000) Copyright (c) 1996-2000 Ralf S. Engelschall Copyright (c) 1999-2000 Denis Barbier ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 00:47:47 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id AAA29583; Tue, 19 Sep 2000 00:47:45 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from imacs.polytechnique.fr id AAA29565; Tue, 19 Sep 2000 00:47:25 +0200 (MET DST) Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian)) id 13b9jR-00010r-00; Tue, 19 Sep 2000 00:49:49 +0200 Date: Tue, 19 Sep 2000 00:49:49 +0200 From: Denis Barbier To: sw-wml-dev@engelschall.com Subject: [wml] HTML documentation Message-ID: <20000919004948.A3871@imacs.polytechnique.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/1.0.1i Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Denis Barbier X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev Hi, here is some food for thought ;-) Online documentation seems attractive for many people, so i would like to ship it within WML. A first try is available at http://www.engelschall.com/sw/wml/wml-doc-html.tar.gz This is a small patch (25kB), but it contains everything needed to build HTML documentation: - updated configuration files configure config/configure.in - new directory wml_docs/html - a dirty hack to use compiled WML binaries before installing, as with `make check' wml_test/Makefile.in When all these files are put at the right place, one only has to run ./configure make cd wml_docs/html make Graphical design must be improved, but this draft looks promising to me. Any feedback welcome. Denis ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 08:28:39 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id IAA25561; Tue, 19 Sep 2000 08:28:38 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id IAA25543; Tue, 19 Sep 2000 08:28:10 +0200 (MET DST) Received: (qmail 29937 invoked by uid 66); 19 Sep 2000 06:36:36 -0000 Received: from en by slarti with UUCP; Tue Sep 19 06:36:36 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8J6L4108392; Tue, 19 Sep 2000 08:21:04 +0200 (CEST) Date: Tue, 19 Sep 2000 08:21:03 +0200 From: "Ralf S. Engelschall" To: sw-wml-dev@engelschall.com Subject: Re: [wml] HTML documentation Message-ID: <20000919082103.A8058@engelschall.com> References: <20000919004948.A3871@imacs.polytechnique.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20000919004948.A3871@imacs.polytechnique.fr>; from barbier@imacs.polytechnique.fr on Tue, Sep 19, 2000 at 12:49:49AM +0200 Organization: Engelschall, Germany. X-Web-Homepage: http://www.engelschall.com/ X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: "Ralf S. Engelschall" X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Tue, Sep 19, 2000, Denis Barbier wrote: > here is some food for thought ;-) > Online documentation seems attractive for many people, so i would like > to ship it within WML. > A first try is available at > http://www.engelschall.com/sw/wml/wml-doc-html.tar.gz > This is a small patch (25kB), but it contains everything needed to build > HTML documentation: > [...] Hmmm... I have to admit that I personally think this is a little bit redundant. We already have online documentation through the manpages and the wmd frontend program. The hype of users for HTML versions of the same stuff seems exaggerated to me. Ok, it doesn't harm if we include the stuff in the distribution and it even could be considered a additional WML test suite ;), but IMHO it blows up the distribution even more without real extra value. But ok, it's nice stuff and as long as it is not compiled and installed per default into the installation area, its inclusion is fine. But if the user really wants the stuff he should have to start the compile and install manually, I think. Or provide him with an --with-html-docs option which have to be used to trigger the automatic compile and installation. Ralf S. Engelschall rse@engelschall.com www.engelschall.com ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 10:03:25 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id KAA01404; Tue, 19 Sep 2000 10:03:16 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from imacs.polytechnique.fr id KAA01284; Tue, 19 Sep 2000 10:01:41 +0200 (MET DST) Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian)) id 13bINj-0001OI-00; Tue, 19 Sep 2000 10:03:59 +0200 Date: Tue, 19 Sep 2000 10:03:59 +0200 From: Denis Barbier To: sw-wml-dev@engelschall.com Subject: Temporary filenames Message-ID: <20000919100359.A5337@imacs.polytechnique.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/1.0.1i Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Denis Barbier X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev Hi again, i am looking for patches to create temporary filenames with Perl the secure way. I am not sure to well understand the perlsec manpage and how to apply it to the wml Perl script. Denis ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 12:40:35 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id MAA11825; Tue, 19 Sep 2000 12:40:34 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id MAA11817; Tue, 19 Sep 2000 12:40:28 +0200 (MET DST) Received: (qmail 2371 invoked by uid 66); 19 Sep 2000 10:48:51 -0000 Received: from en by slarti with UUCP; Tue Sep 19 10:48:51 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8JAdiW15767; Tue, 19 Sep 2000 12:39:44 +0200 (CEST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from rainbow.studorg.tuwien.ac.at id KAA02874; Tue, 19 Sep 2000 10:29:10 +0200 (MET DST) Received: from localhost (fknipp@localhost) by rainbow.studorg.tuwien.ac.at (8.9.3/8.9.3/Debian 8.9.3-21) with ESMTP id KAA22093 for ; Tue, 19 Sep 2000 10:28:56 +0200 Date: Tue, 19 Sep 2000 10:28:56 +0200 (CEST) From: Franz Knipp To: sw-wml-dev@engelschall.com Subject: Hello Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Franz Knipp X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev Hello Denis, Ralf and the other persons! Hello @ this new mailing list ;-) I've written two modules, one of these seems to be useful to me also in the wml distribution... It is a table-of-contents generator like that of LaTeX - that means two compilation steps ;-) Integration with navbar seems to be possible, also different levels (chapter, section, ...) are implemented, etc. At the moment it works with WML 2.0.0 - I'll do a rewrite for WML 2.0.4 if you agree... (Afterwards I hopefully know the current syntax ;-) ) Nice greetings from Vienna, Franz ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 14:02:18 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id OAA16449; Tue, 19 Sep 2000 14:02:17 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from imacs.polytechnique.fr id OAA16434; Tue, 19 Sep 2000 14:02:02 +0200 (MET DST) Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian)) id 13bM7R-0001dt-00; Tue, 19 Sep 2000 14:03:25 +0200 Date: Tue, 19 Sep 2000 14:03:25 +0200 From: Denis Barbier To: sw-wml-dev@engelschall.com Subject: Re: Hello Message-ID: <20000919140325.A6269@imacs.polytechnique.fr> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/1.0.1i In-Reply-To: ; from fknipp@rainbow.studorg.tuwien.ac.at on Tue, Sep 19, 2000 at 10:28:56AM +0200 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Denis Barbier X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Tue, Sep 19, 2000 at 10:28:56AM +0200, Franz Knipp wrote: > Hello Denis, Ralf and the other persons! > > Hello @ this new mailing list ;-) > > I've written two modules, one of these seems to be useful to me also in > the wml distribution... > > It is a table-of-contents generator like that of LaTeX - that means two > compilation steps ;-) Integration with navbar seems to be possible, also > different levels (chapter, section, ...) are implemented, etc. Hi Franz, i made labels and references the LaTeX way too in wml::std::label, you should ensure that our modules do not conflict. > At the moment it works with WML 2.0.0 - I'll do a rewrite for WML 2.0.4 if > you agree... (Afterwards I hopefully know the current syntax ;-) ) A long time ago, i opened an area on the website for 3rd-party modules. As there was no input, it has been closed. I will be glad to reopen it. Denis ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 23:37:33 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id XAA28655; Tue, 19 Sep 2000 23:36:00 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id XAA28614; Tue, 19 Sep 2000 23:35:31 +0200 (MET DST) Date: Tue, 19 Sep 2000 23:35:31 +0200 (MET DST) Message-Id: <200009192135.XAA28614@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_frontend wml.src To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 19-Sep-2000 23:35:30 Modified: . ChangeLog wml_backend/p1_ipp ipp.src wml_frontend wml.src Log: *) Fix problems with synclines and protection (19-Sep-2000): The `synclines' feature was not documented in WML 2.0.3. It helps debugging by putting some special commands after pass 1 to keep track of input line numbers. Unfortunately, these extra commands will remain on output when included file is inside a protected area. This problem is now documented, and 2 solutions exist: either compile with `-W1,-N', or append the `IPP_NOSYNCLINES' special keyword to the #include line. [Many Debian people] Revision Changes Path 1.212 +11 -0 wml/ChangeLog Index: ChangeLog =================================================================== RCS file: /e/wml/cvs/wml/ChangeLog,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- ChangeLog 2000/09/16 19:10:18 1.211 +++ ChangeLog 2000/09/19 21:35:00 1.212 @@ -10,6 +10,17 @@ Changes between 2.0.3 and 2.0.4: + *) Fix problems with synclines and protection (19-Sep-2000): + The `synclines' feature was not documented in WML 2.0.3. + It helps debugging by putting some special commands after + pass 1 to keep track of input line numbers. + Unfortunately, these extra commands will remain on output when + included file is inside a protected area. + This problem is now documented, and 2 solutions exist: either + compile with `-W1,-N', or append the `IPP_NOSYNCLINES' special + keyword to the #include line. + [Many Debian people] + *) Improve wml::des::navbar (16-Sep-2000): By default (called `inner' mode), epilog is put after sub-menu buttons, i.e. navbars are nested. When is called 1.36 +18 -2 wml/wml_backend/p1_ipp/ipp.src Index: ipp.src =================================================================== RCS file: /e/wml/cvs/wml/wml_backend/p1_ipp/ipp.src,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ipp.src 2000/08/29 20:18:44 1.35 +++ ipp.src 2000/09/19 21:35:14 1.36 @@ -382,7 +382,8 @@ $line = 0; $out = ''; $out = "<__file__ $realname /><__line__ 0 />" . - "<:# line $line \"$realname\":>\n" if not $opt_N; + "<:# line $line \"$realname\":>\n" + if not $opt_N and not $arg{'IPP_NOSYNCLINES'}; $store = ''; while ($l = <$in>) { $line++; @@ -510,7 +511,8 @@ # now recurse down $out .= &ProcessFile($cmd, $type, $incfile, "", $level+1, 0, %arg); $out .= "<__file__ $realname /><__line__ $line />" . - "<:# line $line \"$realname\":>\n" if not $opt_N; + "<:# line $line \"$realname\":>\n" + if not $opt_N and not $arg{'IPP_NOSYNCLINES'}; # reset arguments %arg = %argO; @@ -691,6 +693,7 @@ [B<-M> I] [B<-P> I] [B<-m> I] +[B<-N> I] [B<-o> I] [B<-v>] I ... @@ -827,6 +830,13 @@ The contents of the file is not inserted, only informations about dependencies are updated. +=head2 B + +All include commands insert some special stuff to help C keeping +track of input line numbers. This feature may be disabled by appending +the string C to the C<#include> (or its variants) +command. See also the C<-N> flag. + =head2 B You can add @@ -1055,6 +1065,12 @@ Example: ,wml::std::headfoot wml::OBSOLETE::std::headfoot [S] + +=item B<-N> I + +By default, WML inserts some instructions to synchronize line numbers, +which are then interpreted in passes 2 and 3. This option disables this +feature. =item B<-o> I 1.64 +17 -0 wml/wml_frontend/wml.src Index: wml.src =================================================================== RCS file: /e/wml/cvs/wml/wml_frontend/wml.src,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- wml.src 2000/09/05 05:09:11 1.63 +++ wml.src 2000/09/19 21:35:25 1.64 @@ -1783,6 +1783,23 @@ +Warning: + +Since WML 2.0.3, pass 1 includes extra stuff to help keeping information +about line numbers relevant (a la cpp). So when writing + + + #include 'foo' + + +these extra commands will not be interpreted during pass 2 and will +remain on output. To suppress them, either compile with C<-W1,-N> flag, +or write + + + #include 'foo' IPP_NOSYNCLINES + + =head1 AUTHORS Ralf S. Engelschall ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Tue Sep 19 23:56:12 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id XAA01575; Tue, 19 Sep 2000 23:56:09 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from imacs.polytechnique.fr id XAA01508; Tue, 19 Sep 2000 23:55:42 +0200 (MET DST) Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian)) id 13bVOu-00028R-00; Tue, 19 Sep 2000 23:58:04 +0200 Date: Tue, 19 Sep 2000 23:58:04 +0200 From: Denis Barbier To: sw-wml-dev@engelschall.com Subject: Re: [wml] HTML documentation Message-ID: <20000919235804.A8156@imacs.polytechnique.fr> References: <20000919004948.A3871@imacs.polytechnique.fr> <20000919082103.A8058@engelschall.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/1.0.1i In-Reply-To: <20000919082103.A8058@engelschall.com>; from rse@engelschall.com on Tue, Sep 19, 2000 at 08:21:03AM +0200 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Denis Barbier X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Tue, Sep 19, 2000 at 08:21:03AM +0200, Ralf S. Engelschall wrote: > On Tue, Sep 19, 2000, Denis Barbier wrote: > > > here is some food for thought ;-) > > Online documentation seems attractive for many people, so i would like > > to ship it within WML. > > A first try is available at > > http://www.engelschall.com/sw/wml/wml-doc-html.tar.gz > > This is a small patch (25kB), but it contains everything needed to build > > HTML documentation: > > [...] > > Hmmm... I have to admit that I personally think this is a little bit > redundant. We already have online documentation through the manpages > and the wmd frontend program. That's what i thought too, but some people prefer hyperlinks to wmd frontend. And indeed, it is nice (especially with a non-stop Netscape running and a lot of RAM). > The hype of users for HTML versions of the same stuff seems exaggerated > to me. Ok, it doesn't harm if we include the stuff in the distribution > and it even could be considered a additional WML test suite ;), Additional test suite? But why do you believe there was one before ;-) > but IMHO it blows up the distribution even more without real extra > value. Hmmm, i have removed an unused file, and this extra documentation (i.e. files under wml_docs/html) fits in a 7893 bytes gzipped tarball. It will grow a little bit when Makefiles are updated to allow `make install-html'. > But ok, it's nice stuff and as long as it is not compiled and installed > per default into the installation area, its inclusion is fine. But if > the user really wants the stuff he should have to start the compile > and install manually, I think. Or provide him with an --with-html-docs > option which have to be used to trigger the automatic compile and > installation. That was my intention. Neither compiled nor installed by default, but a single `make html; make install-html' does the job. Denis ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 20 00:48:19 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id AAA09795; Wed, 20 Sep 2000 00:48:18 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id AAA09755; Wed, 20 Sep 2000 00:47:52 +0200 (MET DST) Date: Wed, 20 Sep 2000 00:47:52 +0200 (MET DST) Message-Id: <200009192247.AAA09755@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_include/mod MakeMaker.src To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 20-Sep-2000 00:47:50 Modified: . ChangeLog wml_include/mod MakeMaker.src Log: *) Fix wml::mod::MakeMaker (19-Sep-2000): The `extradistfiles' attribute did not work. [Denis Barbier] Revision Changes Path 1.213 +4 -0 wml/ChangeLog Index: ChangeLog =================================================================== RCS file: /e/wml/cvs/wml/ChangeLog,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- ChangeLog 2000/09/19 21:35:00 1.212 +++ ChangeLog 2000/09/19 22:47:31 1.213 @@ -10,6 +10,10 @@ Changes between 2.0.3 and 2.0.4: + *) Fix wml::mod::MakeMaker (19-Sep-2000): + The `extradistfiles' attribute did not work. + [Denis Barbier] + *) Fix problems with synclines and protection (19-Sep-2000): The `synclines' feature was not documented in WML 2.0.3. It helps debugging by putting some special commands after 1.18 +1 -1 wml/wml_include/mod/MakeMaker.src Index: MakeMaker.src =================================================================== RCS file: /e/wml/cvs/wml/wml_include/mod/MakeMaker.src,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- MakeMaker.src 2000/08/03 21:46:59 1.17 +++ MakeMaker.src 2000/09/19 22:47:45 1.18 @@ -213,7 +213,7 @@ close(IN); } else { - @distfiles = qw($extras); + @distfiles = split(' ', $extras); push(@distfiles, @files_src); foreach (qw(README shtool Makefile.wml MakeMaker.wml)) { push(@distfiles, $_) if -f $_; ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 20 15:22:32 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id PAA25438; Wed, 20 Sep 2000 15:22:31 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from imacs.polytechnique.fr id PAA25431; Wed, 20 Sep 2000 15:22:26 +0200 (MET DST) Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian)) id 13bjri-0002rY-00; Wed, 20 Sep 2000 15:24:46 +0200 Date: Wed, 20 Sep 2000 15:24:46 +0200 From: Denis Barbier To: sw-wml-dev@engelschall.com Subject: Re: Discussion about stable/unstable, etc. Message-ID: <20000920152446.A10919@imacs.polytechnique.fr> References: <20000915221441.A6663@engelschall.com> <20000916133554.B19145@imacs.polytechnique.fr> <20000917112047.A34188@engelschall.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/1.0.1i In-Reply-To: <20000917112047.A34188@engelschall.com>; from rse@engelschall.com on Sun, Sep 17, 2000 at 11:20:47AM +0200 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Denis Barbier X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev [posted to sw-wml-dev] On Sun, Sep 17, 2000 at 11:20:47AM +0200, Ralf S. Engelschall wrote: > On Sat, Sep 16, 2000, Denis Barbier wrote: > > > [...] > > > I think that for the size/scope of WML, MFC is a great way to do this. > > [...] > > What is MFC? > > It's the FreeBSD term from my posting. It stands for "merge from -current" and > means that all changes on the stable branch are bugfixes which are merged from > the trunk to the branch, i.e., all regular commits occur only on the trunk in > CVS and only MFCs are done to enhance/bugfix the stable branch. Hi Ralf, in your message dated Fri 15 September, you told that you would appreciate we adopt this scheme. I see no objection, tag and branch whatever you need ;-) But there is still something i do not understand. What are benefits of branching when noone seems to test the unstable branch? Will this scheme enlarge its audience? Denis ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 20 17:57:04 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id RAA07946; Wed, 20 Sep 2000 17:57:03 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id RAA07931; Wed, 20 Sep 2000 17:56:56 +0200 (MET DST) Received: (qmail 14484 invoked by uid 66); 20 Sep 2000 16:05:18 -0000 Received: from en by slarti with UUCP; Wed Sep 20 16:05:18 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8KDtWe98554; Wed, 20 Sep 2000 15:55:32 +0200 (CEST) Date: Wed, 20 Sep 2000 15:55:32 +0200 From: "Ralf S. Engelschall" To: sw-wml-dev@engelschall.com Subject: Re: Discussion about stable/unstable, etc. Message-ID: <20000920155532.A98229@engelschall.com> References: <20000915221441.A6663@engelschall.com> <20000916133554.B19145@imacs.polytechnique.fr> <20000917112047.A34188@engelschall.com> <20000920152446.A10919@imacs.polytechnique.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20000920152446.A10919@imacs.polytechnique.fr>; from barbier@imacs.polytechnique.fr on Wed, Sep 20, 2000 at 03:24:46PM +0200 Organization: Engelschall, Germany. X-Web-Homepage: http://www.engelschall.com/ X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: "Ralf S. Engelschall" X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Wed, Sep 20, 2000, Denis Barbier wrote: > > > [...] > > > > I think that for the size/scope of WML, MFC is a great way to do this. > > > [...] > > > What is MFC? > > > > It's the FreeBSD term from my posting. It stands for "merge from -current" and > > means that all changes on the stable branch are bugfixes which are merged from > > the trunk to the branch, i.e., all regular commits occur only on the trunk in > > CVS and only MFCs are done to enhance/bugfix the stable branch. > > in your message dated Fri 15 September, you told that you would > appreciate we adopt this scheme. I see no objection, tag and branch > whatever you need ;-) > > But there is still something i do not understand. What are benefits of > branching when noone seems to test the unstable branch? > Will this scheme enlarge its audience? The unstable branch (the trunk in CVS) is tested with snapshot versions until a new release occurs. The important point is just that for WML the unstable version should require 2 years until it becomes the new stable one. WML is a lot smaller project, so time ranges should be this way: 1. After a new version 2.x.0 is released, a branch for 2.x is created. On this branch approx. every 4 weeks a new version occurs with the latest bugfixes only. This happens until 2.(x+1).0 occurs, then the 2.x branch is dead, because then the stable branch will be 2.(x+1). 2. After a branch 2.x was forked off, the trunk can be go wild, that is all new features and other risky changes can be put into. Then after a while when all features are hacked into, alpha 2.(x+1)aX and/or beta 2.(x+1)bX versions are released from the trunk until 2.(x+1).0 is reached. Then the game starts from the beginning. 3. At any time all important bugfixes are merged from the trunk to the current stable branch. At the same time from both the stable branch and the trunk, versions are released: 2.x.N versions from the stable branch (=WML_2_X) and 2.(x+1)[ab]N version from the unstable branch (=HEAD). The benefit should be obvious: Users which want maximum stability go the branch-riding way, i.e., they use 2.x.0,...2,x.N,2.(x+1).0,...,2.(x+1).M,2.(x+2),0, etc. That is they only use stable release versions. Others who want to be always on the bleeding edge, use 2.xa0,...,2.xaN,2.xb0,...2.xbM,2.(x+1)a0, etc. The only developer "drawback" is that for every bugfix one applies to HEAD one has to merge it also to the WML_2_X branch. That requires discipline and careful commits (mainly means: commit a patch all at once and not in parts). I think it would be wise if I write a small HOWTO paper on this development approach to remember it for the future in case someone asks for details. Especially the involed CVS commands would be useful to have in written form for reference. Ralf S. Engelschall rse@engelschall.com www.engelschall.com ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 20 21:42:53 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id VAA25721; Wed, 20 Sep 2000 21:42:52 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id VAA25711; Wed, 20 Sep 2000 21:42:46 +0200 (MET DST) Received: (qmail 7848 invoked by uid 66); 20 Sep 2000 19:51:07 -0000 Received: from en by slarti with UUCP; Wed Sep 20 19:51:07 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8KJfbf11733; Wed, 20 Sep 2000 21:41:37 +0200 (CEST) Date: Wed, 20 Sep 2000 21:41:37 +0200 From: "Ralf S. Engelschall" To: sw-wml-dev@engelschall.com Subject: Re: [wml] HTML documentation Message-ID: <20000920214137.A11717@engelschall.com> References: <20000919004948.A3871@imacs.polytechnique.fr> <20000919082103.A8058@engelschall.com> <20000919235804.A8156@imacs.polytechnique.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20000919235804.A8156@imacs.polytechnique.fr>; from barbier@imacs.polytechnique.fr on Tue, Sep 19, 2000 at 11:58:04PM +0200 Organization: Engelschall, Germany. X-Web-Homepage: http://www.engelschall.com/ X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: "Ralf S. Engelschall" X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Tue, Sep 19, 2000, Denis Barbier wrote: > [...] > > But ok, it's nice stuff and as long as it is not compiled and installed > > per default into the installation area, its inclusion is fine. But if > > the user really wants the stuff he should have to start the compile > > and install manually, I think. Or provide him with an --with-html-docs > > option which have to be used to trigger the automatic compile and > > installation. > > That was my intention. Neither compiled nor installed by default, but a > single `make html; make install-html' does the job. Ok, then it sounds fine. But try to keep the stuff as small and invisible as possible ;) Ralf S. Engelschall rse@engelschall.com www.engelschall.com ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Thu Sep 21 07:15:07 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id HAA05992; Thu, 21 Sep 2000 07:15:05 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id HAA05988; Thu, 21 Sep 2000 07:15:01 +0200 (MET DST) Received: (qmail 20389 invoked by uid 66); 21 Sep 2000 05:23:21 -0000 Received: from en by slarti with UUCP; Thu Sep 21 05:23:21 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8L5E8v28901; Thu, 21 Sep 2000 07:14:08 +0200 (CEST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from imacs.polytechnique.fr id WAA01091; Wed, 20 Sep 2000 22:59:28 +0200 (MET DST) Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian)) id 13br01-0003Fv-00; Wed, 20 Sep 2000 23:01:49 +0200 Date: Wed, 20 Sep 2000 23:01:48 +0200 From: Denis Barbier To: sw-wml-dev@engelschall.com Subject: Re: Discussion about stable/unstable, etc. Message-ID: <20000920230148.A12417@imacs.polytechnique.fr> References: <20000915221441.A6663@engelschall.com> <20000916133554.B19145@imacs.polytechnique.fr> <20000917112047.A34188@engelschall.com> <20000920152446.A10919@imacs.polytechnique.fr> <20000920155532.A98229@engelschall.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/1.0.1i In-Reply-To: <20000920155532.A98229@engelschall.com>; from rse@engelschall.com on Wed, Sep 20, 2000 at 03:55:32PM +0200 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: Denis Barbier X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Wed, Sep 20, 2000 at 03:55:32PM +0200, Ralf S. Engelschall wrote: > The unstable branch (the trunk in CVS) is tested with snapshot versions until > a new release occurs. The important point is just that for WML the unstable > version should require 2 years until it becomes the new stable one. WML is a > lot smaller project, so time ranges should be this way: [...] It is not yet cristal clear, but i roughly understand how it works. > I think it would be wise if I write a small HOWTO paper on this > development approach to remember it for the future in case someone asks > for details. Especially the involed CVS commands would be useful to have > in written form for reference. Indeed ;-) Maybe there is an URL on the FreeBSD website? Denis ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Thu Sep 21 09:03:28 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id JAA13153; Thu, 21 Sep 2000 09:03:27 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id JAA13135; Thu, 21 Sep 2000 09:03:20 +0200 (MET DST) Received: (qmail 25809 invoked by uid 66); 21 Sep 2000 07:11:39 -0000 Received: from en by slarti with UUCP; Thu Sep 21 07:11:39 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8L72dd33808; Thu, 21 Sep 2000 09:02:39 +0200 (CEST) Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for from slarti.muc.de id IAA12258; Thu, 21 Sep 2000 08:55:16 +0200 (MET DST) Received: (qmail 25252 invoked by uid 66); 21 Sep 2000 07:03:36 -0000 Received: from en by slarti with UUCP; Thu Sep 21 07:03:36 2000 -0000 Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com id e8L5M6B29586; Thu, 21 Sep 2000 07:22:06 +0200 (CEST) Date: Thu, 21 Sep 2000 07:22:06 +0200 From: "Ralf S. Engelschall" To: sw-wml-dev@engelschall.com Subject: Re: Discussion about stable/unstable, etc. Message-ID: <20000921072206.A29483@engelschall.com> References: <20000915221441.A6663@engelschall.com> <20000916133554.B19145@imacs.polytechnique.fr> <20000917112047.A34188@engelschall.com> <20000920152446.A10919@imacs.polytechnique.fr> <20000920155532.A98229@engelschall.com> <20000920230148.A12417@imacs.polytechnique.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20000920230148.A12417@imacs.polytechnique.fr>; from barbier@imacs.polytechnique.fr on Wed, Sep 20, 2000 at 11:01:48PM +0200 Organization: Engelschall, Germany. X-Web-Homepage: http://www.engelschall.com/ X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5 Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: "Ralf S. Engelschall" X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev On Wed, Sep 20, 2000, Denis Barbier wrote: > > The unstable branch (the trunk in CVS) is tested with snapshot versions until > > a new release occurs. The important point is just that for WML the unstable > > version should require 2 years until it becomes the new stable one. WML is a > > lot smaller project, so time ranges should be this way: > [...] > > It is not yet cristal clear, but i roughly understand how it works. Don't panic, it's a lot easier than it looks at the first spot. And not much will change the way you are used to work. I'll try to write a short HOWTO on this when I find time. > > I think it would be wise if I write a small HOWTO paper on this > > development approach to remember it for the future in case someone asks > > for details. Especially the involed CVS commands would be useful to have > > in written form for reference. > > Indeed ;-) > Maybe there is an URL on the FreeBSD website? Perhaps the comitters guide: http://www.freebsd.org/tutorials/committers-guide/article.html Ralf S. Engelschall rse@engelschall.com www.engelschall.com ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Thu Sep 21 20:12:04 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id UAA05530; Thu, 21 Sep 2000 20:12:03 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for from cs.brown.edu id UAA05521; Thu, 21 Sep 2000 20:11:53 +0200 (MET DST) Received: from no.cs.brown.edu (no.cs.brown.edu [128.148.33.73]) by cs.brown.edu (8.9.3/8.9.3) with ESMTP id OAA15415 for ; Thu, 21 Sep 2000 14:11:00 -0400 (EDT) Received: (from jsb@localhost) by no.cs.brown.edu (8.9.0/8.9.0) id OAA07706 for sw-wml-dev@engelschall.com; Thu, 21 Sep 2000 14:11:47 -0400 (EDT) Date: Thu, 21 Sep 2000 14:11:47 -0400 (EDT) Message-Id: <200009211811.OAA07706@no.cs.brown.edu> From: jsb@no.cs.brown.edu To: sw-wml-dev@engelschall.com Subject: Re: Discussion about stable/unstable, etc. Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: jsb@no.cs.brown.edu X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev > I think it would be wise if I write a small HOWTO paper on this There's a short article in the current Dr. Dobbs Journal on using branching in CVS. Unfortunately, it's not one of the articles they chose to put up on their site (www.ddj.com). John ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 27 22:39:42 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id WAA22875; Wed, 27 Sep 2000 22:39:40 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id WAA22863; Wed, 27 Sep 2000 22:39:35 +0200 (MET DST) Date: Wed, 27 Sep 2000 22:39:35 +0200 (MET DST) Message-Id: <200009272039.WAA22863@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_backend/p2_mp4h/src builtin.c To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 27-Sep-2000 22:39:35 Modified: . CREDITS ChangeLog wml_backend/p2_mp4h/src builtin.c Log: *) Fix bug with conditionals in wml_p2_mp4h (27-Sep-2000): The and tags have strange results when first argument has a trailing slash, which is surely not so frequent. [Sebastian Wilhelmi ] Revision Changes Path 1.23 +1 -0 wml/CREDITS 1.214 +8 -1 wml/ChangeLog Index: CREDITS =================================================================== RCS file: /e/wml/cvs/wml/CREDITS,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- CREDITS 2000/09/05 08:22:38 1.22 +++ CREDITS 2000/09/27 20:39:29 1.23 @@ -90,6 +90,7 @@ o Boris Wesslowski o Clayton Wheeler o Craig Wiegert + o Sebastian Wilhelmi o Fritz Zaucker o Stefan `Sec` Zehl o Kurt D. Zeilenga Index: ChangeLog =================================================================== RCS file: /e/wml/cvs/wml/ChangeLog,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- ChangeLog 2000/09/19 22:47:31 1.213 +++ ChangeLog 2000/09/27 20:39:29 1.214 @@ -8,6 +8,13 @@ information about every single change. ___________________________________________________________________________ + Changes between 2.0.4 and SNAP: + + *) Fix bug with conditionals in wml_p2_mp4h (27-Sep-2000): + The and tags have strange results when first + argument has a trailing slash, which is surely not so frequent. + [Sebastian Wilhelmi ] + Changes between 2.0.3 and 2.0.4: *) Fix wml::mod::MakeMaker (19-Sep-2000): @@ -48,7 +55,7 @@ [Ralf S. Engelschall] *) Upgraded to LinkLint 2.2 (10-Sep-2000): - Upgraded from LinkLink version 1.35 to version 2.2 after LinkLink + Upgraded from LinkLint version 1.35 to version 2.2 after LinkLint changed from a (for WML not acceptable) shareware license to GPL. [Ralf S. Engelschall, James B. Bowlin ] 1.53 +4 -4 wml/wml_backend/p2_mp4h/src/builtin.c Index: builtin.c =================================================================== RCS file: /e/wml/cvs/wml/wml_backend/p2_mp4h/src/builtin.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- builtin.c 2000/08/29 20:00:00 1.52 +++ builtin.c 2000/09/27 20:39:33 1.53 @@ -1478,7 +1478,7 @@ obstack_grow (obs, "'); + obstack_grow (obs, " >", 2); obstack_grow (obs, ARG (2), strlen (ARG (2))); obstack_grow (obs, "", 7); if (argc>3) @@ -1585,11 +1585,11 @@ obstack_grow (obs, "'); + obstack_grow (obs, " >", 2); obstack_grow (obs, ARGBODY, strlen (ARGBODY)); obstack_grow (obs, "'); + obstack_grow (obs, " >", 2); obstack_grow (obs, ARGBODY, strlen (ARGBODY)); obstack_grow (obs, "", 8); obstack_grow (obs, "", 7); @@ -2418,7 +2418,7 @@ obstack_grow (obs, ARG (1), strlen (ARG (1))); if (verbatim && strcmp (verbatim, "true") == 0) obstack_grow (obs, " verbatim=true", 14); - obstack_1grow (obs, '>'); + obstack_grow (obs, " >", 2); if (alt) obstack_grow (obs, alt, strlen (alt)); obstack_grow (obs, "", 12); ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 27 22:45:42 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id WAA23224; Wed, 27 Sep 2000 22:45:42 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id WAA23211; Wed, 27 Sep 2000 22:45:37 +0200 (MET DST) Date: Wed, 27 Sep 2000 22:45:37 +0200 (MET DST) Message-Id: <200009272045.WAA23211@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_common/gd/libgd gd_gif.c gd_png.c To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 27-Sep-2000 22:45:37 Modified: . ChangeLog CREDITS wml_common/gd/libgd gd_gif.c gd_png.c Log: *) Fix compilation on AIX 4.3 (27-Sep-2000): The GD library did not compile because two unused routines depend upon undefined ones. These useless routines are now removed. [Norbert Gruener ] Revision Changes Path 1.215 +5 -0 wml/ChangeLog 1.24 +1 -0 wml/CREDITS Index: ChangeLog =================================================================== RCS file: /e/wml/cvs/wml/ChangeLog,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- ChangeLog 2000/09/27 20:39:29 1.214 +++ ChangeLog 2000/09/27 20:45:32 1.215 @@ -10,6 +10,11 @@ Changes between 2.0.4 and SNAP: + *) Fix compilation on AIX 4.3 (27-Sep-2000): + The GD library did not compile because two unused routines depend + upon undefined ones. These useless routines are now removed. + [Norbert Gruener ] + *) Fix bug with conditionals in wml_p2_mp4h (27-Sep-2000): The and tags have strange results when first argument has a trailing slash, which is surely not so frequent. Index: CREDITS =================================================================== RCS file: /e/wml/cvs/wml/CREDITS,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- CREDITS 2000/09/27 20:39:29 1.23 +++ CREDITS 2000/09/27 20:45:33 1.24 @@ -38,6 +38,7 @@ o Tom Gilbert o Hans de Graaff o Alexander Graefe + o Norbert Gruener o Florian Hars o Jan Ulrich Hasecke o Andy Hawkins 1.2 +1 -8 wml/wml_common/gd/libgd/gd_gif.c 1.3 +0 -7 wml/wml_common/gd/libgd/gd_png.c Index: gd_png.c =================================================================== RCS file: /e/wml/cvs/wml/wml_common/gd/libgd/gd_png.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gd_png.c 2000/01/11 23:45:57 1.2 +++ gd_png.c 2000/09/27 20:45:36 1.3 @@ -82,13 +82,6 @@ { } -void gdImagePng(gdImagePtr im, FILE *outFile) -{ - gdIOCtx *out = gdNewFileCtx(outFile); - gdImagePngCtx(im, out); - out->free(out); -} - void* gdImagePngPtr(gdImagePtr im, int *size) { void *rv; ______________________________________________________________________ Website META Language (WML) www.engelschall.com/sw/wml/ Developer Mailing List sw-wml-dev@engelschall.com Automated List Manager majordomo@engelschall.com From owner-sw-wml-dev@engelschall.com Wed Sep 27 22:48:27 2000 Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L id WAA23426; Wed, 27 Sep 2000 22:48:25 +0200 (MET DST) Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com id WAA23415; Wed, 27 Sep 2000 22:48:19 +0200 (MET DST) Date: Wed, 27 Sep 2000 22:48:19 +0200 (MET DST) Message-Id: <200009272048.WAA23415@opensource.ee.ethz.ch> From: barbier@sw.engelschall.com Subject: cvs commit: wml/wml_backend/p8_htmlstrip htmlstrip.src To: sw-wml-dev@engelschall.com Sender: owner-sw-wml-dev@engelschall.com Precedence: bulk Reply-To: sw-wml-dev@engelschall.com X-Sender: barbier@sw.engelschall.com X-List-Manager: Majordomo [version 1.94.4] X-List-Name: sw-wml-dev barbier 27-Sep-2000 22:48:19 Modified: . ChangeLog wml_backend/p8_htmlstrip htmlstrip.src Log: *) Fix wml_p8_htmlstrip (27-Sep-2000): The 
 and  tags were always converted to lowercase
         letters.
         [Nobuyuki Tsuchimura]
  
  Revision  Changes    Path
  1.216     +5 -0      wml/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- ChangeLog	2000/09/27 20:45:32	1.215
  +++ ChangeLog	2000/09/27 20:48:15	1.216
  @@ -10,6 +10,11 @@
   
     Changes between 2.0.4 and SNAP:
   
  +    *) Fix wml_p8_htmlstrip (27-Sep-2000):
  +       The <pre> and <xmp> tags were always converted to lowercase
  +       letters.
  +       [Nobuyuki Tsuchimura]
  +
       *) Fix compilation on AIX 4.3 (27-Sep-2000):
          The GD library did not compile because two unused routines depend
          upon undefined ones.  These useless routines are now removed.
  
  
  1.9       +4 -3      wml/wml_backend/p8_htmlstrip/htmlstrip.src
  
  Index: htmlstrip.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_backend/p8_htmlstrip/htmlstrip.src,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- htmlstrip.src	2000/08/01 21:33:18	1.8
  +++ htmlstrip.src	2000/09/27 20:48:17	1.9
  @@ -301,20 +301,21 @@
               $OUTPUT .= $o;
   
               #   if end tag not found, extend string
  -            if ($epilog =~ s|^(.*?)</$tagname>||is) {
  +            if ($epilog =~ s|^(.*?)(</$tagname>)||is) {
                   $body   = $1;
  +                $endtag = $2;
               }
               else {
                   $INPUT = $curtag . $epilog . $NEXT;
                   last;
               }
   
  -            $str = sprintf "found </$tagname> at position %d",
  +            $str = sprintf "found $endtag at position %d",
                   $loc+$pos+length($body);
               &verbose($str);
               $OUTPUT .= $curtag if (not $TAGS{$tagname});
               $OUTPUT .= &StripPreformatted($body);
  -            $OUTPUT .= "</$tagname>" if (not $TAGS{$tagname});
  +            $OUTPUT .= $endtag if (not $TAGS{$tagname});
               $loc  += $pos + length($body) + length($curtag);
               $INPUT = $epilog;
               next;
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Thu Sep 28 14:37:07 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id OAA21203; Thu, 28 Sep 2000 14:37:05 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id OAA21198; Thu, 28 Sep 2000 14:37:02 +0200 (MET DST)
Date: Thu, 28 Sep 2000 14:37:02 +0200 (MET DST)
Message-Id: <200009281237.OAA21198@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_backend/p8_htmlstrip htmlstrip.src
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     28-Sep-2000 14:37:02

  Modified:    .        CREDITS ChangeLog
               wml_backend/p8_htmlstrip htmlstrip.src
  Log:
      *) Fix infinite loop in wml_p8_htmlstrip (28-Sep-2000):
         WML hangs up when large text blocks are surrounded by
         <pre>...</pre> or similar tags.
         [Joey Hess <joeyh@debian.org>]
  
  Revision  Changes    Path
  1.25      +2 -0      wml/CREDITS
  1.217     +5 -0      wml/ChangeLog
  
  Index: CREDITS
  ===================================================================
  RCS file: /e/wml/cvs/wml/CREDITS,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CREDITS	2000/09/27 20:45:33	1.24
  +++ CREDITS	2000/09/28 12:36:57	1.25
  @@ -45,6 +45,7 @@
     o Jim Hebert            <jhebert@compu-aid.com>
     o Karl M. Hegbloom      <karlheg@bittersweet.inetarena.com>
     o Oliver Hensel         <oliver.hensel@gmx.de>
  +  o Joey Hess             <joeyh@debian.org>
     o Andreas Hofmeister    <hofmeist@informatik.uni-freiburg.de>
     o Andrew S. Howell      <andy@tibcofinance.com>
     o Graham Hughes         <thrag@treepeople.dyn.ml.org>
  @@ -77,6 +78,7 @@
     o John Ranck            <ranck@husc.harvard.edu>
     o Christian Reiber      <chrei@en.muc.de>
     o Laurent Riesterer     <riesterer@celar.fr>
  +  o Josip Rodin           <joy@cibalia.gkvk.hr>
     o Thomas Roessler       <roessler@guug.de>
     o Roland Rosenfeld      <roland@spinnaker.rhein.de>
     o Heiko Schlittermann   <heiko@lotte.sax.de>
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.216
  retrieving revision 1.217
  diff -u -r1.216 -r1.217
  --- ChangeLog	2000/09/27 20:48:15	1.216
  +++ ChangeLog	2000/09/28 12:36:57	1.217
  @@ -10,6 +10,11 @@
   
     Changes between 2.0.4 and SNAP:
   
  +    *) Fix infinite loop in wml_p8_htmlstrip (28-Sep-2000):
  +       WML hangs up when large text blocks are surrounded by
  +       <pre>...</pre> or similar tags.
  +       [Joey Hess <joeyh@debian.org>]
  +
       *) Fix wml_p8_htmlstrip (27-Sep-2000):
          The <pre> and <xmp> tags were always converted to lowercase
          letters.
  
  
  1.10      +1 -0      wml/wml_backend/p8_htmlstrip/htmlstrip.src
  
  Index: htmlstrip.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_backend/p8_htmlstrip/htmlstrip.src,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- htmlstrip.src	2000/09/27 20:48:17	1.9
  +++ htmlstrip.src	2000/09/28 12:37:00	1.10
  @@ -307,6 +307,7 @@
               }
               else {
                   $INPUT = $curtag . $epilog . $NEXT;
  +                $chunksize += $opt_b;
                   last;
               }
   
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct  2 10:18:31 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id KAA02881; Mon, 2 Oct 2000 10:18:30 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id KAA02866; Mon, 2 Oct 2000 10:18:19 +0200 (MET DST)
Date: Mon, 2 Oct 2000 10:18:19 +0200 (MET DST)
Message-Id: <200010020818.KAA02866@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_test/t 11-wmk.t
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     02-Oct-2000 10:18:19

  Modified:    .        ChangeLog CREDITS
               wml_frontend wmk.src wml.src
               wml_test/t 11-wmk.t
  Log:
      *) Improve flags handling (02-Oct-2000):
         Some flags require an argument, which is now quoted in case this
         argument contains spaces or shell metacharacters.
         [Albert Reiner <areiner@tph.tuwien.ac.at>]
  
  Revision  Changes    Path
  1.218     +5 -0      wml/ChangeLog
  1.26      +1 -0      wml/CREDITS
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.217
  retrieving revision 1.218
  diff -u -r1.217 -r1.218
  --- ChangeLog	2000/09/28 12:36:57	1.217
  +++ ChangeLog	2000/10/02 08:18:12	1.218
  @@ -10,6 +10,11 @@
   
     Changes between 2.0.4 and SNAP:
   
  +    *) Improve flags handling (02-Oct-2000):
  +       Some flags require an argument, which is now quoted in case this
  +       argument contains spaces or shell metacharacters.
  +       [Albert Reiner <areiner@tph.tuwien.ac.at>]
  +
       *) Fix infinite loop in wml_p8_htmlstrip (28-Sep-2000):
          WML hangs up when large text blocks are surrounded by
          <pre>...</pre> or similar tags.
  
  Index: CREDITS
  ===================================================================
  RCS file: /e/wml/cvs/wml/CREDITS,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- CREDITS	2000/09/28 12:36:57	1.25
  +++ CREDITS	2000/10/02 08:18:12	1.26
  @@ -77,6 +77,7 @@
     o Xose Manoel Ramos     <xmanoel@bigfoot.com>
     o John Ranck            <ranck@husc.harvard.edu>
     o Christian Reiber      <chrei@en.muc.de>
  +  o Albert Reiner         <areiner@tph.tuwien.ac.at>
     o Laurent Riesterer     <riesterer@celar.fr>
     o Josip Rodin           <joy@cibalia.gkvk.hr>
     o Thomas Roessler       <roessler@guug.de>
  
  
  1.31      +23 -19    wml/wml_frontend/wmk.src
  1.65      +1 -1      wml/wml_frontend/wml.src
  
  Index: wmk.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_frontend/wmk.src,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- wmk.src	2000/05/04 14:14:11	1.30
  +++ wmk.src	2000/10/02 08:18:15	1.31
  @@ -195,6 +195,23 @@
   ##   CREATE WML COMMAND
   ##
   
  +#   escape options if not quoted but
  +#   when shell metachars exists
  +sub quotearg {
  +    my ($arg) = @_;
  +    if ($arg !~ m|^'.*'$|) {
  +        if ($arg =~ m|[\$"`]|) {
  +            $arg =~ s|([\$"`])|\\$1|sg;
  +        }
  +    }
  +    return $arg;
  +}
  +
  +sub addquotedarg {
  +    my ($flag, $arg) = @_;
  +    return ' -'.$flag.' "'.&quotearg($arg).'"';
  +}
  +
   $Oq = '';
   $Oq = ' -q' if ($opt_q);
   
  @@ -209,16 +226,16 @@
   foreach $a (@opt_p) { $Op .= ' -p'.$a; }
   
   $OW = '';
  -foreach $a (@opt_W) { $OW .= ' -W'.$a; }
  +foreach $a (@opt_W) { $OW .= &addquotedarg('W', $a); }
   
   $OD = '';
  -foreach $a (@opt_D) { $OD .= ' -D "'.&quotearg($a).'"'; }
  +foreach $a (@opt_D) { $OD .= &addquotedarg('D', $a); }
   
   $OP = '';
  -foreach $a (@opt_P) { $OP .= ' -P '.$a; }
  +foreach $a (@opt_P) { $OP .= &addquotedarg('P', $a); }
   
   $OE = '';
  -foreach $a (@opt_E) { $OE .= ' -E '.$a; }
  +foreach $a (@opt_E) { $OE .= &addquotedarg('E', $a); }
   
   $OM = '';
   $OM = " -M$opt_M" if ($opt_M ne '-');
  @@ -233,10 +250,10 @@
   $Os = ' -s' if ($opt_s);
   
   $OI = '';
  -foreach $a (@opt_I) { $OI .= ' -I '.$a; }
  +foreach $a (@opt_I) { $OI .= &addquotedarg('I', $a); }
   
   $Oi = '';
  -foreach $a (@opt_i) { $Oi .= ' -i '.$a; }
  +foreach $a (@opt_i) { $Oi .= &addquotedarg('i', $a); }
   
   $OO = '';
   $OO = ' -O'.$opt_O if ($opt_O ne '');
  @@ -526,19 +543,6 @@
           }
       }
       return @argv;
  -}
  -
  -#   escape options if not quoted but
  -#   when shell metachars exists
  -sub quotearg {
  -    my ($arg) = @_;
  -    if ($arg !~ m|^'.*'$| and $arg !~ m|^".*"$|) {
  -        if ($arg =~ m|[\[\]()!*?&"']|) {
  -            $arg =~ s|'|\\'|sg;
  -            $arg = "'".$arg."'";
  -        }
  -    }
  -    return $arg;
   }
   
   sub process_file {
  
  Index: wml.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_frontend/wml.src,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- wml.src	2000/09/19 21:35:25	1.64
  +++ wml.src	2000/10/02 08:18:15	1.65
  @@ -1049,7 +1049,7 @@
   #   determine prologs
   $prolog = '';
   foreach $p (@opt_P) {
  -    $prolog .= " -P '$p'";
  +    $prolog .= ' -P "'.&quotearg($p).'"';
   }
   
   $defipp = '';
  
  
  1.5       +3 -3      wml/wml_test/t/11-wmk.t
  
  Index: 11-wmk.t
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_test/t/11-wmk.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 11-wmk.t	2000/07/19 09:42:34	1.4
  +++ 11-wmk.t	2000/10/02 08:18:18	1.5
  @@ -38,18 +38,18 @@
   EOT_IN
   
   $rc = `$wmk a.wml 2>&1`;
  -print ($rc eq "$ENV{WML} -n -q -W1,-N -o a.html a.wml\n" ? "ok\n" : "not ok\n");
  +print ($rc eq "$ENV{WML} -n -q -W \"1,-N\" -o a.html a.wml\n" ? "ok\n" : "not ok\n");
   $rc = &TEST::system("cmp $tmpfile1 a.html");
   print ($rc == 0 ? "ok\n" : "not ok\n");
   
   $rc = `$wmk a.wml 2>&1`;
  -print ($rc eq "$ENV{WML} -n -q -W1,-N -o a.html a.wml  (${bold}skipped${norm})\n" ? "ok\n" : "not ok\n");
  +print ($rc eq "$ENV{WML} -n -q -W \"1,-N\" -o a.html a.wml  (${bold}skipped${norm})\n" ? "ok\n" : "not ok\n");
   
   open(OUT, ">>a");
   print OUT " ";
   close(OUT);
   $rc = `$wmk a.wml 2>&1`;
  -print ($rc eq "$ENV{WML} -n -q -W1,-N -o a.html a.wml\n" ? "ok\n" : "not ok\n");
  +print ($rc eq "$ENV{WML} -n -q -W \"1,-N\" -o a.html a.wml\n" ? "ok\n" : "not ok\n");
   
   &TEST::cleanup;
   
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct  2 10:20:10 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id KAA03015; Mon, 2 Oct 2000 10:20:09 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id KAA03009; Mon, 2 Oct 2000 10:20:05 +0200 (MET DST)
Date: Mon, 2 Oct 2000 10:20:05 +0200 (MET DST)
Message-Id: <200010020820.KAA03009@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_backend/p1_ipp ipp.src
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     02-Oct-2000 10:20:05

  Modified:    wml_backend/p1_ipp ipp.src
  Log:
  Fix documentation.
  
  Revision  Changes    Path
  1.37      +2 -2      wml/wml_backend/p1_ipp/ipp.src
  
  Index: ipp.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_backend/p1_ipp/ipp.src,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- ipp.src	2000/09/19 21:35:14	1.36
  +++ ipp.src	2000/10/02 08:20:03	1.37
  @@ -1049,8 +1049,8 @@
   
   This sets up one or more prolog program I<path> which are applied to each
   single input file just before real processing starts. Use this to pre-process
  -the data. The program gets the input filename to process as its first
  -argument. When it wants to filter it it has to overwrite the file.
  +the data.  Each program receives the data to act on as STDIN and has to
  +produce the filtered data on STDOUT.
   
   =item B<-m> I<mapfile>
   
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct  2 10:27:24 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id KAA03507; Mon, 2 Oct 2000 10:27:23 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id KAA03497; Mon, 2 Oct 2000 10:27:18 +0200 (MET DST)
Date: Mon, 2 Oct 2000 10:27:18 +0200 (MET DST)
Message-Id: <200010020827.KAA03497@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_include/des navbar.src
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     02-Oct-2000 10:27:17

  Modified:    .        ChangeLog
               wml_include/des navbar.src
  Log:
      *) Fix wml::des::navbar (02-Oct-2000):
         The $menumode Perl variable was not initialized.
         [Anthony Fok]
  
  Revision  Changes    Path
  1.219     +4 -0      wml/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.218
  retrieving revision 1.219
  diff -u -r1.218 -r1.219
  --- ChangeLog	2000/10/02 08:18:12	1.218
  +++ ChangeLog	2000/10/02 08:27:10	1.219
  @@ -10,6 +10,10 @@
   
     Changes between 2.0.4 and SNAP:
   
  +    *) Fix wml::des::navbar (02-Oct-2000):
  +       The $menumode Perl variable was not initialized.
  +       [Anthony Fok]
  +
       *) Improve flags handling (02-Oct-2000):
          Some flags require an argument, which is now quoted in case this
          argument contains spaces or shell metacharacters.
  
  
  1.34      +1 -0      wml/wml_include/des/navbar.src
  
  Index: navbar.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_include/des/navbar.src,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- navbar.src	2000/09/16 19:10:26	1.33
  +++ navbar.src	2000/10/02 08:27:14	1.34
  @@ -591,6 +591,7 @@
       #   import attributes to ePerl
       my $select      =  qq|<get-var select />|;
       my $subselected = (qq|<get-var subselected />| eq '' ? 1 : 0);
  +    my $menumode    =  qq|<get-var menumode />|;
       my $txtonly     = (qq|<get-var txtonly />|     eq '' ? 1 : 0);
       my $nohints     = (qq|<get-var nohints />|     eq '' ? 1 : 0);
   
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct  2 22:54:31 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id WAA01492; Mon, 2 Oct 2000 22:54:30 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id WAA01481; Mon, 2 Oct 2000 22:54:23 +0200 (MET DST)
Date: Mon, 2 Oct 2000 22:54:23 +0200 (MET DST)
Message-Id: <200010022054.WAA01481@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_contrib wml1to2
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     02-Oct-2000 22:54:23

  Modified:    .        ChangeLog
  Added:       wml_contrib wml1to2
  Log:
      *) Add wml_contrib/wml1to2 (02-Oct-2000):
         This script helps upgrading to WML 2.x by performing some
         changes in input files.
         [Denis Barbier]
  
  Revision  Changes    Path
  1.220     +5 -0      wml/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.219
  retrieving revision 1.220
  diff -u -r1.219 -r1.220
  --- ChangeLog	2000/10/02 08:27:10	1.219
  +++ ChangeLog	2000/10/02 20:54:17	1.220
  @@ -10,6 +10,11 @@
   
     Changes between 2.0.4 and SNAP:
   
  +    *) Add wml_contrib/wml1to2 (02-Oct-2000):
  +       This script helps upgrading to WML 2.x by performing some
  +       changes in input files.
  +       [Denis Barbier]
  +
       *) Fix wml::des::navbar (02-Oct-2000):
          The $menumode Perl variable was not initialized.
          [Anthony Fok]
  
  
  1.1                  wml/wml_contrib/wml1to2
  
  Index: wml1to2
  ===================================================================
  :
  eval 'exec perl -S $0 ${1+"$@"}'
      if $running_under_some_shell;
  
  #
  #  wml1to2 --  Upgrade input files from WML 1.x to WML 2.x
  #  Copyright 2000 Denis Barbier. All rights reserved.
  #  This program is free software released under the GNU General
  #  Public License v2.
  #
  #     This tool updates input files to make them suitable with WML 2.x
  #     Transformation is made in place, so making backups before running
  #     this script is a wise idea.
  #
  #     Documentation can be viewed with
  #         perldoc wml1to2
  #
  
  sub usage {
      print STDERR "Usage: wml1to2 file1 file2 ...\n\n";
      print STDERR "   Warning: files are written in place, so make sure you\n";
      print STDERR "            performed backups before running this script\n\n";
  }
  
  $warn = 0;
  sub WarnIfPresent {
      my ($pattern, $string) = @_;
      if ($string =~ m|\b$pattern\b|s) {
          print STDERR "Warning: $pattern found\n";
          $warn = 1;
      }
  }
  
  if ($#ARGV == -1) {
      &usage;
      exit(1);
  }
  
  foreach (@ARGV) {
      if (m/^-/) {
          &usage;
          exit(1);
      } elsif (! -f) {
          print STDERR "File " . $_ . " not found: skipped\n";
          next;
      }
  
      #   Okay, processing can take place
      my ($infile, $outfile) = ($_, $_ . ".".$$);
      if (-e $outfile) {
          print STDERR "File " . $outfile . " does already exist, so input file "
                       . $infile . " is skipped\n";
      }
  
      #   Read input file
      local($/) = undef;
      open(IN, "< $infile") or die "Unable to read file " . $infile;;
      my ($text) = <IN>;
      close(IN);
  
      $_ = $text;
  
      #   Perform substitution.  See README.mp4h for details
      #      Macro definitions
      s|<defsubst|<define-tag|g;
      s|</defsubst|</define-tag|g;
  
      s|<define-container(\s+[^\s>]+)|<define-tag$1 endtag=required|sg;
      s|</define-container|</define-tag|g;
  
      s|<defmacro(\s+[^\s>]+)|<define-tag$1 endtag=required|sg;
      s|</defmacro|</define-tag|g;
  
      s|\%[qx]body|\%body|g;
  
      #      Grouping
      s|<prog\b|<group|g;
      s|<concat\b|<group|g;
  
      #      Arithmetic functions
      s|<sub\b|<substract|g;
      s|<mul\b|<multiply|g;
      s|<mod\b|<modulo|g;
  
      #      Diversion tags
      s|<<([a-zA-Z][a-zA-Z0-9_]*)>>|{#$1#}|g;
      s|\.\.(\!?[a-zA-Z][a-zA-Z0-9_]*\!?)>>|{#$1#:|g;
      s|<<\.\.|:##}|g;
      s|<<(\!?[a-zA-Z][a-zA-Z0-9_]*\!?)\.\.|:#$1#}|g;
  
      s|({#\!?[a-zA-Z][a-zA-Z0-9_]*\!?):|$1#:|g;
      s|:#}|:##}|g;
      s|:(\!?[a-zA-Z][a-zA-Z0-9_]*\!?#})|:#$1|g;
  
      #      Detect possible cause of problems
      &WarnIfPresent('define-container', $_);
      &WarnIfPresent('<define-function', $_);
      &WarnIfPresent('<defun', $_);
      &WarnIfPresent('<defweakmacro', $_);
      &WarnIfPresent('<div', $_);
      &WarnIfPresent('<%%eval', $_);
  
      $text = $_;
  
      #   And prints text to file
      open(OUT, "> $outfile") or die "Unable to write to file " . $outfile;
      print OUT $text;
      close(OUT);
      rename($outfile, $infile) or die "Unable to write to file " .  $infile;
  }
  
  if ($warn) {
      print STDERR "Check previous warnings carefully and make sure there is no trouble with them.\n";
  }
  
  1;
  
  ##EOF##
  __END__
  
  =head1 NAME
  
  wml1to2 - Make WML input files ready for WML 2.x
  
  =head1 SYNOPSIS
  
  B<wml1to2>
  I<inputfile>
  [I<inputfile>]
  ...
  
  To apply this script recursively on all files of a directory, call
  
      find my_path -type f -exec wml1to2 {} \;
  
  It is also possible to process only WML input files, e.g.
  
      find my_path -name \*.wml -exec wml1to2 {} \;
  
  See the find(1) manpage for details.
  
  =head1 DESCRIPTION
  
  This program transforms files to make them suitable for WML 2.x.  As
  transformations are performed in place, you should always backup your
  datas before applying this program.  You have been warned.
  
  This paragraph explains which operations are performed to input text.
  For more details on incompatibilities between WML 1.x and WML 2.x, read
  the C<README.mp4h> file shipped with the distribution.
  
  =over 4
  
  =item Macro Functions
  
  The C<E<lt>define-tagE<gt>> command replaces C<E<lt>defsubstE<gt>>, C<E<lt>define-containerE<gt>> and
  C<E<lt>defmacroE<gt>>.  On the other hand, C<E<lt>define-functionE<gt>>, C<E<lt>defunE<gt>> and 
  C<E<lt>defweakmacroE<gt>> have no equivalent and should be rewritten.
  
  Special sequences C<%qbody> and C<%xbody> are replaced by C<%body>.
  
  =item Group Functions
  
  The C<E<lt>groupE<gt>> command replaces C<E<lt>progE<gt>> and C<E<lt>concatE<gt>>.
  
  =item Arithmetic Functions
  
  This was necessary because C<E<lt>divE<gt>> is a valid HTML tag, so division is
  now performed with C<E<lt>divideE<gt>>.  But it is not an easy task to
  determine if a C<E<lt>divE<gt>> tag has to be replaced by
  C<E<lt>divideE<gt>>, so a warning is raised and no transformations are
  performed.
  
  Other mathematical functions also use a longer name: C<E<lt>mulE<gt>> is
  replaced by C<E<lt>multiplyE<gt>>, C<E<lt>subE<gt>> by C<E<lt>substractE<gt>>
  and C<E<lt>modE<gt>> by C<E<lt>moduloE<gt>>.
  
  =item Diversion Tags
  
  In WML 1.x, casual diversion commands are
  C<E<lt>E<lt>NAMEE<gt>E<gt>>, C<..NAMEE<gt>E<gt>> and C<E<lt>E<lt>NAME..>,
  but strange results may occur if these names have been defined by
  wml_p2_mp4h.
  For this reason, these forms have been deprecated since WML 1.7.3 in
  favor of C<{#NAME#}>, C<{#NAME:> and C<:NAME#}>.  This caused some
  performance problems, and eventually WML 2.x use C<{#NAME#}>,
  C<{#NAME#:> and C<:#NAME#}>.
  
  =back
  
  =head1 AUTHOR
  
   Denis Barbier
   barbier@imacs.polytechnique.fr
  
  =cut
  
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct  2 22:57:46 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id WAA01729; Mon, 2 Oct 2000 22:57:44 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id WAA01711; Mon, 2 Oct 2000 22:57:36 +0200 (MET DST)
Date: Mon, 2 Oct 2000 22:57:36 +0200 (MET DST)
Message-Id: <200010022057.WAA01711@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml MANIFEST
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     02-Oct-2000 22:57:35

  Modified:    .        MANIFEST
  Log:
  Fix MANIFEST file
  
  Revision  Changes    Path
  1.23      +1 -0      wml/MANIFEST
  
  Index: MANIFEST
  ===================================================================
  RCS file: /e/wml/cvs/wml/MANIFEST,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- MANIFEST	2000/09/04 05:32:37	1.22
  +++ MANIFEST	2000/10/02 20:57:34	1.23
  @@ -338,6 +338,7 @@
   wml_contrib/wmg.cgi
   wml_contrib/wml.spec
   wml_contrib/wml.vim
  +wml_contrib/wml1to2
   wml_docs/Makefile.in
   wml_docs/wml_barebone.txt
   wml_docs/wml_faq.pod
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Tue Oct  3 00:20:25 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id AAA09138; Tue, 3 Oct 2000 00:20:25 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id AAA09132; Tue, 3 Oct 2000 00:20:21 +0200 (MET DST)
Date: Tue, 3 Oct 2000 00:20:21 +0200 (MET DST)
Message-Id: <200010022220.AAA09132@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml NEWS
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     03-Oct-2000 00:20:20

  Modified:    .        NEWS
  Log:
  Make `diversion changes' more proeminent in NEWS file.
  
  Revision  Changes    Path
  1.9       +3 -1      wml/NEWS
  
  Index: NEWS
  ===================================================================
  RCS file: /e/wml/cvs/wml/NEWS,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- NEWS	2000/04/14 09:53:11	1.8
  +++ NEWS	2000/10/02 22:20:19	1.9
  @@ -38,7 +38,9 @@
           pass 5 used expressions containing angle characters.  In many
           situations this could confuse pass 2, and so an alternate form
           without angle characters is preferred.  Old syntax is still
  -        valid but should be avoided.
  +        valid but should be avoided.  Note also that WML 1.7.3 and
  +        1.7.4 provided a slightly different syntax which is not
  +        supported anymore.
   
         - New include files:
             wml::std::label implements labels and references
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Fri Oct 13 00:23:16 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id AAA21620; Fri, 13 Oct 2000 00:23:15 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id AAA21604; Fri, 13 Oct 2000 00:23:09 +0200 (MET DST)
Date: Fri, 13 Oct 2000 00:23:09 +0200 (MET DST)
Message-Id: <200010122223.AAA21604@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_frontend wmd.src
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     13-Oct-2000 00:23:09

  Modified:    .        ChangeLog Makefile.in
               wml_frontend wmd.src
  Log:
      *) Improve WMd customization (13-Oct-2000):
         The 02-May-2000 patch is improved, mapping is now done via an
         external file, so that wmd script needs no more being updated.
         [Denis Barbier]
  
  Revision  Changes    Path
  1.221     +5 -0      wml/ChangeLog
  1.47      +3 -0      wml/Makefile.in
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.220
  retrieving revision 1.221
  diff -u -r1.220 -r1.221
  --- ChangeLog	2000/10/02 20:54:17	1.220
  +++ ChangeLog	2000/10/12 22:23:01	1.221
  @@ -10,6 +10,11 @@
   
     Changes between 2.0.4 and SNAP:
   
  +    *) Improve WMd customization (13-Oct-2000):
  +       The 02-May-2000 patch is improved, mapping is now done via an
  +       external file, so that wmd script needs no more being updated.
  +       [Denis Barbier]
  +
       *) Add wml_contrib/wml1to2 (02-Oct-2000):
          This script helps upgrading to WML 2.x by performing some
          changes in input files.
  
  Index: Makefile.in
  ===================================================================
  RCS file: /e/wml/cvs/wml/Makefile.in,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- Makefile.in	2000/09/18 08:43:04	1.46
  +++ Makefile.in	2000/10/12 22:23:03	1.47
  @@ -118,6 +118,9 @@
   	$(INSTALL_SCRIPT) wml_frontend/wmd.pl $(bindir)/wmd
   	$(INSTALL_DATA) wml_frontend/wmd.1 $(mandir)/man1/wmd.1
   	$(INSTALL_DATA) wml_frontend/wmd.txt $(libdir)/aux/wmd.txt
  +	if [ -f wml_frontend/wmd.map ]; then \
  +                $(INSTALL_DATA) wml_frontend/wmd.map $(libdir)/aux/wmd.map; \
  +	else :; fi
   	$(INSTALL_DATA) wml_frontend/wmd_missing.1 $(mandir)/man1/wmd_missing.1
   	$(INSTALL_SCRIPT) wml_frontend/wmb.pl $(bindir)/wmb
   	$(INSTALL_DATA) wml_frontend/wmb.1 $(mandir)/man1/wmb.1
  
  
  1.13      +8 -0      wml/wml_frontend/wmd.src
  
  Index: wmd.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_frontend/wmd.src,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- wmd.src	2000/09/15 06:15:37	1.12
  +++ wmd.src	2000/10/12 22:23:07	1.13
  @@ -110,6 +110,14 @@
   ##  manpage.
   ##  By default there is no mapping
   %map = ();
  +if (-r "@libdir@/aux/wmd.map") {
  +    if (open(MAP, "< @libdir@/aux/wmd.map")) {
  +        while (<MAP>) {
  +            s/^(.*)=(.*)$/$map{$1} = $2/e;
  +        }
  +        close(MAP);
  +    }
  +}
   
   ##
   ##  Find browser
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Fri Oct 13 22:03:31 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id WAA28676; Fri, 13 Oct 2000 22:03:30 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id WAA28665; Fri, 13 Oct 2000 22:03:26 +0200 (MET DST)
Date: Fri, 13 Oct 2000 22:03:26 +0200 (MET DST)
Message-Id: <200010132003.WAA28665@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_frontend wmd.src
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     13-Oct-2000 22:03:26

  Modified:    wml_frontend wmd.src
  Log:
  Minor changes
  
  Revision  Changes    Path
  1.14      +1 -1      wml/wml_frontend/wmd.src
  
  Index: wmd.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_frontend/wmd.src,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- wmd.src	2000/10/12 22:23:07	1.13
  +++ wmd.src	2000/10/13 20:03:24	1.14
  @@ -113,7 +113,7 @@
   if (-r "@libdir@/aux/wmd.map") {
       if (open(MAP, "< @libdir@/aux/wmd.map")) {
           while (<MAP>) {
  -            s/^(.*)=(.*)$/$map{$1} = $2/e;
  +            s/^\s*(.*?)\s*=\s*(.*?)\s*$/$map{$1} = $2/e;
           }
           close(MAP);
       }
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct 16 13:18:29 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id NAA01378; Mon, 16 Oct 2000 13:18:28 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for <sw-wml-dev@engelschall.com>
	from imacs.polytechnique.fr id NAA01370; Mon, 16 Oct 2000 13:18:23 +0200 (MET DST)
Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian))
	id 13l8Il-000223-00; Mon, 16 Oct 2000 13:19:31 +0200
Date: Mon, 16 Oct 2000 13:19:31 +0200
From: Denis Barbier <barbier@imacs.polytechnique.fr>
To: sw-wml-dev@engelschall.com
Subject: Branching
Message-ID: <20001016131931.A7801@imacs.polytechnique.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
User-Agent: Mutt/1.0.1i
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: Denis Barbier <barbier@imacs.polytechnique.fr>
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

Hi Ralf,

i would like to package WML 2.0.5 to fix known bugs, and i believe it is
time to start branching. In few words, what branches do we need?

Denis
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct 16 15:27:14 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id PAA08751; Mon, 16 Oct 2000 15:27:13 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for <sw-wml-dev@en5.engelschall.com>
	from slarti.muc.de id PAA08742; Mon, 16 Oct 2000 15:27:06 +0200 (MET DST)
Received: (qmail 2880 invoked by uid 66); 16 Oct 2000 13:34:09 -0000
Received: from en by slarti with UUCP; Mon Oct 16 13:34:09 2000 -0000
Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com
	id e9GDF4S14992; Mon, 16 Oct 2000 15:15:04 +0200 (CEST)
Date: Mon, 16 Oct 2000 15:15:04 +0200
From: "Ralf S. Engelschall" <rse@engelschall.com>
To: sw-wml-dev@engelschall.com
Subject: Re: Branching
Message-ID: <20001016151504.A14706@engelschall.com>
References: <20001016131931.A7801@imacs.polytechnique.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20001016131931.A7801@imacs.polytechnique.fr>; from barbier@imacs.polytechnique.fr on Mon, Oct 16, 2000 at 01:19:31PM +0200
Organization: Engelschall, Germany.
X-Web-Homepage: http://www.engelschall.com/
X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc
X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: "Ralf S. Engelschall" <rse@engelschall.com>
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

On Mon, Oct 16, 2000, Denis Barbier wrote:

> i would like to package WML 2.0.5 to fix known bugs, and i believe it is
> time to start branching. In few words, what branches do we need?

Only a single one, I think. After you rolled 2.0.5 and tagged the HEAD
with WML_2_0_5 you should create the branch WML_2_0 with:

$ cvs tag WML_2_0_BP
$ cvs tag -b WML_2_0

Then the forthcoming 2.0.N should be done by merging fixes from HEAD to
the WML_2_0 branch. Any development should be done only on HEAD. After
branching you also should move the HEAD to read "version 2.1aNN".

                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct 16 16:50:26 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id QAA14575; Mon, 16 Oct 2000 16:50:25 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) via ESMTP for <sw-wml-dev@engelschall.com>
	from imacs.polytechnique.fr id QAA14570; Mon, 16 Oct 2000 16:50:21 +0200 (MET DST)
Received: from barbier by imacs.polytechnique.fr with local (Exim 3.12 #1 (Debian))
	id 13lBay-0002Fb-00; Mon, 16 Oct 2000 16:50:32 +0200
Date: Mon, 16 Oct 2000 16:50:32 +0200
From: Denis Barbier <barbier@imacs.polytechnique.fr>
To: sw-wml-dev@engelschall.com
Subject: Re: Branching
Message-ID: <20001016165032.A8309@imacs.polytechnique.fr>
References: <20001016131931.A7801@imacs.polytechnique.fr> <20001016151504.A14706@engelschall.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
User-Agent: Mutt/1.0.1i
In-Reply-To: <20001016151504.A14706@engelschall.com>; from rse@engelschall.com on Mon, Oct 16, 2000 at 03:15:04PM +0200
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: Denis Barbier <barbier@imacs.polytechnique.fr>
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

On Mon, Oct 16, 2000 at 03:15:04PM +0200, Ralf S. Engelschall wrote:

> On Mon, Oct 16, 2000, Denis Barbier wrote:
> 
> > i would like to package WML 2.0.5 to fix known bugs, and i believe it is
> > time to start branching. In few words, what branches do we need?
> 
> Only a single one, I think. After you rolled 2.0.5 and tagged the HEAD
> with WML_2_0_5 you should create the branch WML_2_0 with:
> 
> $ cvs tag WML_2_0_BP
> $ cvs tag -b WML_2_0
> 
> Then the forthcoming 2.0.N should be done by merging fixes from HEAD to
> the WML_2_0 branch. Any development should be done only on HEAD. After
> branching you also should move the HEAD to read "version 2.1aNN".

Okay, thanks.

Another (not related) question: do you want me to include your ePerl
development version into WML development branch?

Denis
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct 16 17:44:57 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id RAA18668; Mon, 16 Oct 2000 17:44:56 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) via SMTP for <sw-wml-dev@en5.engelschall.com>
	from slarti.muc.de id RAA18639; Mon, 16 Oct 2000 17:44:38 +0200 (MET DST)
Received: (qmail 22891 invoked by uid 66); 16 Oct 2000 15:51:36 -0000
Received: from en by slarti with UUCP; Mon Oct 16 15:51:36 2000 -0000
Received: by en1.engelschall.com (Sendmail 8.11.0+) for sw-wml-dev@engelschall.com
	id e9GFi2T20340; Mon, 16 Oct 2000 17:44:02 +0200 (CEST)
Date: Mon, 16 Oct 2000 17:44:02 +0200
From: "Ralf S. Engelschall" <rse@engelschall.com>
To: sw-wml-dev@engelschall.com
Subject: Re: Branching
Message-ID: <20001016174402.A20185@engelschall.com>
References: <20001016131931.A7801@imacs.polytechnique.fr> <20001016151504.A14706@engelschall.com> <20001016165032.A8309@imacs.polytechnique.fr>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <20001016165032.A8309@imacs.polytechnique.fr>; from barbier@imacs.polytechnique.fr on Mon, Oct 16, 2000 at 04:50:32PM +0200
Organization: Engelschall, Germany.
X-Web-Homepage: http://www.engelschall.com/
X-PGP-Public-Key: https://www.engelschall.com/ho/rse/pgprse.asc
X-PGP-Fingerprint: 00 C9 21 8E D1 AB 70 37 DD 67 A2 3A 0A 6F 8D A5
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: "Ralf S. Engelschall" <rse@engelschall.com>
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

On Mon, Oct 16, 2000, Denis Barbier wrote:

> [...]
> Another (not related) question: do you want me to include your ePerl
> development version into WML development branch?

Yes, we really have to proceed with the ePerl 2.3 version and also make
sure WML uses the same stuff in order to avoid that any patches are
missing either in official ePerl or in WML's version. I really want to
see the two in sync. And... hmmm... yes, I really have to find time to
finally kickout ePerl 2.3 after more checking its latest state.

                                       Ralf S. Engelschall
                                       rse@engelschall.com
                                       www.engelschall.com
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct 23 22:57:05 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id WAA15415; Mon, 23 Oct 2000 22:57:04 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id WAA15404; Mon, 23 Oct 2000 22:56:57 +0200 (MET DST)
Date: Mon, 23 Oct 2000 22:56:57 +0200 (MET DST)
Message-Id: <200010232056.WAA15404@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_include/std page.src
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     23-Oct-2000 22:56:56

  Modified:    .        ChangeLog CREDITS
               wml_include/std page.src
  Log:
      *) Improve wml::std::page (23-Oct-2000):
         Add an attribute ``color=none'' to remove color attributes in
         the <body> tag.
         [Wayne Schlitt <wayne@midwestcs.com>]
  
  Revision  Changes    Path
  1.222     +6 -1      wml/ChangeLog
  1.27      +1 -0      wml/CREDITS
  
  Index: ChangeLog
  ===================================================================
  RCS file: /e/wml/cvs/wml/ChangeLog,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -r1.221 -r1.222
  --- ChangeLog	2000/10/12 22:23:01	1.221
  +++ ChangeLog	2000/10/23 20:56:51	1.222
  @@ -8,7 +8,12 @@
     information about every single change.
     ___________________________________________________________________________
   
  -  Changes between 2.0.4 and SNAP:
  +  Changes between 2.0.4 and 2.0.5:
  +
  +    *) Improve wml::std::page (23-Oct-2000):
  +       Add an attribute ``color=none'' to remove color attributes in
  +       the <body> tag.
  +       [Wayne Schlitt <wayne@midwestcs.com>]
   
       *) Improve WMd customization (13-Oct-2000):
          The 02-May-2000 patch is improved, mapping is now done via an
  
  Index: CREDITS
  ===================================================================
  RCS file: /e/wml/cvs/wml/CREDITS,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- CREDITS	2000/10/02 08:18:12	1.26
  +++ CREDITS	2000/10/23 20:56:52	1.27
  @@ -82,6 +82,7 @@
     o Josip Rodin           <joy@cibalia.gkvk.hr>
     o Thomas Roessler       <roessler@guug.de>
     o Roland Rosenfeld      <roland@spinnaker.rhein.de>
  +  o Wayne Schlitt         <wayne@midwestcs.com>
     o Heiko Schlittermann   <heiko@lotte.sax.de>
     o Steve Sizemore        <steve@cmpharm.ucsf.edu>
     o Joey Smith            <joey@joeysmith.com>
  
  
  1.16      +9 -2      wml/wml_include/std/page.src
  
  Index: page.src
  ===================================================================
  RCS file: /e/wml/cvs/wml/wml_include/std/page.src,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- page.src	2000/08/03 21:47:26	1.15
  +++ page.src	2000/10/23 20:56:55	1.16
  @@ -18,7 +18,7 @@
   #   the new PAGE tag
   #
   <define-tag page>
  -<preserve title indent info background bgcolor text link alink vlink
  +<preserve title indent info background color bgcolor text link alink vlink
             onload slices />
   <set-var info=* />
   <set-var slices=* />
  @@ -32,11 +32,13 @@
   {#WML_PAGE_HEAD_<get-var __std_page_cnt />#}\
   </head*>
   <body*<if <get-var background /> " background=\"<get-var background />\"" "" />\
  +      <when <not <get-var color /> />>\
         <if <get-var bgcolor /> <group <ifeq "<get-var bgcolor />" "none" "" " bgcolor=\"<get-var bgcolor />\"" /> /> " bgcolor=\"#ffffff\"" />\
         <if <get-var text /> " text=\"<get-var text />\"" " text=\"#000000\"" />\
         <if <get-var link /> " link=\"<get-var link />\"" " link=\"#333399\"" />\
         <if <get-var alink /> " alink=\"<get-var alink />\"" " alink=\"#9999ff\"" />\
         <if <get-var vlink /> " vlink=\"<get-var vlink />\"" " vlink=\"#000066\"" />\
  +      </when>\
         <if <get-var onload /> " onload=\"<get-var onload />\"" "" />\
   >
   <set-var __i=0 />
  @@ -54,7 +56,7 @@
   </body*>
   </html*><ifeq "<get-var slices />" "" ":WML_STDPAGE_FOOT]" />
   {#WML_PAGE_BODY_<get-var __std_page_cnt />#:\
  -<restore  title indent info background bgcolor text link alink vlink
  +<restore  title indent info background color bgcolor text link alink vlink
             onload slices />
   </define-tag>
   
  @@ -152,6 +154,11 @@
   This just corresponds to the same attribute of the C<E<lt>bodyE<gt>> tag and
   sets the color for already visited hyperlinks. Default is C<text="#000066">
   (dark blue).
  +
  +=item C<color>
  +
  +When setting C<color="none">, the five previous attributes are not put
  +into the C<E<lt>bodyE<gt>> tag.
   
   =item C<onload>
   
  
  
______________________________________________________________________
Website META Language (WML)                www.engelschall.com/sw/wml/
Developer Mailing List                      sw-wml-dev@engelschall.com
Automated List Manager                       majordomo@engelschall.com

From owner-sw-wml-dev@engelschall.com  Mon Oct 23 23:00:43 2000
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev-L
	id XAA15727; Mon, 23 Oct 2000 23:00:42 +0200 (MET DST)
Received: by en5.engelschall.com (Sendmail 8.9.2) for sw-wml-dev@engelschall.com
	id XAA15717; Mon, 23 Oct 2000 23:00:34 +0200 (MET DST)
Date: Mon, 23 Oct 2000 23:00:34 +0200 (MET DST)
Message-Id: <200010232100.XAA15717@opensource.ee.ethz.ch>
From: barbier@sw.engelschall.com
Subject: cvs commit: wml/wml_frontend wmd.txt
To: sw-wml-dev@engelschall.com
Sender: owner-sw-wml-dev@engelschall.com
Precedence: bulk
Reply-To: sw-wml-dev@engelschall.com
X-Sender: barbier@sw.engelschall.com
X-List-Manager: Majordomo [version 1.94.4]
X-List-Name: sw-wml-dev

barbier     23-Oct-2000 23:00:33

  Modified:    .        README VERSION VERSION.HISTORY
               wml_frontend wmd.txt
  Log:
  Change version number
  
  Revision  Changes    Path
  1.40      +1 -1      wml/README
  1.43      +1 -1      wml/VERSION
  1.18      +1 -0      wml/VERSION.HISTORY
  
  Index: README
  ===================================================================
  RCS file: /e/wml/cvs/wml/README,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- README	2000/09/18 08:46:46	1.39
  +++ README	2000/10/23 21:00:28	1.40
  @@ -4,7 +4,7 @@
       \ V  V /| |  | | |___   ``WML is the Unix toolkit for getting
        \_/\_/ |_|  |_|_____|    your webdesigner's HTML job done.''
   
  -  Website META Language, Version 2.0.4 (19-Sep-2000)
  +  Website META Language, Version 2.0.5 (23-Oct-2000)
   
     Copyright (c) 1996-2000 Ralf S. Engelschall
     Copyright (c) 1999-2000 Denis Barbier
  
  Index: VERSION
  ===================================================================
  RCS file: /e/wml/cvs/wml/VERSION,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- VERSION	2000/09/18 08:46:46	1.42
  +++ VERSION	2000/10/23 21:00:28	1.43
  @@ -2,5 +2,5 @@
     VERSION -- Version Information for WML (syntax: Text)
     [automatically generated and maintained by GNU shtool]
   
  -  This is WML, Version 2.0.4 (19-Sep-2000)
  +  This is WML, Version 2.0.5 (23-Oct-2000)
   
  
  Index