[Boost-commit] svn:boost r53727 - in website/public_html/live: . common/code doc

Subject: [Boost-commit] svn:boost r53727 - in website/public_html/live: . common/code doc
From: daniel_james_at_[hidden]
Date: 2009-06-07 12:46:25

Author: danieljames
Date: 2009-06-07 12:46:25 EDT (Sun, 07 Jun 2009)
New Revision: 53727
URL: http://svn.boost.org/trac/boost/changeset/53727

Log:
Merged revisions 53715-53716,53724,53726 via svnmerge from 
https://svn.boost.org/svn/boost/website/public_html/beta

........
  r53715 | danieljames | 2009-06-07 12:17:21 +0100 (Sun, 07 Jun 2009) | 2 lines
  
  Add missing files from merge.
........
  r53716 | danieljames | 2009-06-07 12:23:01 +0100 (Sun, 07 Jun 2009) | 1 line
  
  Add 'preprocess hook' to comment.
........
  r53724 | danieljames | 2009-06-07 17:25:56 +0100 (Sun, 07 Jun 2009) | 1 line
  
  Fix some validator errors.
........
  r53726 | danieljames | 2009-06-07 17:38:22 +0100 (Sun, 07 Jun 2009) | 1 line
  
  Fix error in last commit.
........

Properties modified: 
   website/public_html/live/   (props changed)
Text files modified: 
   website/public_html/live/common/code/boost_archive.php |     8 ++++++--                                
   website/public_html/live/doc/display_build.php         |     2 +-                                      
   website/public_html/live/doc/display_jam.php           |     2 +-                                      
   website/public_html/live/doc/display_libs.php          |     2 +-                                      
   4 files changed, 9 insertions(+), 5 deletions(-)

Modified: website/public_html/live/common/code/boost_archive.php
==============================================================================
--- website/public_html/live/common/code/boost_archive.php	(original)
+++ website/public_html/live/common/code/boost_archive.php	2009-06-07 12:46:25 EDT (Sun, 07 Jun 2009)
@@ -493,14 +493,18 @@
     function _content_basic()
     {
         $text = $this->_content_html_pre();
+
+        $is_xhtml = preg_match('@<!DOCTYPE[^>]*xhtml_at_i', $text);
+        $tag_end = $is_xhtml ? '/>' : '>';
+        
         $text = preg_split('@(</head>|<body[^>]*>)@i',$text,-1,PREG_SPLIT_DELIM_CAPTURE);
         $state = 0;
         foreach($text as $section) {
             print($section);
             switch($state) {
             case 0:
-                print '<link rel="icon" href="/favicon.ico" type="image/ico" />';
-                print '<link rel="stylesheet" type="text/css" href="/style/section-basic.css" />';
+                print '<link rel="icon" href="/favicon.ico" type="image/ico"'.$tag_end;
+                print '<link rel="stylesheet" type="text/css" href="/style/section-basic.css"'.$tag_end;
                 $state = 1;
                 break;
             case 1:

Modified: website/public_html/live/doc/display_build.php
==============================================================================
--- website/public_html/live/doc/display_build.php	(original)
+++ website/public_html/live/doc/display_build.php	2009-06-07 12:46:25 EDT (Sun, 07 Jun 2009)
@@ -15,7 +15,7 @@
         str_ireplace('</body>', $analytics.'</body>', $content);
 }
 $_file = new boost_archive('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
-  //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+  //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type[,preprocess hook]),
   array('@.*@','@^boost-build/index[.]html$@i','simple','text/html', 'add_boost_build_analytics'),
   array('@.*@','@[.](html|htm)$@i','boost_book_html','text/html')
   ),false,false);

Modified: website/public_html/live/doc/display_jam.php
==============================================================================
--- website/public_html/live/doc/display_jam.php	(original)
+++ website/public_html/live/doc/display_jam.php	2009-06-07 12:46:25 EDT (Sun, 07 Jun 2009)
@@ -2,7 +2,7 @@
 require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
 
 $_file = new boost_archive('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
-  //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+  //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type[,preprocess hook]),
   array('@.*@','@[.](html|htm)$@i','boost_book_html','text/html'),
   ));
 

Modified: website/public_html/live/doc/display_libs.php
==============================================================================
--- website/public_html/live/doc/display_libs.php	(original)
+++ website/public_html/live/doc/display_libs.php	2009-06-07 12:46:25 EDT (Sun, 07 Jun 2009)
@@ -2,7 +2,7 @@
 require_once(dirname(__FILE__) . '/../common/code/boost_archive.php');
 
 $_file = new boost_archive('@^[/]([^/]+)[/](.*)$@',$_SERVER["PATH_INFO"],array(
-  //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type),
+  //~ array(version-regex,path-regex,raw|simple|text|cpp|boost_book_html|boost_libs_html,mime-type[,preprocess hook]),
   //~ this handles most of the simple cases of index.htm(l) redirect files
   array(
     '@1_('.implode('|',array(