[Fink-devel] Re: web/xml postprocess.pl,1.8,1.9 finkdoc-website.i18n.xsl,1.16,1.17

David R. Morrison Mon, 02 Aug 2004 19:39:42 -0700

Baba,

This change has broken compilation in the "news" directory.  (I had to
fix index.php by hand to add back the header and footer lines.)

I don't understand well enough what you were doing, to see how I should modify news.xml to cope with this change.

  -- Dave

On Jul 10, 2004, at 8:34 AM, BABA Yoshihiko wrote:

Update of /cvsroot/fink/web/xml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995
Modified Files:
        postprocess.pl finkdoc-website.i18n.xsl
Log Message:
fixed the problem with header.??.inc and ../footer.inc
Index: finkdoc-website.i18n.xsl =================================================================== RCS file: /cvsroot/fink/web/xml/finkdoc-website.i18n.xsl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- finkdoc-website.i18n.xsl 10 Mar 2004 23:23:20 -0000 1.16 +++ finkdoc-website.i18n.xsl 10 Jul 2004 12:34:29 -0000 1.17 @@ -22,6 +22,10 @@ <link rel="contents" href="[EMAIL PROTECTED]" title="{shorttitle} Contents" /> <link rel="next" href="{chapter/@filename}.php?phpLang={$lang-ext}" title="{chapter/title}" /> </head><body> +<xsl:text disable-output-escaping="yes"> +</xsl:text>
 <h1><xsl:value-of select="title"/></h1>
@@ -29,7 +33,7 @@
 
-<h2><xsl:text>Contents</xsl:text></h2>
+<h2><xsl:text>{FINK_CONTENTS}</xsl:text></h2>
 <ul><xsl:text>
        </xsl:text>
@@ -63,6 +67,8 @@
 <xsl:apply-templates select="chapter" />
+<xsl:text disable-output-escaping="yes"> +<? include_once "</xsl:text><xsl:value-of select="@fsroot"/><xsl:text disable-output-escaping="yes">footer.inc"; ?></xsl:text> </body></html> </xsl:document>
@@ -126,19 +132,27 @@
 </xsl:if>
</head><body> +<xsl:text disable-output-escaping="yes"> +</xsl:text>

-<h1><xsl:value-of select="../shorttitle"/><xsl:text> - </xsl:text><xsl:number format="1 " /><xsl:value-of select="title"/></h1> +<h1><xsl:value-of select="../shorttitle"/><xsl:text> - </xsl:text><xsl:number format="1 " />. <xsl:value-of select="title"/></h1>
 <xsl:apply-templates/>
<xsl:for-each select="following-sibling::chapter"> <xsl:if test="position()=1"> <p align="right"> -Next: <a href="[EMAIL PROTECTED]"><xsl:number format="1 " /><xsl:value-of select="title" /></a> +<xsl:text>{FINK_NEXT}</xsl:text>: +<a href="[EMAIL PROTECTED]"><xsl:number format="1 " /><xsl:value-of select="title" /></a> </p> </xsl:if> </xsl:for-each>

+<xsl:text disable-output-escaping="yes"> +<? include_once "</xsl:text><xsl:value-of select="../@fsroot"/><xsl:text disable-output-escaping="yes">footer.inc"; ?> +</xsl:text> </body></html> </xsl:document> </xsl:template> @@ -152,8 +166,13 @@

<xsl:document href="[EMAIL PROTECTED]@lang}.php.tmp" method="html" indent="no" encoding="utf-8"> <html><head> + <title><xsl:value-of select="shorttitle" /></title> </head><body> +<xsl:text disable-output-escaping="yes"> +</xsl:text>
 <h1><xsl:value-of select="title"/></h1>
@@ -163,6 +182,9 @@
 <xsl:apply-templates select="section" />
+<xsl:text disable-output-escaping="yes"> +<? include_once "</xsl:text><xsl:value-of select="@fsroot"/><xsl:text disable-output-escaping="yes">footer.inc"; ?> +</xsl:text> </body></html> </xsl:document> </xsl:template> @@ -189,7 +211,7 @@

<xsl:template match="question"> <div class="question"> -<p><b>Q<xsl:number count="chapter" format="1." /><xsl:number count="faqentry" format="1" /><xsl:text>: </xsl:text> +<p><b>{FINK_Q}<xsl:number count="chapter" format="1." /><xsl:number count="faqentry" format="1" /><xsl:text>: </xsl:text> <xsl:for-each select="p"> <xsl:if test='position() = 1'><xsl:call-template name="plain" /></xsl:if> </xsl:for-each> @@ -202,7 +224,7 @@

<xsl:template match="answer"> <div class="answer"> -<p><b>A:</b><xsl:text> </xsl:text> +<p><b>{FINK_A}:</b><xsl:text> </xsl:text> <xsl:for-each select="p"> <xsl:if test='position() = 1'><xsl:call-template name="plain" /></xsl:if> </xsl:for-each>

Index: postprocess.pl =================================================================== RCS file: /cvsroot/fink/web/xml/postprocess.pl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- postprocess.pl 7 Mar 2004 20:57:54 -0000 1.8 +++ postprocess.pl 10 Jul 2004 12:34:29 -0000 1.9 @@ -20,8 +20,16 @@ while ($text =~ s|(</title>.*[^\\])'(.*</head>)|$1\\'$2|s) { } $text =~ s|</title>|";\n\$cvs_author = '$tag_author';\n\$cvs_date = '$tag_date';\n\$metatags = '|s; -$text =~ s|</head>.*<body>|';\n\ninclude_once "header.inc";\n?>\n\n|s; -$text =~ s|</body>.*</html>|\n\n<?\ include_once "footer.inc"; ?>|s; +#$text =~ s|</head>.*<body>|';\n\ninclude_once "header.inc";\n?>\n\n|s; +#$text =~ s|</body>.*</html>|\n\n<?\ include_once "footer.inc"; ?>|s; +$text =~ s|</head>.*<body>(\n)*(|?>|g; + +$text =~ s|{FINK_([^}]*)}|<? echo FINK_$1 ; ?>|g; + $text =~ s|\$Id|\$Fink|g;
 $text =~ s|[EMAIL PROTECTED]@|<?php print \$root; ?>|g;
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits


-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
_______________________________________________
Fink-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-devel

[Fink-devel] Re: web/xml postprocess.pl,1.8,1.9 finkdoc-website.i18n.xsl,1.16,1.17

Reply via email to