render images correctly in pdf and epub outputs

Author: jgadsden

.github/workflows/pr.yaml

@@ -80,7 +80,7 @@ jobs:
             draft.markdown
 
       - name: Save pdfs and epubs
-        uses: actions/[email protected].0
+        uses: actions/[email protected].4
         with:
           name: export-draft
           path: publish

.github/workflows/release.yaml

@@ -7,6 +7,9 @@ on:
       - v?.?.?*
   workflow_dispatch:
 
+env:
+  RESOURCE_PATH: release/assets/images:release/assets:release:assets/images:assets/images/logos:assets/images/logos/publish
+
 # for security reasons the github actions are pinned to specific release versions
 jobs:
   create_artifacts:
@@ -31,34 +34,37 @@ jobs:
           find draft -name "*.md" -exec sed -i "/edit on GitHub/d" {} +
           find draft -name "*.md" -exec sed -i "/www-project-developer-guide\/issues\/new?labels/d" {} +
           find draft -name "*.md" -exec sed -i "/www-project-developer-guide\/blob\/main/d" {} +
+          find draft -name "*.md" -exec sed -i "s/{: .image-right }/{height=180px}/g" {} +
 
       - name: Combine markdown
         run: |
-          tail --lines=+14 -q $(find draft -name "*[0-9]*.md" | sort) > release.markdown
-          mkdir -p publish
+          mkdir publish
+          mkdir assets/images/logos/publish
+          mkdir release/publish
+          tail --lines=+14 -q $(find draft -name "*[0-9]*.md" | sort) > release/publish/draft.markdown
 
       - name: Export to pdf
         uses: docker://pandoc/latex:3.1
         with:
           args: >-
             --from=markdown
             --output=publish/OWASP_Developer_Guide.pdf
-            --resource-path="release/assets/images:release/assets:release"
+            --resource-path=${{ env.RESOURCE_PATH }}
             release/title.pdf.yaml
-            release.markdown
+            release/publish/draft.markdown
 
       - name: Export to epub
         uses: docker://pandoc/latex:3.1
         with:
           args: >-
             --from=markdown
             --output=publish/OWASP_Developer_Guide.epub
-            --resource-path="release/assets/images:release/assets:release"
+            --resource-path=${{ env.RESOURCE_PATH }}
             release/title.yaml
-            release.markdown
+            release/publish/draft.markdown
 
       - name: Store pdf and epub assets
-        uses: actions/[email protected].0
+        uses: actions/[email protected].4
         with:
           name: export-docs
           path: publish

.gitignore

@@ -71,6 +71,5 @@
 !assets/images/*.png
 !assets/images/logos/
 !assets/images/logos/*.png
-!assets/images/logos/*.svg
 !license.txt
 

assets/images/logos/securecodebox.png

@@ -97,12 +97,21 @@ To run these checks locally before pushing a commit, run these commands from the
 1. Link checker: `lychee --max-retries 5 --exclude-path './_includes/*.html' './**/*.md'`
 2. Markdown linter: `markdownlint-cli2  **/*.md`
 3. Spell checker: `pyspelling --config .spellcheck.yaml`
-4. commands to create PDF and ePub outputs:
+4. commands to set up the environment for PDF and ePub export
 
 ```text
-tail -n +14 -q $(find draft -name "*[0-9]*.md" | sort) > draft.markdown
-pandoc -f markdown -o draft.pdf --resource-path="draft/assets/images:draft/assets:draft" draft/title.pdf.yaml draft.markdown
-pandoc -f markdown -o draft.epub --resource-path="draft/assets/images:draft/assets:draft" draft/title.yaml draft.markdown
+mkdir draft/publish
+mkdir assets/images/logos/publish
+export RESOURCE_PATH="draft/assets/images:draft/assets:draft:assets/images/logos:assets/images:assets/images/logos/publish"
+```
+
+and the commands to create PDF and ePub outputs, a subset of those in `release.yaml` :
+
+```text
+tail -n +14 -q $(find draft -name "*[0-9]*.md" | sort) > draft/publish/draft.markdown
+find draft -name "draft.markdown" -exec sed -i "s/{\: .image-right }/{height=180px}/g" {} +
+pandoc -f markdown -o draft.pdf --resource-path="$RESOURCE_PATH" draft/title.pdf.yaml draft/publish/draft.markdown
+pandoc -f markdown -o draft.epub --resource-path="$RESOURCE_PATH" draft/title.yaml draft/publish/draft.markdown
 ```
 
 Follow instructions to install the command line [lychee][lychee-install] and [pandoc][pandoc-install].

assets/images/logos/securecodebox.svg

@@ -12,7 +12,7 @@ permalink: /draft/verification/frameworks/secure_codebox/
 
 {% include breadcrumb.html %}
 
-![SecureCodeBox logo](../../../../assets/images/logos/securecodebox.svg "OWASP SecureCodeBox"){: height="180px" }
+![SecureCodeBox logo](../../../../assets/images/logos/securecodebox.png "OWASP SecureCodeBox"){: height="180px" }
 
 #### 6.3.1 secureCodeBox