issue 209: no captions with only figure number in slides

doconce · Dec 9, 2021 · d4b8c0d · d4b8c0d
1 parent e210265
commit d4b8c0d
Show file tree

Hide file tree

Showing 43 changed files with 32 additions and 99 deletions.
diff --git a/admon.txt b/admon.txt
@@ -3,7 +3,7 @@ Testing admons
 
 H. P. Langtangen
 
-Date: Nov 29, 2021
+Date: Dec 9, 2021
 
 2021, H. P. Langtangen
 

diff --git a/admon_demo/._admon_bootstrap_alert000.html b/admon_demo/._admon_bootstrap_alert000.html
@@ -129,7 +129,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_apricot.html b/admon_demo/admon_apricot.html
@@ -117,7 +117,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_bootstrap_alert.html b/admon_demo/admon_bootstrap_alert.html
@@ -129,7 +129,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_bootswatch_panel.html b/admon_demo/admon_bootswatch_panel.html
@@ -106,7 +106,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_colors.html b/admon_demo/admon_colors.html
@@ -172,7 +172,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_colors1.pdf b/admon_demo/admon_colors1.pdf
diff --git a/admon_demo/admon_colors2.pdf b/admon_demo/admon_colors2.pdf
diff --git a/admon_demo/admon_gray.html b/admon_demo/admon_gray.html
@@ -185,7 +185,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_graybox2.pdf b/admon_demo/admon_graybox2.pdf
diff --git a/admon_demo/admon_grayicon.pdf b/admon_demo/admon_grayicon.pdf
diff --git a/admon_demo/admon_lyx.html b/admon_demo/admon_lyx.html
@@ -162,7 +162,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_mdfbox.pdf b/admon_demo/admon_mdfbox.pdf
diff --git a/admon_demo/admon_mwiki.mwiki b/admon_demo/admon_mwiki.mwiki
@@ -1,7 +1,7 @@
 #TITLE (actually governed by the filename): Testing admons
 
 By '''H. P. Langtangen'''
-==== Nov 29, 2021 ====
+==== Dec 9, 2021 ====
 
 2021, H. P. Langtangen
 

diff --git a/admon_demo/admon_paragraph-footnotesize.html b/admon_demo/admon_paragraph-footnotesize.html
@@ -488,7 +488,7 @@ <h2 id="___sec4">Going deeper environments </h2>
 And then we add a figure too.
 
 <p>
-(??)<center><p><img src="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../doc/src/manual/fig/wave1D.png" align="bottom" width=400></p></center>
+(??)<center><p><img src="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../doc/src/manual/fig/wave1D.png" align="bottom" width=400></p></center>
 </div>
 
 

diff --git a/admon_demo/admon_paragraph-footnotesize.pdf b/admon_demo/admon_paragraph-footnotesize.pdf
diff --git a/admon_demo/admon_paragraph.html b/admon_demo/admon_paragraph.html
@@ -162,7 +162,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_paragraph.txt b/admon_demo/admon_paragraph.txt
@@ -3,7 +3,7 @@ Testing admons
 
 H. P. Langtangen
 
-Date: Nov 29, 2021
+Date: Dec 9, 2021
 
 2021, H. P. Langtangen
 

diff --git a/admon_demo/admon_sphinx/_sources/admon.rst.txt b/admon_demo/admon_sphinx/_sources/admon.rst.txt
@@ -8,7 +8,7 @@ Testing admons
 %%%%%%%%%%%%%%
 
 :Authors: H. P. Langtangen
-:Date: Nov 29, 2021
+:Date: Dec 9, 2021
 
 .. !split
 

diff --git a/admon_demo/admon_sphinx/admon.html b/admon_demo/admon_sphinx/admon.html
@@ -60,7 +60,7 @@ <h1>Testing admons<a class="headerlink" href="#testing-admons" title="Permalink
 </ol>
 </dd>
 <dt class="field-even">Date</dt>
-<dd class="field-even"><p>Nov 29, 2021</p>
+<dd class="field-even"><p>Dec 9, 2021</p>
 </dd>
 </dl>
 <div class="section" id="introduction">

diff --git a/admon_demo/admon_sphinx/searchindex.js b/admon_demo/admon_sphinx/searchindex.js
diff --git a/admon_demo/admon_yellow.html b/admon_demo/admon_yellow.html
@@ -182,7 +182,7 @@ <h1>Testing admons</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/admon_demo/admon_yellowicon.pdf b/admon_demo/admon_yellowicon.pdf
diff --git a/admon_sphinx/_sources/admon.rst.txt b/admon_sphinx/_sources/admon.rst.txt
@@ -8,7 +8,7 @@ Testing admons
 %%%%%%%%%%%%%%
 
 :Authors: H. P. Langtangen
