Mercurial > hg > hstweb

changeset 83:803e57d8fdb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
first few
author Henry Thompson <ht@markup.co.uk>
date Sun, 24 Dec 2023 12:49:05 +0000
parents 3bad66e6bbd6
children 1445280548d2 5f36c8d5edc7
files cc_2023/cc_2023.html cc_2023/cc_2023.xml
diffstat 2 files changed, 143 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cc_2023/cc_2023.html	Sun Dec 24 12:49:05 2023 +0000
@@ -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">New Year's Eve, 2022/3</p><img src="2023pics/IMG-20221231-WA0001.jpg" class="image" alt="Port and mince pies in Edinburgh" title="Port and mince pies in Edinburgh" width="100%" style="margin-bottom: 0.5cm"/><p class="intro clearLeft">Travels various, spring and early summer</p><img src="2023pics/IMG-20230102-WA0003.jpg" class="left" alt="Highlands, 2023-01-02, Jo and Adam swimming in Loch @@" title="Highlands, 2023-01-02, Jo and Adam swimming in Loch @@" width="49%"/><img src="2023pics/IMG-20230305-WA0000.jpg" class="left" alt="Stonehengge, 2023-02-19, Rob and Emma's weekend away" title="Stonehengge, 2023-02-19, Rob and Emma's weekend away" width="49%"/><img src="2023pics/james-freya_20230410.jpg" class="left" alt="Easter in Edinburgh, 2023, James and Freya" title="Easter in Edinburgh, 2023, James and Freya" width="49%"/><div style="margin: auto; width: 80%; clear: left"><img src="2023pics/callum_1st_communion_20230619.jpg" class="image" alt="Callum's first Communion, Cambridge, 2023-06-03, Emma, Adam, Rob, Henry, Joanna, Callum, Freya, Catharine, Jamie (channeling Hulk)" title="Callum's first Communion, Cambridge, 2023-06-03, Emma, Adam, Rob, Henry, Joanna, Callum, Freya, Catharine, Jamie (channeling Hulk)" width="100%"/></div><p class="intro">Summer hols</p><img src="2023pics/villeseque_20230627.jpg" class="left" alt="Villeseque, France, view from Clare and Chris Thomson's new guestroom, June 2023" title="Villeseque, France, view from Clare and Chris Thomson's new guestroom, June 2023" width="49%"/><img src="2023pics/vassiviere_20230825.jpg" class="left" alt="Lac de Vassiviere, France, view from our campsite, August 2023" title="Lac de Vassiviere, France, view from our campsite, August 2023" width="49%"/><img src="2023pics/adam-jo_cropped_20230918.jpg" class="left" alt="Cornwall, September 2023, Adam and Joanna" title="Cornwall, September 2023, Adam and Joanna" width="49%"/><div style="margin: auto; width: 80%; clear: left"><img src="2023pics/campsite_20230822.jpg" class="image" alt="Lac de Vassiviere, France, Bolands' campsite, August 2023, Freya, Jamie, Emma, Callum" title="Lac de Vassiviere, France, Bolands' campsite, August 2023, Freya, Jamie, Emma, Callum" width="100%"/></div><p class="intro">Autumn/Winter 2023</p><img src="2023pics/fall_colours_20231012.jpg" class="left clearLeft" alt="Little Tunk Lake, Maine, October 2023, fall colours" title="Little Tunk Lake, Maine, October 2023, fall colours" width="32%"/><img src="2023pics/henry-cath_20231203.jpg" class="left" alt="Mount Blair, Glenshee, Scotland, December 2023, Catharine and Henry" title="Mount Blair, Glenshee, Scotland, December 2023, Catharine and Henry" width="32%"/><img src="2023pics/cath_at_70_20231210.jpg" class="left" alt="Edinburgh, Catharine's birthday, December 2023" title="Edinburgh, Catharine's birthday, December 2023" width="32%" style="margin-bottom: 0.6cm"/><p class="intro clearleft">Preparing for Christmas, 2023</p><img src="2023pics/jo-wreath-20231203.jpg" class="clearLeft left" alt="Wreath by Joanna, London, 2023-12-03" title="Wreath by Joanna, London, 2023-12-03" width="24.5%"/><img src="2023pics/flying_santa_20231205.jpg" class="left" alt="Christmas tree with elf, Cambridge, 2023-12-06" title="Christmas tree with elf, Cambridge, 2023-12-06" width="24%"/><img src="2023pics/boland-wreath_20231127.jpg" class="left" alt="Wreath by Emma, Cambridge, 2023-11-27" title="Wreath by Emma, Cambridge, 2023-11-27" width="24.5%"/><img src="2023pics/11dc-wreath_20231223.jpg" class="left" alt="Wreath by Catharine, Edinburgh, 2023-12-23" title="Wreath by Catharine, Edinburgh, 2023-12-23" width="24%"/><p class="clearLeft">&#xa0;</p></div></div></body></html>
\ No newline at end of file
--- a/cc_2023/cc_2023.xml	Sun Dec 24 07:29:55 2023 -0500
+++ b/cc_2023/cc_2023.xml	Sun Dec 24 12:49:05 2023 +0000
@@ -3,9 +3,9 @@
 <!DOCTYPE doc SYSTEM "../../../../lib/xml/doc.dtd" >
 <doc xmlns:x="http://www.w3.org/1999/xhtml">
  <head>
