Add figures to object entry pages

[geealbers]

After issues #1, #2 and #3 are complete, add the figures to the object entry pages using the q-figure and q-figure-group shortcodes. Make use of grouping and of classes like class="is-pulled-right" to arrange the figures in a sensible and pleasing manner. The one rule is that figures should always appear after their callout in the text. Oh, and figure shortcodes should appear between paragraphs with line breaks before and after.

[geealbers]

There were a few image files numbered in such a way as to presume that their figure numbering would look like: "Figure 11.4.1 and 11.4.2", rather than just "Figure 11.4". I left them as is, in individual image files rather than combining them in Photoshop, but I didn't see corresponding entries for all of these in the figures.yml file. I think we'll need to add them to the YAML file and then use the q-figure-group shortcode for placement.

fig-6-12-1.tiff
fig-6-12-2.tif
fig-6-12-3.tif

fig-8-13-1.jpg
fig-8-13-2.jpg

fig-10-13-1--fpo.jpg
fig-10-13-2--fpo.jpg

fig-11-4-1.TIF
fig-11-4-2.TIF

fig-13-16-1.tif
fig-13-16-2.tif

fig-14-14-1.tif
fig-14-14-2.tif

fig-18-16-1.jpg
fig-18-16-2.jpg

[geealbers]

So, the backslash escape characters in a few of the figures.yml captions came out as valid YAML, but were a problem for Hugo and caused the site not to build. I removed the characters, but please double check that the apostrophes in the captions for figures 15.5 and 19.5 are rendering correctly.

id: "fig-15-5"
caption: "Joseph Baumhauer (French, died 1772), *Bureau plat* and *cartonnier*, reign of Louis XV. *Bureau plat*: 190 x 95 x 84 cm (75 x 37.5 x 33 in.), *cartonnier*: 86 x 64 cm (34 x 25 in.). Paris, Hôtel Drouot, *Objets d'art et d'ameublement composant la collection de M. B. Kotschoubey*, April 13--16, 1906, lots 384 and 385."

id: "fig-19-5"
caption: "Jean-François Oeben (1721--1763), Mechanical table, ca. 1750--55. Oak veneered with kingwood, amaranth, burl wood, sycamore, mahogany; marquetry in polychrome wood; gilt bronze mounts; drawers lined with blue silk, 72 x 80 x 43 cm (28 x 31.5 x 17 in.). Paris, Galerie Charpentier, *Bel ameublement et objets d'art*, December 15, 2003, lot 109."

[geealbers]

@Erin-Cecele I've added the images in and you're now free to work on adding them to the object entry pages. Before you get started, you'll need to fetch and pull the lastest version of the master branch, and then run an additional command to get the images:

git submodule update --init --recursive

After running this, if you look in the static/img/figures folder, you should see all the image files. If not, let me know and we can look at it together.

And be sure to see my additional comments above.

[Erin-Cecele]

@geealbers In object entry page 5.md figure images 5-9 and 5-17 seem incorrect.

5-9 is just a black line.

5-17 is just a black rectangle.

Should I check with Rachel and Tevvy?

Also, should this be listed as a separate issue or should it stay in this thread?

[geealbers]

Those definitely aren't right. It must have been something I did in processing them. I'll take a look and let you know.

(And yes this is a good thread for these kinds of related issues. No need to pull it to a new issue unless it seems like a larger problem that will need more time and attention to fix.)

[Erin-Cecele]

For figures 6-12-1, 6-12-2, 6-12-3 it looks like they are simply meant to be grouped together. So, I created extra entries in the figures.yml all with the same caption.

I used this shortcode: {{< q-figure-group grid="2" id="fig-6-12-2, fig-6-12-3, fig-6-12-1" caption="Composite X-radiograph of the drawer fronts, showing the extent of the Chinese lacquer; overlaid with a visible image and infrared reflectogram.">}}

Ideally, I would like to have the Chinese laquer image on top and the radiograph and reflectogram images below it. Is that possible? Or is what I've done sufficient? Another option is just to have them appear one right after the other with a single caption.

[geealbers]

I figured out the black images issue. Once you've done a pass and submit a pull request, I can add a commit and new files to fix the issue. I'll wait until you've gone through everything though as it's certainly possible it will come up with other files.

For the set of three images, I think the primary image is actually the first one (the most boring) and if anything it should be the larger one. Unfortunately that could only be done with some hyper specific custom css, which I'm always hesitant to do. Let me think on it.

