about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authortoonn <toonn@toonn.io>2022-02-05 15:44:58 +0100
committertoonn <toonn@toonn.io>2022-02-05 15:44:58 +0100
commit6c21d145298da1e5a05bb220d1a3c1973ebefac3 (patch)
tree99879e2f0fef9ca594487a27df94fba6fcfef3d6
parent7cbdd92a66e5f0d08672b4b9fc36492a7dc1eed6 (diff)
parent117420c48b8748424ba0589def31023fdc7d9c44 (diff)
downloadranger-6c21d145298da1e5a05bb220d1a3c1973ebefac3.tar.gz
Merge branch 'kankaristo-patch-1'
-rw-r--r--README.md4
-rw-r--r--doc/ranger.16
-rw-r--r--doc/ranger.pod6
-rwxr-xr-xranger/data/scope.sh8
4 files changed, 17 insertions, 7 deletions
diff --git a/README.md b/README.md
index 4f8b7b1a..10bdcfb5 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,9 @@ For enhanced file previews (with `scope.sh`):
 
 * `img2txt` (from `caca-utils`) for ASCII-art image previews
 * `w3mimgdisplay`, `ueberzug`, `mpv`, `iTerm2`, `kitty`, `terminology` or `urxvt` for image previews
-* `convert` (from `imagemagick`) to auto-rotate images and for SVG previews
+* `convert` (from `imagemagick`) to auto-rotate images
+* `rsvg-convert` (from [`librsvg`](https://wiki.gnome.org/Projects/LibRsvg))
+  for SVG previews
 * `ffmpeg`, or `ffmpegthumbnailer` for video thumbnails
 * `highlight`, `bat` or `pygmentize` for syntax highlighting of code
 * `atool`, `bsdtar`, `unrar` and/or `7z` to preview archives
diff --git a/doc/ranger.1 b/doc/ranger.1
index a3d13994..4989e155 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.9.3" "2021-11-13" "ranger manual"
+.TH RANGER 1 "ranger-1.9.3" "2022-02-05" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -308,7 +308,9 @@ are automatically used when available but completely optional.
 \&\f(CW\*(C`w3mimgdisplay\*(C'\fR, \f(CW\*(C`ueberzug\*(C'\fR, \f(CW\*(C`mpv\*(C'\fR, \f(CW\*(C`iTerm2\*(C'\fR, \f(CW\*(C`kitty\*(C'\fR, \f(CW\*(C`terminology\*(C'\fR or
 \&\f(CW\*(C`urxvt\*(C'\fR for image previews
 .IP "\-" 2
-\&\f(CW\*(C`convert\*(C'\fR (from \f(CW\*(C`imagemagick\*(C'\fR) to auto-rotate images and for \s-1SVG\s0 previews
+\&\f(CW\*(C`convert\*(C'\fR (from \f(CW\*(C`imagemagick\*(C'\fR) to auto-rotate images
+.IP "\-" 2
+\&\f(CW\*(C`rsvg\-convert\*(C'\fR (from \f(CW\*(C`librsvg\*(C'\fR) for \s-1SVG\s0 previews
 .IP "\-" 2
 \&\f(CW\*(C`ffmpegthumbnailer\*(C'\fR for video thumbnails
 .IP "\-" 2
diff --git a/doc/ranger.pod b/doc/ranger.pod
index 2484581c..0f1ce0b7 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -234,7 +234,11 @@ C<urxvt> for image previews
 
 =item -
 
-C<convert> (from C<imagemagick>) to auto-rotate images and for SVG previews
+C<convert> (from C<imagemagick>) to auto-rotate images
+
+=item -
+
+C<rsvg-convert> (from C<librsvg>) for SVG previews
 
 =item -
 
diff --git a/ranger/data/scope.sh b/ranger/data/scope.sh
index 0c003399..864e39ab 100755
--- a/ranger/data/scope.sh
+++ b/ranger/data/scope.sh
@@ -132,9 +132,11 @@ handle_image() {
     local mimetype="${1}"
     case "${mimetype}" in
         ## SVG
-        # image/svg+xml|image/svg)
-        #     convert -- "${FILE_PATH}" "${IMAGE_CACHE_PATH}" && exit 6
-        #     exit 1;;
+        image/svg+xml|image/svg)
+            rsvg-convert --keep-aspect-ratio --width "${DEFAULT_SIZE%x*}" "${FILE_PATH}" -o "${IMAGE_CACHE_PATH}.png" \
+                && mv "${IMAGE_CACHE_PATH}.png" "${IMAGE_CACHE_PATH}" \
+                && exit 6
+            exit 1;;
 
         ## DjVu
         # image/vnd.djvu)