-  <title>Christmas 2022</title>
+  <title>Christmas 2023</title>
   <author>Catharine and Henry</author>
-  <date>23 December 2022</date>
+  <date>24 December 2023</date>
   <style>body {width: 30cm}
          .intro {font-size: 120% ; font-weight: bold; margin-top: 5mm }
          .narrow2 {width: 49%}
@@ -28,30 +28,29 @@
   <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 2021</p>
-    <image textGloss="Christmas table, Edinburgh, 2021-12-25, Joanna, Henry and Catharine's brother Jonathan and his wife Sally" source="2022pics/christmas_20211225.jpg" width="100%" style="margin-bottom: 0.5cm"/>    
-    <image textGloss="James's cat Simone in Seattle on Christmas morning" source="2022pics/simone_20211225.jpg" width="49%" class="left clearLeft"/>
-   <image textGloss="Cambridge, 2021-12-05, Freya, Jamie, Callum, Emma, Rob" source="2022pics/boland_christmas_20211205.jpg" width="49%" class="left" style="margin-bottom: 0.6cm"/>
+   <p class="intro">New Year's Eve, 2022/3</p>
+    <image textGloss="Port and mince pies in Edinburgh" source="2023pics/IMG-20221231-WA0001.jpg" width="100%" style="margin-bottom: 0.5cm"/>
    <p class="intro clearLeft">Travels various, spring and early summer</p>
-    <image textGloss="Norfolk, 2022-02-19, Rob and Emma on the beach" source="2022pics/emma-rob_20220219.jpg" width="49%" class="left"/>
-   <image textGloss="Easter in Edinburgh, 2022, James and Freya" source="2022pics/james-freya_20220410.jpg" width="49%" class="left"/>
+   <image textGloss="Highlands, 2023-01-02, Jo and Adam swimming in Loch @@" source="2023pics/IMG-20230102-WA0003.jpg" width="49%" class="left"/> 
+    <image textGloss="Stonehengge, 2023-02-19, Rob and Emma's weekend away" source="2023pics/IMG-20230305-WA0000.jpg" width="49%" class="left"/>
+   <image textGloss="Easter in Edinburgh, 2023, James and Freya" source="2023pics/james-freya_20230410.jpg" width="49%" class="left"/>
 <div style="margin: auto; width: 80%; clear: left">
-   <image textGloss="Callum's first Communion, Cambridge, 2022-06-03, Emma, Adam, Rob, Henry, Joanna, Callum, Freya, Catharine, Jamie (channeling Hulk)" source="2022pics/callum_1st_communion_20220619.jpg" width="100%"/></div>
+   <image textGloss="Callum's first Communion, Cambridge, 2023-06-03, Emma, Adam, Rob, Henry, Joanna, Callum, Freya, Catharine, Jamie (channeling Hulk)" source="2023pics/callum_1st_communion_20230619.jpg" width="100%"/></div>
         <p class="intro">Summer hols</p>
