changeset 94:9e39efce13e7

merge
author Henry S. Thompson <ht@markup.co.uk>
date Wed, 01 May 2024 15:38:28 +0100
parents 005c914982ad (current diff) cd9413deeaa5 (diff)
children 83881405fc01
files
diffstat 39 files changed, 199 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
Binary file cc_2023/2023pics/Burnham_tree.jpg has changed
Binary file cc_2023/2023pics/Christmas_2022.jpeg has changed
Binary file cc_2023/2023pics/Eagle_on_Bean.jpg has changed
Binary file cc_2023/2023pics/IMG-20221231-WA0001.jpg has changed
Binary file cc_2023/2023pics/IMG-20230102-WA0003.jpg has changed
Binary file cc_2023/2023pics/IMG-20230305-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20230409-WA0005.jpg has changed
Binary file cc_2023/2023pics/IMG-20230417-WA0010.jpg has changed
Binary file cc_2023/2023pics/IMG-20230516-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20230604-WA0004.jpg has changed
Binary file cc_2023/2023pics/IMG-20230624-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20230625-WA0002.jpg has changed
Binary file cc_2023/2023pics/IMG-20230625-WA0003.jpg has changed
Binary file cc_2023/2023pics/IMG-20230625-WA0004.jpg has changed
Binary file cc_2023/2023pics/IMG-20230625-WA0007.jpg has changed
Binary file cc_2023/2023pics/IMG-20230715-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20230715-WA0001.jpg has changed
Binary file cc_2023/2023pics/IMG-20230806-WA0005.jpg has changed
Binary file cc_2023/2023pics/IMG-20230809-WA0000.jpeg has changed
Binary file cc_2023/2023pics/IMG-20230815-WA0005.jpg has changed
Binary file cc_2023/2023pics/IMG-20230820-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20230904-WA0001.jpg has changed
Binary file cc_2023/2023pics/IMG-20230909-WA0007.jpg has changed
Binary file cc_2023/2023pics/IMG-20230909-WA0011.jpg has changed
Binary file cc_2023/2023pics/IMG-20231003-WA0001.jpg has changed
Binary file cc_2023/2023pics/IMG-20231105-WA0018.jpg has changed
Binary file cc_2023/2023pics/IMG-20231203-WA0003.jpg has changed
Binary file cc_2023/2023pics/IMG-20231206-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20231215-WA0000.jpg has changed
Binary file cc_2023/2023pics/IMG-20231215-WA0001.jpg has changed
Binary file cc_2023/2023pics/IMG_20230718_114619.jpg has changed
Binary file cc_2023/2023pics/James_PPP.jpg has changed
Binary file cc_2023/2023pics/Sailing_on_Evenstar.jpeg has changed
Binary file cc_2023/2023pics/Sailing_on_Evenstar_2.jpeg has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cc_2023/cc_2023.html	Wed May 01 15:38:28 2024 +0100
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<!DOCTYPE html
+  PUBLIC "-//HST//DTD XHTML5 1.0 Transitional//EN" "http://www.ltg.ed.ac.uk/~ht/xhtml5.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta name="copyright" content="Copyright &#xa9; 2023 &lt;a href=&#34;http://www.ltg.ed.ac.uk/~ht/&#34;&gt;Henry S. Thompson&lt;/a&gt;&amp;#160;&lt;a href=&#34;http://creativecommons.org/licenses/by-sa/3.0/deed.en&#34;&gt;CC-BY-SA&lt;/a&gt;"/><meta http-equiv="Content-type" content="text/html; charset=utf-8"/><style type="text/css">
+       ul.nolabel { margin: 0; margin-left: -2.5em}
+       ul.naked.nolabel {margin: 0; margin-left: 0; padding-left: 0}
+       ul.cdefn {clear: both}
+       div.ndli { margin-bottom: 1ex }
+       div.hidden {display: none}
+
+    ul.naked > li { list-style-type: none; background: none; margin-left: 2em;
+margin-bottom: 0 }
+    li ul.naked > li, dd ul.naked > li { list-style-type: none; background: none; margin-left: 0;
+margin-bottom: 0 }
+    li.cdefni {}
+    li.cdefni span.cl {display: inline-block; vertical-align: bottom}
+    li.cdefni span.cr {display: inline-block; margin-left: 1em; vertical-align: bottom}
+   pre.code {display: inline-block}
+   blockquote.vanilla {display: inline-block; margin-left: 1em;
+        border: solid 1px; background: rgb(238,234,230);
+                   padding: .5ex .5em}
+   blockquote.vanilla ul.naked li {margin-left: 0 ! important;font-size: 100%}
+    ol ol ol, ol ol ol li {list-style-type: lower-roman}
+    ol ol, ol ol li {list-style-type: lower-alpha}
+    i i {font-style: normal}
+    li li {font-style: normal}
+    li ul li {font-style: normal}
+    li { line-height: 100%; margin-top: 0.3em}
+    .math {font-family: 'Arial Unicode MS', 'Lucida Sans Unicode', serif}
+    .sub {font-size: 80%; vertical-align: sub}
+    .termref {text-decoration: none; color: #606000}
+       .licence {margin-left: 1em; font-size: 70%}
+       .credits {margin-left: 1.5em; font-size: 70%}
+    .right {position: absolute}
+   .stackdown {vertical-align: text-top; margin-top: 0}
+    body {font-size: 12pt}
+   pre.numbered {
+     white-space: pre-wrap;
+   }
+   div.counter {
+    counter-reset: listing;
+   }
+   pre.numbered code {
+     counter-increment: listing;
+   }
+   pre.cl code::before {
+     content: "$ " ;
+     font-size: 80%;
+     width: 2em
+   }
+   pre.numbered code::before {
+     content: counter(listing) ". ";
+     display: inline-block;
+     font-size: 80%;
+     width: 3em; 
+     padding-left: auto; 
+     margin-left: auto; 
+     text-align: right; 
+   }
+
+   /* content doesn't combine :-( */
+   pre.numbered.cl code::before {
+     content: counter(listing) ". $ ";
+     display: inline-block;
+     font-size: 80%;
+     width: 3em; 
+     padding-left: auto; 
+     margin-left: auto; 
+     text-align: right;
+  }
+     @page { size: A4 portrait; margin: 2cm;
+             orphans: 2; widows: 2;} 
+     @media screen {
+     body {width: 20cm; margin-left: auto; margin-right: auto}
+       }
+     @media print {
+        body {font-size: 10pt}
+        h1, h2, h3, h4 {page-break-after: avoid}
+     }
+     pre.code {font-family: monospace;
+ font-weight: bold;
+ line-height: 120%;
+ padding-top: 0.2em;
+ padding-bottom: 0.2em;
+ padding-left: 1em;
+ padding-right: 1em;
+ border-style: solid;
+ border-left-width: 1em;
+ border-top-width: thin;
+ border-right-width: thin;
+ border-bottom-width: thin;
+ border-color: #95ABD0;
+ color: #00428C;
+ background-color: #E4E5E7;
+}
+       pre {margin-left: 0em}
+       div.toc h2 {font-size: 120%; margin-top: 0em; margin-bottom: 0em}
+       div.toc h4 {font-size: 100%; margin-top: 0em; margin-bottom: 0em;
+                   margin-left: 1em}
+       div.toc h1 {font-size: 140%; margin-bottom: 0em}
+       div.toc ul {margin-top: 1ex}
+       .byline {font-size: 120%}
+       div.figure {margin-left: 2em}
+       div.caption {font-style: italic; font-weight: bold; margin-top: 1em}
+       i i {font-style: normal}
+       img {border: 0}
+       .copyright {font-size: 70%}
+       .note {width: 20%; float: right; clear: right; margin-left: .5em}
+     </style><style type="text/css">body {width: 30cm}
+         .intro {font-size: 120% ; font-weight: bold; margin-top: 5mm }
+         .narrow2 {width: 49%}
+         .right {float: right}
+         .left {float: left; margin-right: 2mm}
+         .clearRight {clear: right}
+         .clearLeft {clear: left}
+         .sad {border: black solid 2mm; padding: 2mm}
+         .centre {display: block; margin-left: auto; margin-right: auto}
+         #caption p { opacity: 0.0 }
+         #caption:hover p { opacity: 1.0 }
+  </style><title>Christmas 2023</title></head><body style="font-family: DejaVu Sans, Arial; background: rgb(254,250,246)"><div style="text-align: center" class="head"><h1>Christmas 2023</h1><hr/><div class="byline">Catharine and Henry</div><div class="byline">24 December 2023</div><div class="copyright">Copyright &#xa9; 2023 <a href="http://www.ltg.ed.ac.uk/~ht/">Henry S. Thompson</a>&#160;<a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en">CC-BY-SA</a></div></div><div class="body"><div><p>As ever, Catharine and I hope you have your share of repose and reflection, peace and joy, during
+this holiday season.  Now more than ever the season calls for a heartfelt prayer for
+peace and justice.</p></div><div><p>Photos from the last year, roughly in date order (hover with mouse to see names, places and dates):</p><p class="intro">Christmas 2023</p><img src="2023pics/Christmas_2022.jpeg" class="image" alt="Christmas dinner, Edinburgh: Cheesy grins from Henry, Jamie, Emma, Freya, James, Catharine, Rob and Callum, 2022-12-25" title="Christmas dinner, Edinburgh: Cheesy grins from Henry, Jamie, Emma, Freya, James, Catharine, Rob and Callum, 2022-12-25" width="100%" style="margin-bottom: 0.5cm"/><p class="intro clearLeft">Travels various, winter, spring and early summer</p><img src="2023pics/IMG-20230102-WA0003.jpg" class="left" alt="Highlands: Joanna swimming in Loch Goyle, 2023-01-02" title="Highlands: Joanna swimming in Loch Goyle, 2023-01-02" width="49%"/><img src="2023pics/IMG-20230409-WA0005.jpg" class="left" alt="Easter in Cambridge, clockwise from top left: Rob, Catharine, Joanna, Callum, Freya and Jamie: 2023-04-09" title="Easter in Cambridge, clockwise from top left: Rob, Catharine, Joanna, Callum, Freya and Jamie: 2023-04-09" width="49%"/><img src="2023pics/IMG-20230417-WA0010.jpg" class="left" alt="Weekend in Suffolk: Rob and Emma, 2023-04-09" title="Weekend in Suffolk: Rob and Emma, 2023-04-09" width="49%"/><img src="2023pics/James_PPP.jpg" class="left" alt="Joanna visiting James in Seattle: James hiking in Poo Poo Park, 2023-05-09" title="Joanna visiting James in Seattle: James hiking in Poo Poo Park, 2023-05-09" width="49%"/><img src="2023pics/IMG-20230604-WA0004.jpg" class="left" alt="Preparing to defend our castle against the tide, Old Hunstanton, Norfolk, 2023-06-04: Henry, Catharine, Rob, Callum, Freya, Jamie" title="Preparing to defend our castle against the tide, Old Hunstanton, Norfolk, 2023-06-04: Henry, Catharine, Rob, Callum, Freya, Jamie" width="49%"/><img src="2023pics/IMG-20230625-WA0004.jpg" class="left" alt="Ward family wedding, Newcastle, 2023-06-24: Catharine, Henry, Emma, Joanna, Adam" title="Ward family wedding, Newcastle, 2023-06-24: Catharine, Henry, Emma, Joanna, Adam" width="49%"/><p class="intro clearLeft" style="padding-top: 5mm">Summer hols</p><img src="2023pics/IMG-20230715-WA0000.jpg" class="left" alt="Long weekend in Gairloch: our statutory 10 minutes of sunshine looking across to Gairloch harbour, 2023-07-15: Henry" title="Long weekend in Gairloch: our statutory 10 minutes of sunshine looking across to Gairloch harbour, 2023-07-15: Henry" width="49%"/><img src="2023pics/IMG_20230718_114619.jpg" class="left" alt="Long weekend in Gairloch: On the slopes of Ben Eighe, 2023-07-18: Catharine" title="Long weekend in Gairloch: On the slopes of Ben Eighe, 2023-07-18: Catharine" width="49%"/><img src="2023pics/IMG-20230815-WA0005.jpg" class="left" alt="Family together in Hancock Point: Sunset at Tidal Falls by Joanna, 2023-08-15" title="Family together in Hancock Point: Sunset at Tidal Falls by Joanna, 2023-08-15" width="49%"/><img src="2023pics/IMG-20230820-WA0000.jpg" class="left" alt="Family together in Hancock Point: Captain Jo, 2023-08-20" title="Family together in Hancock Point: Captain Jo, 2023-08-20" width="49%"/><img src="2023pics/Sailing_on_Evenstar.jpeg" class="left" alt="Family together in Hancock Point: Jamie, Callum, Henry, Freya and Emma sailing, 2023-08" title="Family together in Hancock Point: Jamie, Callum, Henry, Freya and Emma sailing, 2023-08" width="49%"/><img src="2023pics/Eagle_on_Bean.jpg" class="left" alt="Family together in Hancock Point: Bald eagle on Bean Island, 2023-08-12" title="Family together in Hancock Point: Bald eagle on Bean Island, 2023-08-12" width="49%"/><p class="intro clearLeft" style="padding-top: 5mm">Autumn/Winter 2023</p><img src="2023pics/IMG-20231003-WA0001.jpg" class="left" alt="Our back garden, Edinburgh: Urban wildlife, 2023-10-03" title="Our back garden, Edinburgh: Urban wildlife, 2023-10-03" width="49%"/><img src="2023pics/IMG-20231203-WA0003.jpg" class="left" alt="London, in their new flat: Adam and Joanna, 2023-12-03, just before letting us know they have gotten engaged!" title="London, in their new flat: Adam and Joanna, 2023-12-03, just before letting us know they have gotten engaged!" width="49%"/><p class="intro clearLeft" style="padding-top: 5mm">Preparing for Christmas, 2023</p><img src="2023pics/IMG-20231206-WA0000.jpg" class="left" alt="Cambridge: Wreath by Emma, 2023-12-06" title="Cambridge: Wreath by Emma, 2023-12-06" width="49%"/><img src="2023pics/Burnham_tree.jpg" class="left" alt="Bolands in Burnham: Christmas tree 2023-12-22" title="Bolands in Burnham: Christmas tree 2023-12-22" width="49%"/><p class="clearLeft">&#xa0;</p></div></div></body></html>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cc_2023/cc_2023.xml	Wed May 01 15:38:28 2024 +0100
@@ -0,0 +1,57 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="../../../../lib/xml/doc.xsl" ?>
+<!DOCTYPE doc SYSTEM "../../../../lib/xml/doc.dtd" >
+<doc xmlns:x="http://www.w3.org/1999/xhtml">
+ <head>
+  <title>Christmas 2023</title>
+  <author>Catharine and Henry</author>
+  <date>24 December 2023</date>
+  <style>body {width: 30cm}
+         .intro {font-size: 120% ; font-weight: bold; margin-top: 5mm }
+         .narrow2 {width: 49%}
+         .right {float: right}
+         .left {float: left; margin-right: 2mm}
+         .clearRight {clear: right}
+         .clearLeft {clear: left}
+         .sad {border: black solid 2mm; padding: 2mm}
+         .centre {display: block; margin-left: auto; margin-right: auto}
+         #caption p { opacity: 0.0 }
+         #caption:hover p { opacity: 1.0 }
+  </style>
+ </head>
+ <body xmlns:x="http://www.w3.org/1999/xhtml">
+  <div>
+   <p>As ever, Catharine and I hope you have your share of repose and reflection, peace and joy, during
+this holiday season.  Now more than ever the season calls for a heartfelt prayer for
+peace and justice.</p>
+  </div>
+  <div>
+   <p>Photos from the last year, roughly in date order (hover with mouse to see names, places and dates):</p>
+   <!-- CSS started from https://stackoverflow.com/questions/55477699/playing-video-and-showing-text-on-hovering-over-image, needed some changes... -->
+   <p class="intro">Christmas 2023</p>
+    <image textGloss="Christmas dinner, Edinburgh: Cheesy grins from Henry, Jamie, Emma, Freya, James, Catharine, Rob and Callum, 2022-12-25" source="2023pics/Christmas_2022.jpeg" width="100%" style="margin-bottom: 0.5cm"/>
+   <p class="intro clearLeft">Travels various, winter, spring and early summer</p>
+   <image textGloss="Highlands: Joanna swimming in Loch Goyle, 2023-01-02" source="2023pics/IMG-20230102-WA0003.jpg" width="49%" class="left"/> 
+   <image textGloss="Easter in Cambridge, clockwise from top left: Rob, Catharine, Joanna, Callum, Freya and Jamie: 2023-04-09" source="2023pics/IMG-20230409-WA0005.jpg" width="49%" class="left"/>
+   <image textGloss="Weekend in Suffolk: Rob and Emma, 2023-04-09" source="2023pics/IMG-20230417-WA0010.jpg" width="49%" class="left"/>
+   <image textGloss="Joanna visiting James in Seattle: James hiking in Poo Poo Park, 2023-05-09" source="2023pics/James_PPP.jpg" width="49%" class="left"/>
+   <image textGloss="Preparing to defend our castle against the tide, Old Hunstanton, Norfolk, 2023-06-04: Henry, Catharine, Rob, Callum, Freya, Jamie" source="2023pics/IMG-20230604-WA0004.jpg" width="49%" class="left"/>
+<image textGloss="Ward family wedding, Newcastle, 2023-06-24: Catharine, Henry, Emma, Joanna, Adam" source="2023pics/IMG-20230625-WA0004.jpg" width="49%" class="left"/>
+        <p class="intro clearLeft" style="padding-top: 5mm">Summer hols</p>
+   <image textGloss="Long weekend in Gairloch: our statutory 10 minutes of sunshine looking across to Gairloch harbour, 2023-07-15: Henry" source="2023pics/IMG-20230715-WA0000.jpg" width="49%" class="left"/>
+   <image textGloss="Long weekend in Gairloch: On the slopes of Ben Eighe, 2023-07-18: Catharine" source="2023pics/IMG_20230718_114619.jpg" width="49%" class="left"/>
+   <image textGloss="Family together in Hancock Point: Sunset at Tidal Falls by Joanna, 2023-08-15" source="2023pics/IMG-20230815-WA0005.jpg" width="49%" class="left"/>
+   <image textGloss="Family together in Hancock Point: Captain Jo, 2023-08-20" source="2023pics/IMG-20230820-WA0000.jpg" width="49%" class="left"/>
+   
+   <image textGloss="Family together in Hancock Point: Jamie, Callum, Henry, Freya and Emma sailing, 2023-08" source="2023pics/Sailing_on_Evenstar.jpeg" width="49%" class="left"/>
+   <image textGloss="Family together in Hancock Point: Bald eagle on Bean Island, 2023-08-12" source="2023pics/Eagle_on_Bean.jpg" width="49%" class="left"/> 
+   <p class="intro clearLeft" style="padding-top: 5mm">Autumn/Winter 2023</p> 
+   <image textGloss="Our back garden, Edinburgh: Urban wildlife, 2023-10-03" source="2023pics/IMG-20231003-WA0001.jpg" width="49%" class="left"/>
+   <image textGloss="London, in their new flat: Adam and Joanna, 2023-12-03, just before letting us know they have gotten engaged!" source="2023pics/IMG-20231203-WA0003.jpg" width="49%" class="left"/>
+   <p class="intro clearLeft" style="padding-top: 5mm">Preparing for Christmas, 2023</p>
+    <image textGloss="Cambridge: Wreath by Emma, 2023-12-06" source="2023pics/IMG-20231206-WA0000.jpg" width="49%" class="left"/>
+    <image textGloss="Bolands in Burnham: Christmas tree 2023-12-22" source="2023pics/Burnham_tree.jpg" width="49%" class="left"/>
+   <p class="clearLeft">&nbsp;</p>
+  </div>
+ </body>
+</doc>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cc_2023/index.html	Wed May 01 15:38:28 2024 +0100
@@ -0,0 +1,1 @@
+wait_for_it.html
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cc_2023/wait_for_it.html	Wed May 01 15:38:28 2024 +0100
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>Henry and Catharine Christmas card</title>
+  </head>
+
+  <body>
+    <h1>Wait for it....</h1>
+    <p>Not quite ready yet, please refresh this page on 24 December...</p>
+    <hr>
+    <address><a href="mailto:ht@home.hst.name">Henry</a></address>
+<!-- Created: Thu Nov 29 17:21:12 EST 2018 -->
+<!-- hhmts start -->
+Last modified: Tue Dec 19 15:51:58 EST 2023
+<!-- hhmts end -->
+  </body>
+</html>
+
--- a/robots.txt	Wed May 01 15:37:53 2024 +0100
+++ b/robots.txt	Wed May 01 15:38:28 2024 +0100
@@ -1,2 +1,3 @@
 User-agent: *
 Disallow: /cc/
+Disallow: /SNCO/