Does the figure callout in the text for that one refer just to figure 6.12, or does it say something like figures 6.12.1–3? If the former, it might actually be better for me to stick these all together in photoshop. Not sure.

[Erin-Cecele]

Issues:

Figures 6-12-1, 6-12-2, & 6-12-3 I created new figure.yml for all three. Text does not refer to -1, -2, -3 images. Caption hints at multiple images. Looks like they should all be combined as one image with one caption.

{{< q-figure-group grid="2" id="fig-6-12-2, fig-6-12-3, fig-6-12-1" caption="Composite X-radiograph of the drawer fronts, showing the extent of the Chinese lacquer; overlaid with a visible image and infrared reflectogram.">}}

Please note: I changed the order of the images. 6-12-1 comes last because I liked how it looked better aesthetically. If these images get combined in photoshop, I believe 6-12-1 should be on top as a larger image and 6-12-2 and 6-12-3 should be on the bottom side-by-side.

Figures 8-13-1 & 8-13-2 I created new figure.yml entries for both. Text does not refer to the -1 and -2 images. Looks like they should just be combined as one image with one caption.

{{< q-figure-group id="fig-8-13-1, fig-8-13-2" caption="Overlay of one of the desk's interior units, under visible and ultraviolet illumination. A varnishing restoration campaign is made visible in ultraviolent light: the restorer's brushstrokes fail to reach the very back of the unit where the original wax finish is preserved." >}}

Figures 10-13-1 & 10-13-2 I created new figure.yml entries for both. Text does not refer to the -1 and -2 images. Caption references a right and left image so it sounds like they should be combined as one image with one caption.

{{< q-figure-group grid="2" id="fig-10-13-1, fig-10-13-2" caption="Drawing (left) detailing the original method for securing the top to the case's side rails. Trapezoidal gaps in the rails held blocks of oak with dovetails that extended above the side rails. These gaps are still visible in the case sides. Drawing (right) of the sliding dovetail mortises in the original top. These would have had square-sided gaps, as well as undercut sections to receive the eight protruding dovetails from the case." >}}

Figures 11-4-1 & 11-4-2 Caption for 11-4-1 applies to that image alone. Caption for 11-5 seems to apply to 11-4-2. No caption or text in the object entry refers to the actual image 11-5 so I have not included that image in the text.

Currently:

11-4-1 = Figure 11.4 11-4-2 = Figure 11.5

I’m also note sure the call out in the text actually applies to these two images but I can’t really tell.

Object entry text: “the upper open section, or étagère; the drawer compartment in the center; and the lower case (figs. 11-4, 11-5).”

Shortcode: {{< q-figure-group grid="2" id="fig-11-4, fig-11-5" >}}

Figure.yml:

• id: "fig-11-4" src: "figures/fig-11-4-1.jpg" label: "Figure 11.4" caption: "Back right." download: true

• id: "fig-11-5" src: "figures/fig-11-4-2.jpg" label: "Figure 11.5" caption: "Back left." download: true

Figures 12-8 + 12-9 Listed in caption doc with the same caption. I have paired the images together with a single caption.

{{< q-figure-group grid="2" id="fig-12-8, fig-12-9" caption="X-radiographs of the .1 and .2 doors show that the cabinets' bowed doors are constructed of approximately 15 narrow vertical staves that were glued to one another and not attached by structural means. Also visible in the X-radiographs are the wooden pegs used to secure large battens across the tops and bottoms of each door." >}}

Figures 12-16 + 12-17 Listed in caption doc with the same caption. I have paired the images together with a single caption.

{{< q-figure-group grid="2" id="fig-12-16, fig-12-17" caption="Details of a mount from the .2 cabinet showing the brazing method used to ensure that the mounts would perfectly conform to the surface of the cabinet. The bronzier drilled two small holes on either side of the last joints to be welded, looped copper wire through the holes, and then twisted the wire to pull the joints tightly together, thereby fixing the position of the sections securely so that they could be brazed without shifting. The remnants of the wire, surrounded by brazing metal, are still visible." >}}

Figures 13-16-1 & 13-16-2 I created new figure.yml entries for both. Text does not refer to the -1 and -2 images. Caption refers to a right and left image. I believe these two images should be combined to form a singular 13-16.

{{< q-figure-group grid="2" id="fig-13-16-1, fig-13-16-2" caption="Comparison illustrating some of the subtle differences between the original figures (on the left) and the restored figures (on the right)." >}}

