[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#98811: Patch for Makefile.common [Was: Re: New page for devel/website]



On Wed, Aug 25, 2004 at 06:21:49PM +0200, Tobias Toedter wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On Wednesday 25 August 2004 01:46, Denis Barbier wrote:
> > On Tue, Aug 24, 2004 at 10:57:57PM +0200, Tobias Toedter wrote:
> > > Thanks for your detailed analysis on the matter. Maybe I was a bit
> > > unclear in my previous message. What I meant was that the patch should
> > > fix newly generated files.
> >
> > This is not possible, old pages may get rebuild for many reasons (like
> > a change under english/template/debian),  There is no smooth transition.
> 
> Ah, OK. You're of course right; unless tested, we should stay on the safe 
> side.

In fact I was wrong, there is another way: set mp4h options in .wmlrc,
they will only affect files in the given directories (and below).
This way, changes can be tested on few files.  And according to CVS
logs (about webwml/english/template/debian/basic.wml), this topic was
already discussed back in December 2001 ;)
List archives showed that this issue was discussed in #98811, Frank
Lichtenheld already worked on this topic and IIRC he filed bugs against
mp4h and wml which had been fixed.

> > And if nobody tries to generate XHTML files, bugs in wml and mp4h won't
> > get caught.  So the best solution is to try your patch on a test
> > machine, and see how it works.
> 
> Right. I'll see how far I get. Would you still be the contact person about 
> bugs in wml and friends?

You can use #98811 for discussions, and file bugs against wml or mp4h if
needed.

> > I forgot the last step in my previous post: if everything runs fine, one
> > has also to check generated XHTML files with various browsers to check
> > how they are rendered.
> 
> I've been using XHTML for all of my recent projects. Usually, modern 
> browsers have no diffculties in displaying the pages. I guess that by the 
> time we perform the switch to XHTML, every browser will easily display 
> XHTML. Anyways, this doesn't excuse us from doing a thorough check.

Here are first results; I applied the attached patch, generated
devel/website/using_cvs.en.html and checked that
  1. this file is XHTML compliant
  2. "lynx -dump" showa no difference (except for timestamps) on
     HTML and XHTML files.

Maybe someone could fix all files under english/devel/website/
(but not english/template/debian since all pages will then be
gratuitously rebuilt) so that we can discuss whether they could
be switched to XHTML.  When committing changes, please bump
translation-check headers since content is kept unmodified.

Denis
Index: template/debian/common_tags.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/common_tags.wml,v
retrieving revision 1.8
diff -u -r1.8 common_tags.wml
--- template/debian/common_tags.wml	7 Nov 2003 16:04:14 -0000	1.8
+++ template/debian/common_tags.wml	25 Aug 2004 18:36:59 -0000
@@ -1,4 +1,4 @@
-<define-tag hrline><hr noshade width="100%" size="1" /></define-tag>
+<define-tag hrline><hr noshade<ifeq "$(DOCTYPE)" xhtml "=noshade"/> width="100%" size="1" /></define-tag>
 
 <define-tag url><a href="%0">%0</a></define-tag>
 <define-tag newsurl><url %0 /></define-tag>
Index: template/debian/mirrors.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/template/debian/mirrors.wml,v
retrieving revision 1.36
diff -u -r1.36 mirrors.wml
--- template/debian/mirrors.wml	14 Aug 2003 07:07:09 -0000	1.36
+++ template/debian/mirrors.wml	25 Aug 2004 18:37:00 -0000
@@ -51,6 +51,7 @@
               );
 foreach my $m (sort langcmp keys %mirrors) {
     my $s = " selected" if $mirrors{$m} eq "us";
+    $s .= "=\"selected\"" if $mirrors{$m} eq "us" && "$(DOCTYPE)" eq "xhtml";
     <perl:print><option value=\"$mirrors{$m}\"$s>$m</option>\n</perl:print>
 }
 </perl>\
Index: devel/website/using_cvs.wml
===================================================================
RCS file: /cvs/webwml/webwml/english/devel/website/using_cvs.wml,v
retrieving revision 1.12
diff -u -r1.12 using_cvs.wml
--- devel/website/using_cvs.wml	20 Apr 2004 09:51:39 -0000	1.12
+++ devel/website/using_cvs.wml	25 Aug 2004 18:37:01 -0000
@@ -5,7 +5,7 @@
 of the main repository. The local copies can be on the same machine,
 or across the world. Users can then modify the local copy as they
 wish and when the modified material is ready, commit the changes
-back to the main repository.
+back to the main repository.</p>
 
 <p>CVS will not let you commit a file if the copy in the main
 repository has been modified since your last update. This is