-   <image textGloss="Villeseque, France, view from Clare and Chris Thomson's new guestroom, June 2022" source="2022pics/villeseque_20220627.jpg" width="49%" class="left"/>
-   <image textGloss="Lac de Vassiviere, France, view from our campsite, August 2022" source="2022pics/vassiviere_20220825.jpg" width="49%" class="left"/>   
-   <image textGloss="Cornwall, September 2022, Adam and Joanna" source="2022pics/adam-jo_cropped_20220918.jpg" width="49%" class="left"/>
+   <image textGloss="Villeseque, France, view from Clare and Chris Thomson's new guestroom, June 2023" source="2023pics/villeseque_20230627.jpg" width="49%" class="left"/>
+   <image textGloss="Lac de Vassiviere, France, view from our campsite, August 2023" source="2023pics/vassiviere_20230825.jpg" width="49%" class="left"/>   
+   <image textGloss="Cornwall, September 2023, Adam and Joanna" source="2023pics/adam-jo_cropped_20230918.jpg" width="49%" class="left"/>
 <div style="margin: auto; width: 80%; clear: left"> 
-   <image textGloss="Lac de Vassiviere, France, Bolands' campsite, August 2022, Freya, Jamie, Emma, Callum" source="2022pics/campsite_20220822.jpg" width="100%"/></div>
-   <p class="intro">Autumn/Winter 2022</p>
-   <image textGloss="Little Tunk Lake, Maine, October 2022, fall colours" source="2022pics/fall_colours_20221012.jpg" width="32%" class="left clearLeft"/>
-   <image textGloss="Mount Blair, Glenshee, Scotland, December 2022, Catharine and Henry" source="2022pics/henry-cath_20221203.jpg" width="32%" class="left"/>
-   <image textGloss="Edinburgh, Catharine's birthday, December 2022" source="2022pics/cath_at_70_20221210.jpg" width="32%" class="left" style="margin-bottom: 0.6cm"/>
-   <p class="intro clearleft">Preparing for Christmas, 2022</p>
-    <image textGloss="Wreath by Joanna, London, 2022-12-03" source="2022pics/jo-wreath-20221203.jpg" width="24.5%" class="clearLeft left"/>
-    <image textGloss="Christmas tree with elf, Cambridge, 2022-12-06" source="2022pics/flying_santa_20221205.jpg" width="24%" class="left"/>
-    <image textGloss="Wreath by Emma, Cambridge, 2022-11-27" source="2022pics/boland-wreath_20221127.jpg" width="24.5%" class="left"/>
-    <image textGloss="Wreath by Catharine, Edinburgh, 2022-12-23" source="2022pics/11dc-wreath_20221223.jpg" width="24%" class="left"/>
+   <image textGloss="Lac de Vassiviere, France, Bolands' campsite, August 2023, Freya, Jamie, Emma, Callum" source="2023pics/campsite_20230822.jpg" width="100%"/></div>
+   <p class="intro">Autumn/Winter 2023</p>
+   <image textGloss="Little Tunk Lake, Maine, October 2023, fall colours" source="2023pics/fall_colours_20231012.jpg" width="32%" class="left clearLeft"/>
+   <image textGloss="Mount Blair, Glenshee, Scotland, December 2023, Catharine and Henry" source="2023pics/henry-cath_20231203.jpg" width="32%" class="left"/>
+   <image textGloss="Edinburgh, Catharine's birthday, December 2023" source="2023pics/cath_at_70_20231210.jpg" width="32%" class="left" style="margin-bottom: 0.6cm"/>
+   <p class="intro clearleft">Preparing for Christmas, 2023</p>
+    <image textGloss="Wreath by Joanna, London, 2023-12-03" source="2023pics/jo-wreath-20231203.jpg" width="24.5%" class="clearLeft left"/>
+    <image textGloss="Christmas tree with elf, Cambridge, 2023-12-06" source="2023pics/flying_santa_20231205.jpg" width="24%" class="left"/>
+    <image textGloss="Wreath by Emma, Cambridge, 2023-11-27" source="2023pics/boland-wreath_20231127.jpg" width="24.5%" class="left"/>
+    <image textGloss="Wreath by Catharine, Edinburgh, 2023-12-23" source="2023pics/11dc-wreath_20231223.jpg" width="24%" class="left"/>
    <p class="clearLeft">&nbsp;</p>
   </div>
  </body>