Figures 14-12 & 14-13 Listed in caption doc with the same caption. I have paired the images together with a single caption.

{{< q-figure-group grid="2" id="fig-14-12, fig-14-13" caption="Composite cross-section photomicrographs of the Japanese lacquer in ultraviolet illumination and visible light showing the thickness of the lacquer layers and the original Japanese wood substrate." >}}

Figure 14-14 There is a note in the caption requesting that image 14-14 be a two-layer image with a slider. I currently have the images 14-14-1 and 14-14-2 side-by-side with a single caption. I tried taking the custom css for the slider on the Quire homepage and applying it here but it was two wide and I couldn’t adjust the size properly. Please advise.

{{< q-figure-group id="fig-14-14-1, fig-14-14-2" caption="**[TWO LAYER IMAGE WITH SLIDER]** X-radiograph of the top drawer overlaid with visible light photography of the same area. Close inspection of the upper edge shows a linear band of original Japanese sprinkled *nashiji* silver powder decoration that has been covered by European lacquer. The Japanese butterfly, clearly visible in the X-radiograph because it was made using gold, has also been covered by European lacquer, while the later European butterflies are nearly invisible in the X-radiograph because they were executed in brass powder." grid="2" class="slider slider-small" >}}

Figure 15-17 This image is identical to 15-7. I don’t see a call out in the text for 15-17 and there is no caption information for 15-17. I believe this image is an error and shouldn’t exist.

Figures 17-5 & 17-6 Listed in caption doc with the same caption. I have paired the images together with a single caption.

{{< q-figure-group grid="2" id="fig-17-5, fig-17-6" caption="Details of the 72.DA.69.2 cabinet with mounts removed illustrating the different locations for the mounting hardware, original and current. Figure 17-5 is of the top left corner; figure 17-6 is of the left foot." >}}

Figures 17-11 & 17-12 Listed in caption doc with the same caption. I have paired the images together with a single caption.

{{< q-figure-group id="fig-17-11, fig-17-12" caption="The fronts (first image) and backs (second image) of mounts from both cabinets. In both images, the original mount is on the top, and the copies, sequentially, are beneath it." >}}

Figure 18-12 The text actually refers to figs. 18-12.1 and 18-12.2 (notice the formatting). However, there is only one image for 18-12. That image is a composite of two side-by-side images. The caption references a left and right image. I think the text just needs to be amended to only refer to 18-12.

Object entry text: “These can be removed to allow the toothed rails on the sides of the sliding case to be inserted or removed from the guides (figs. 18-12.1, 18-12.2).”

Shortcode: {{< q-figure id="fig-18-12" >}}

Figures 18-16-1 & 18-16-2 Text actually refers to figs. 18-16.1 and 18-16.2 (again notice the formatting). However, the caption treats this as a singular image. Right now, I have the two images 18-16-1 and 18-16-2 side-by-side with a single caption. I added a second entry in the figure.yml and then changed the id, src, and label so they actually appear as 18.16.1 and 18.16.2. I think this one weirdly works and might not need to be adjusted.

Object entry text: “Using young fustic dye followed by historically accurate blends of impure iron sulfate for the dye mordant resulted in a range of muted greens that are probably representative of the original colors of the leaves and stems in Oeben’s marquetry (figs. 18-16.1, 18-16.2).”

Shortcode: {{< q-figure-group id="fig-18-16-1, fig-18-16-2" grid="2" caption="Sample tiles of holly wood. At left, dyed with young fustic dye at different concentrations; at right, mordanted with two different grades of impure iron sulfate (left nine tiles and right nine tiles) to show the range of green tones that could be achieved using Oeben's original recipe." >}}

Figures 21.9 & 21.10 Listed in caption doc with the same caption. I have paired the images together with a single caption.

{{< q-figure-group grid="2" id="fig-21-9, fig-21-10" caption="Comparison of the original eighteenth-century mounts of the Latz commode ([cat. no. 16](/catalogue/16/)) and the copies on this commode. The chasing of the Latz mounts is more varied; the chasing of the later copies is more mechanical, though very skillfully executed. The differences between the two make it clear that new master models were made for the copies rather than simply taking molds from the originals." >}}

[Erin-Cecele]

I'm not totally certain, but it looks like Figure 4.12 might also be a damaged/incorrect image file.

[geealbers]

Completed with PR #16. Some of the things mentioned above that were not dealt with in the pull request, will be posted as separate issues.