@@ -13,31 +13,31 @@
 If the modifications were to different parts than you were working
 on, the changes are silently merged. If the changes affect the same area you
 were working on, you will be warned that there is a conflict
-and you need to edit the file to fix the problem before committing.
+and you need to edit the file to fix the problem before committing.</p>
 
-<P>In what follows anonymous access will be used as an example. If
+<p>In what follows anonymous access will be used as an example. If
 you have access to another account which gives you write permission to
 the repository then you should use that account instead. If you
 are planning on making changes, you should get an account before
 starting as anonymous users can not commit changes.  See <a
 href="#write-access">the section on write access</a> for more
-information.
+information.</p>
 
-<p>To begin using CVS, you must first <code>login</code> to the CVS server
+<p>To begin using CVS, you must first <code>login</code> to the CVS server</p>
 
 <pre>
    cvs -d :pserver:anonymous@cvs.debian.org:/cvs/webwml login
 </pre>
 
-<p>(just hit enter for the password here)
+<p>(just hit enter for the password here)</p>
 
-<P>To check out a copy of the wml files on your local machine, you need to use
+<p>To check out a copy of the wml files on your local machine, you need to use</p>
 
 <pre>
    cvs -d :pserver:anonymous@cvs.debian.org:/cvs/webwml checkout webwml
 </pre>
 
-<p>You can check out a subset of the pages like this:
+<p>You can check out a subset of the pages like this:</p>
 
 <pre>
    cvs -d :pserver:anonymous@cvs.debian.org:/cvs/webwml checkout -l \\
@@ -51,17 +51,17 @@
 <p>Repeat for all subdirectories or files that you want. The second line
 includes all the files you will need if you wish to create HTML from the WML
 files. Partial checkouts such as these aren't really supported, though, so
-the above instructions may not always work.
+the above instructions may not always work.</p>
 
 <p>If you have been given a username with a password, insert that instead
-of anonymous, like this:
+of anonymous, like this:</p>
 
 <pre>
    cvs -d :pserver:username@cvs.debian.org:/cvs/webwml checkout webwml/english/doc
 </pre>
 
-<P>From then on, you will not need to use the <code>'-d :pserver:...'</code>
-part. Every few days you will want to do a
+<p>From then on, you will not need to use the <code>'-d :pserver:...'</code>
+part. Every few days you will want to do a</p>
 
 <pre>
    cvs update -d
@@ -70,7 +70,7 @@
 <p>to retrieve any files from the repository which have changed.  The
 <code>-d</code> update option will add any new directories, automatically.
 You may want to create a <code>~/.cvsrc</code> file so that you don't have
-to type some options all the time. For example, it can contain:
+to type some options all the time. For example, it can contain:</p>
 
 <pre>
 cvs -z9
@@ -78,37 +78,37 @@
 diff -u
 </pre>
 
-<P>The following is for those who have write permission on the repository.
-When you are done with a page, you can commit your changes to the repository using
+<p>The following is for those who have write permission on the repository.
+When you are done with a page, you can commit your changes to the repository using</p>
 
 <pre>
    cvs commit &lt;file&gt;.wml
 </pre>
 
-<p>or
+<p>or</p>
 
 <pre>
    cvs commit &lt;dir&gt;    (to commit all the changes in &lt;dir&gt;)
 </pre>
 
-<p>or
+<p>or</p>
 
 <pre>
    cvs commit          (to commit all changes from the current dir down)
 </pre>
 
-<P>If you are the first person translating a page, you need to do
+<p>If you are the first person translating a page, you need to do</p>
 
 <pre>
    cvs add &lt;file&gt;.wml
 </pre>
 
 <p>before you commit it. Note that <code>cvs add</code> is not recursive so
-you need to add a directory before you can add its contents.
+you need to add a directory before you can add its contents.</p>
 
-<P>For more information on CVS, use <code>info cvs</code>.
+<p>For more information on CVS, use <code>info cvs</code>.</p>
 
 <h3><a name="write-access">CVS Write Access</a></h3>
 
 <p>For instructions on how to obtain CVS write access, see <url
-"http://people.debian.org/~joey/misc/webwml.html";>.
+"http://people.debian.org/~joey/misc/webwml.html"; />.</p>
--- devel/website/.wmlrc	2004-08-24 22:54:19.000000000 +0200
+++ devel/website/.wmlrc	2004-08-25 20:24:38.000000000 +0200
@@ -0,0 +1,2 @@
+-D DOCTYPE=xhtml
+-W2,--expansion=3082

Reply to: