diff --git a/7. Case Studies/CERN and the LHC.md b/7. Case Studies/CERN and the LHC.md
index 10d08f0..04778bc 100644
--- a/7. Case Studies/CERN and the LHC.md
+++ b/7. Case Studies/CERN and the LHC.md
@@ -1,7 +1,9 @@
## CERN and the LHC
The [CERN laboratory](https://www.cern.ch) and the [Worldwide LHC Computing Grid (WLCG)](https://home.cern/science/computing/grid) are large users of IPv6 for massive data transfers.
-Some recent statistics are shown here:
+Some recent statistics are shown here:
+
+
(Image from the February 2024 data challenge at CERN.)
diff --git a/Title.md b/Title.md
index 669b74e..8f04a45 100644
--- a/Title.md
+++ b/Title.md
@@ -1,5 +1,5 @@
# book6
-
+
A collaborative IPv6 book.
diff --git a/pdf/README.md b/pdf/README.md
index 8e7c10d..4de0d73 100644
--- a/pdf/README.md
+++ b/pdf/README.md
@@ -1,5 +1,7 @@
This folder `pdf` is used for generating a complete PDF file of book6 and is not otherwise interesting.
+As of 2024-04-04 the contents of this folder are work-in-progress and not useful to readers.
+
The image files are duplicated here intentionally.
The intermediate file `baked.md` is a complete markdown of the whole book.
\ No newline at end of file
diff --git a/pdf/baked.md b/pdf/baked.md
index 94f9285..dcd8720 100644
--- a/pdf/baked.md
+++ b/pdf/baked.md
@@ -1,5 +1,5 @@
# book6
-
+
A collaborative IPv6 book.
@@ -26,10 +26,10 @@ Released under the Creative Commons Attribution 4.0 license, known as CC BY 4.0.
-Version captured at 2024-04-03 13:53:33 UTC+1300
+Version captured at 2024-04-04 10:59:19 UTC+1300
# book6: A Collaborative IPv6 Book.
-
+
This is the current list of contents. It will change as the book evolves.
There is also an [index](#book6-main-index),
@@ -2375,7 +2375,7 @@ various technologies:
and comparison of these technologies.
The following figure illustrates such a scenario.
-
+
- 464XLAT is the widely preferred translation technology now because it
has a natural synergy with NAT64 (which is highly desirable by itself)
@@ -3432,7 +3432,7 @@ addresses `2001:db8:abcd:0101::abc1` and `2001:db8:b123:0101::def2`.
values.)
The following diagram shows the example:
-
+
If, for some reason, there is more than one subnet router on the subnet,
the host can be informed which one to use as suggested in
[RFC8028](https://www.rfc-editor.org/info/rfc8028).
@@ -3760,7 +3760,7 @@ fine.
## CERN and the LHC
The [CERN laboratory](https://www.cern.ch) and the [Worldwide LHC Computing Grid (WLCG)](https://home.cern/science/computing/grid) are large users of IPv6 for massive data transfers.
-Some recent statistics are shown here:
+Some recent statistics are shown here:
(Image from the February 2024 data challenge at CERN.)
@@ -3823,7 +3823,7 @@ Internet Registry (RIR) to show the number of the Internet IPv6 users
compared with the total Internet population (in million, see next
table).
-
+
A third of the Internet population apparently employs IPv6. It is also
interesting to look at the growth curve. The main indicator here is the
@@ -3851,7 +3851,7 @@ have an associated Autonous System Number (ASN).
provides statistics on the evolution of IPv6 support across the ASNs in
the world, as observed in the Internet routing tables.
-
+
The percentage of IPv6-capable ASNs is growing over the years, which is
a good sign. On the other hand, the table does not allow to understand
@@ -4126,7 +4126,7 @@ flowchart LR
C - -> B[BCP] - -> L
-->
-
+
An important RFC is the latest version of
[IPv6 Node Requirements](https://www.rfc-editor.org/info/bcp220), which
@@ -4168,7 +4168,7 @@ flowchart LR
D - -> X[draft-xyz-*] - -> P[Personal work] - -> J
-->
-
+
There are also numerous books, book chapters, and other documents about
IPv6. However, any source that is more than one or two years old is
@@ -5435,7 +5435,7 @@ Embedded in markdown as an SVG file generated by [*mermaid.live*](https://mermai
Displayed thus:
-
+
Example generated with *dia*:
@@ -5443,7 +5443,7 @@ Example generated with *dia*:
```
-
+
Please add alternate text to help people with visual difficulties.
@@ -5467,7 +5467,7 @@ Section text goes here
### [Previous](#markdown-usage) [Chapter Contents](#chapter-template)
# book6 Main Index
-
+
Generated at 2024-02-25 14:10:55 UTC+1300
@@ -5944,7 +5944,7 @@ If you think any keywords are missing, please raise an issue (use link on GitHub
### [Back to main Contents](#list-of-contents)
# book6 Citation Index
-
+
Generated at 2024-02-25 14:10:55 UTC+1300
diff --git a/pdf/baked.pdf b/pdf/baked.pdf
new file mode 100644
index 0000000..26f051a
Binary files /dev/null and b/pdf/baked.pdf differ
diff --git a/utilities/bakeBook.py b/utilities/bakeBook.py
index f447639..a8b2e6a 100644
--- a/utilities/bakeBook.py
+++ b/utilities/bakeBook.py
@@ -10,6 +10,7 @@
# Version: 2024-01-18 - skip code blocks when fixing citations
# Version: 2024-01-29 - use dedicated pdf directory
# Version: 2024-04-02 - copy image files to pdf directory
+# Version: 2024-04-04 - change image citations to suit pandoc
########################################################
# Copyright (C) 2024 Brian E. Carpenter.
@@ -118,7 +119,7 @@ def uncase(l):
return u
def fix_section(raw):
- """Change citations throughout a section"""
+ """Change citations and images throughout a section"""
new = []
skipping = False
for line in raw:
@@ -137,6 +138,7 @@ def fix_section(raw):
new.append(line)
continue
if "](" in line:
+ #need to reformat citation
outline = ""
while "](" in line:
head, line = line.split("](", maxsplit=1)
@@ -163,6 +165,25 @@ def fix_section(raw):
target = "book6-citation-index"
outline += head + "](#" + target +")"
outline += line
+ elif "
+ head, tail = line.split()
", maxsplit=1)
+ except:
+ img, tail = tail.split(">", maxsplit=1)
+ img = img.replace("'", '"') #normalise string delimiters to "
+ imgfile, imgalt = img[1:].split('"', maxsplit=1)
+ imgfile = imgfile.replace("./", "") #normalise image file name
+ # extract alternative text
+ try:
+ _, imgalt = imgalt.split('alt="', maxsplit=1)
+ imgalt, _ = imgalt.split('"', maxsplit=1)
+ except:
+ imgalt = "No description available"
+ #build image citation
+ outline = head+''+tail
else:
outline = line
#Avoid unwanted anchors