Index: plugin/google/google_analytics.rb
===================================================================
RCS file: /cvsroot/tdiary/contrib/plugin/google/google_analytics.rb,v
retrieving revision 1.3.2.1
diff -u -r1.3.2.1 google_analytics.rb
--- plugin/google/google_analytics.rb	11 Jan 2007 03:06:00 -0000	1.3.2.1
+++ plugin/google/google_analytics.rb	11 Nov 2007 22:42:41 -0000
@@ -10,14 +10,24 @@
 
 def google_analytics_insert_code
 	return '' unless @conf['google_analytics.profile']
-	<<-HTML
-	<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-	</script>
-	<script type="text/javascript">
-	_uacct = "UA-#{h @conf['google_analytics.profile']}";
+	is_xhtml = (/application\/xhtml\+xml/ =~ ENV['HTTP_ACCEPT'])
+	is_xhtml = false # for SnapShots(TM)
+	html = <<-HTML
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript" charset="UTF-8"></script>
+<script type="text/javascript">
+	HTML
+	html << "<![CDATA[\n" if is_xhtml
+	html <<<<-HTML
+<!--
+	_uacct = "#{h @conf['google_analytics.profile']}";
 	urchinTracker();
-	</script>
+-->
+	HTML
+	html << "]]>\n" if is_xhtml
+	html <<<<-HTML
+</script>
 	HTML
+	html
 end
 
 # UA-53836-1
Index: plugin/youtube/youtube.rb
===================================================================
RCS file: /cvsroot/tdiary/contrib/plugin/youtube/youtube.rb,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 youtube.rb
--- plugin/youtube/youtube.rb	18 Jan 2007 23:54:59 -0000	1.1.2.2
+++ plugin/youtube/youtube.rb	11 Nov 2007 22:42:42 -0000
@@ -10,3 +10,16 @@
 	<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/#{video_id}"></param><embed src="http://www.youtube.com/v/#{video_id}" type="application/x-shockwave-flash" width="425" height="350"></embed></object>
 	TAG
 end
+
+def youtube_cp( video_id )
+	<<-TAG
+</p><div class="youtube-cp">
+<object style="width:425px;height:366px;"
+  data="http://jp.youtube.com/cp/#{video_id}"
+  type="application/x-shockwave-flash">
+<param name="movie" value="http://jp.youtube.com/cp/#{video_id}" />
+<param name="wmode" value="transparent" />
+</object>
+</div><p>
+	TAG
+end