Merge pull request #676 from ndw/iss-675

ndw · web-flow · commit 8e8565d965e3 · 2025-12-02T09:49:17.000Z
Make em and cite upright in mediaobject captions
diff --git a/src/main/scss/media-all.scss b/src/main/scss/media-all.scss
@@ -646,6 +646,10 @@ table {
         margin-right: 2em;
         font-style: italic;
 
+        em, cite {
+            font-style: normal;
+        }
+
         p {
             margin-top: 0;
         }
diff --git a/src/test/resources/expected/figure.008.html b/src/test/resources/expected/figure.008.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: figure.008</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: figure.008</h1></header><p>This is a test for figure captions.</p><div id="R_fig1" class="figure formalobject"><div class="mediaobject"><div class="media image"><span class="viewport-table" style="width:288px;"><span class="viewport-row"><span class="viewport-cell" style="text-align:center;"><span><span class="viewport"><picture class="imageobject"><img src="media/duck.png" style="width:288px;"/></picture></span></span></span></span></span></div><div class="caption"><p>This is a <em>duck</em> picture from <cite class="citetitle">Some Volume</cite>.</p></div></div><div class="caption"><p>This is a <em>duck</em> picture from <cite class="citetitle">Some Volume</cite>.</p></div><header><div class="title">Figure <span class="label">1</span><span class="sep">. </span>The Duck</div></header></div></article></main><nav class="bottom"></nav></body></html>
diff --git a/src/test/resources/xml/figure.008.xml b/src/test/resources/xml/figure.008.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<article xmlns="http://docbook.org/ns/docbook" version="5.0">
+<title>Unit test: figure.008</title>
+  <para>This is a test for figure captions.</para>
+
+<figure>
+  <title>The Duck</title>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="../media/duck.png" align="center" width="50%"/>
+    </imageobject>
+  <caption>
+    <para>This is a <emphasis>duck</emphasis> picture from <citetitle>Some Volume</citetitle>.</para>
+  </caption>
+  </mediaobject>
+  <caption>
+    <para>This is a <emphasis>duck</emphasis> picture from <citetitle>Some Volume</citetitle>.</para>
+  </caption>
+</figure>
+
+</article>
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: figure.008</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: figure.008</h1></header><p>This is a test for figure captions.</p><div id="R_fig1" class="figure formalobject"><div class="mediaobject"><div class="media image"><span class="viewport-table" style="width:288px;"><span class="viewport-row"><span class="viewport-cell" style="text-align:center;"><span><span class="viewport"><picture class="imageobject"><img src="media/duck.png" style="width:288px;"/></picture></span></span></span></span></span></div><div class="caption"><p>This is a <em>duck</em> picture from <cite class="citetitle">Some Volume</cite>.</p></div></div><div class="caption"><p>This is a <em>duck</em> picture from <cite class="citetitle">Some Volume</cite>.</p></div><header><div class="title">Figure <span class="label">1</span><span class="sep">. </span>The Duck</div></header></div></article></main><nav class="bottom"></nav></body></html>