From 7df93a65f474b6cee140242f5ca967eb60f3b355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Arbez-Gindre?= Date: Sun, 30 Jun 2024 11:52:31 +0200 Subject: [PATCH 1/4] Add diagram examples for barcode --- tests/fixtures/sample-with-diagram.adoc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/fixtures/sample-with-diagram.adoc b/tests/fixtures/sample-with-diagram.adoc index 7c42fa14..b1de82db 100644 --- a/tests/fixtures/sample-with-diagram.adoc +++ b/tests/fixtures/sample-with-diagram.adoc @@ -221,3 +221,15 @@ drive 1--* play_player play 1--* play_player player 1--* play_player ---- + +== Barcode + +[codabar] +---- +A31117013206375A +---- + +[qrcode, format="png", xdim=4] +.... +Hello World! +.... From aa72d399d2ac7ae452697ea8dcdcefe5010d4679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Arbez-Gindre?= Date: Sun, 30 Jun 2024 11:52:49 +0200 Subject: [PATCH 2/4] Install barcode extensions --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 911c1ad4..02c0b54c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -134,6 +134,9 @@ RUN apk add --no-cache --virtual .rubymakedepends \ "asciidoctor-bibtex:${ASCIIDOCTOR_BIBTEX_VERSION}" \ "asciidoctor-kroki:${ASCIIDOCTOR_KROKI_VERSION}" \ "asciidoctor-reducer:${ASCIIDOCTOR_REDUCER_VERSION}" \ + barby \ + rqrcode \ + chunky_png \ && apk del -r --no-cache .rubymakedepends \ # Fixes an issue with 2 nokogiri versions breaking asciidoctor-epub3 on arm64 && if [[ ${TARGETARCH} == arm64 ]]; then gem uninstall nokogiri -v '1.16.0'; fi From 19577a332a86ec37d9afec7b3a1a455b7c213d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Arbez-Gindre?= Date: Sun, 30 Jun 2024 11:52:31 +0200 Subject: [PATCH 3/4] Add diagram examples for barcode --- tests/fixtures/sample-with-diagram.adoc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/fixtures/sample-with-diagram.adoc b/tests/fixtures/sample-with-diagram.adoc index 79e215f7..f69d8063 100644 --- a/tests/fixtures/sample-with-diagram.adoc +++ b/tests/fixtures/sample-with-diagram.adoc @@ -239,4 +239,15 @@ http://www.gnuplot.info/ [gnuplot] .... plot sin(x) + +== Barcode + +[codabar] +---- +A31117013206375A +---- + +[qrcode, format="png", xdim=4] +.... +Hello World! .... From 2730fd158f8cf6a5e2314b1ded6f945b982615dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Arbez-Gindre?= Date: Tue, 2 Jul 2024 14:34:49 +0200 Subject: [PATCH 4/4] Explicitelly set version of added gems --- Dockerfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e44eef4d..dcdfef5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,6 +96,9 @@ ARG kramdown_asciidoc_version=2.1.0 ARG asciidoctor_bibtex_version=0.9.0 ARG asciidoctor_kroki_version=0.10.0 ARG asciidoctor_reducer_version=1.0.2 +ARG barby_version=0.6.8 +ARG rqrcode_version=2.2.0 +ARG chunky_png_version=1.4.0 ENV ASCIIDOCTOR_CONFLUENCE_VERSION=${asciidoctor_confluence_version} \ ASCIIDOCTOR_DIAGRAM_VERSION=${asciidoctor_diagram_version} \ @@ -106,7 +109,10 @@ ENV ASCIIDOCTOR_CONFLUENCE_VERSION=${asciidoctor_confluence_version} \ KRAMDOWN_ASCIIDOC_VERSION=${kramdown_asciidoc_version} \ ASCIIDOCTOR_BIBTEX_VERSION=${asciidoctor_bibtex_version} \ ASCIIDOCTOR_KROKI_VERSION=${asciidoctor_kroki_version} \ - ASCIIDOCTOR_REDUCER_VERSION=${asciidoctor_reducer_version} + ASCIIDOCTOR_REDUCER_VERSION=${asciidoctor_reducer_version} \ + BARBY_VERSION=${barby_version} \ + RQRCODE_VERSION=${rqrcode_version} \ + CHUNKY_PNG_VERSION=${chunky_png_version} ## Always use the latest dependencies versions available for the current Alpine distribution # hadolint ignore=DL3018,DL3028 @@ -135,9 +141,9 @@ RUN apk add --no-cache --virtual .rubymakedepends \ "asciidoctor-bibtex:${ASCIIDOCTOR_BIBTEX_VERSION}" \ "asciidoctor-kroki:${ASCIIDOCTOR_KROKI_VERSION}" \ "asciidoctor-reducer:${ASCIIDOCTOR_REDUCER_VERSION}" \ - barby \ - rqrcode \ - chunky_png \ + "barby:${BARBY_VERSION}" \ + "rqrcode:${RQRCODE_VERSION}" \ + "chunky_png:${CHUNKY_PNG_VERSION}" \ && apk del -r --no-cache .rubymakedepends \ # Fixes an issue with 2 nokogiri versions breaking asciidoctor-epub3 on arm64 && if [[ ${TARGETARCH} == arm64 ]]; then gem uninstall nokogiri -v '1.16.0'; fi