-:Date: Nov 29, 2021
+:Date: Dec 9, 2021
 
 .. !split
 

diff --git a/admon_sphinx/admon.html b/admon_sphinx/admon.html
@@ -60,7 +60,7 @@ <h1>Testing admons<a class="headerlink" href="#testing-admons" title="Permalink
 </ol>
 </dd>
 <dt class="field-even">Date</dt>
-<dd class="field-even"><p>Nov 29, 2021</p>
+<dd class="field-even"><p>Dec 9, 2021</p>
 </dd>
 </dl>
 <div class="section" id="introduction">

diff --git a/admon_sphinx/searchindex.js b/admon_sphinx/searchindex.js
diff --git a/demo_testdoc.html b/demo_testdoc.html
@@ -310,7 +310,7 @@ <h1>A Document for Testing DocOnce</h1>
 </center>
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 <h1 id="table_of_contents">Table of contents</h1>
@@ -787,12 +787,12 @@ <h3 id="subsubsection-heading-before-code">Subsubsection heading before code </h
       <div class="input_area">
 
 <script type="text/javascript">
-function show_hide_codea35c(){
-  $("#codea35c").toggle();
+function show_hide_codeeb1b(){
+  $("#codeeb1b").toggle();
 }
 </script>
-<button type="button" onclick="show_hide_codea35c()">Show/Hide code</button>
-<div id="codea35c" style="display:none">
+<button type="button" onclick="show_hide_codeeb1b()">Show/Hide code</button>
+<div id="codeeb1b" style="display:none">
 <table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">1</span>
 <span style="color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px;">2</span></pre>
 </div></td><td class="code"><div class="highlight" style="background: #eeeedd">

diff --git a/html_template1.html b/html_template1.html
@@ -51,7 +51,7 @@
 <body bgcolor="white">
 
 <title>This is a test of HTML templates</title>
-<h4>Date: Nov 29, 2021</h4>
+<h4>Date: Dec 9, 2021</h4>
 
 <!-- main body -->
 

diff --git a/locale.html b/locale.html
@@ -126,7 +126,7 @@ <h1>DocOnce med norsk</h1>
 </center>
 <br>
 <center>
-<h4>mandag, 29. nov., 2021</h4>
+<h4>torsdag, 09. des., 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/locale.tex b/locale.tex
@@ -298,7 +298,7 @@
 
 % --- begin date ---
 \begin{center}
-mandag, 29. nov., 2021
+torsdag, 09. des., 2021
 \end{center}
 % --- end date ---
 

diff --git a/movie_demo/movies.html b/movie_demo/movies.html
@@ -131,7 +131,7 @@ <h1>This is a demo of movies in DocOnce</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/movie_demo/movies.pdf b/movie_demo/movies.pdf
diff --git a/movie_demo/movies_3choices.html b/movie_demo/movies_3choices.html
@@ -131,7 +131,7 @@ <h1>This is a demo of movies in DocOnce</h1>
 <!-- institution(s) -->
 <br>
 <center>
-<h4>Nov 29, 2021</h4>
+<h4>Dec 9, 2021</h4>
 </center> <!-- date -->
 <br>
 

diff --git a/movie_demo/movies_media9.pdf b/movie_demo/movies_media9.pdf
diff --git a/movie_demo/movies_media9_extviewer.pdf b/movie_demo/movies_media9_extviewer.pdf
diff --git a/movies.txt b/movies.txt
@@ -3,7 +3,7 @@ This is a demo of movies in DocOnce
 
 HPL
 
-Date: Nov 29, 2021
+Date: Dec 9, 2021
 
 Here is a movie in WebM format.
 

diff --git a/pytests.py b/pytests.py
@@ -627,6 +627,8 @@ def test_doconce_html_slides(change_test_dir, tdir):
             html = f.read()
         assert html.find('themes/style/swiss.css') > -1
         assert html.find('<link rel="stylesheet" media="screen" href="">') > 10
+        assert '<p class="caption">Figure 2</p>' not in html #captions with only figure number are removed in slides
+
         # reveal.js slides
         os.system('cp testdoc.html temp.html')
         out = subprocess.run('doconce slides_html temp.html reveal '
-Original file line number
+Diff line change
@@ Expand Up / @@ -488,7 +488,7 @@ <h2 id="___sec4">Going deeper environments </h2> @@
     And then we add a figure too.
     <p>
-    (??)<center><p><img src="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../doc/src/manual/fig/wave1D.png" align="bottom" width=400></p></center>
+    (??)<center><p><img src="../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../doc/src/manual/fig/wave1D.png" align="bottom" width=400></p></center>
     </div>
@@ Expand Down @@