From b6735f596f1c2151600f7f1d455c1f75697c47a7 Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Wed, 5 Jul 2017 22:33:17 +0200 Subject: [PATCH 1/5] Import release 0.13.18 Signed-off-by: Brice Goglin --- Changes | 2 ++ VERSION | 2 +- doc/howto.html | 12 +----------- doc/upgrade.html | 10 ---------- llgal.1 | 4 ++-- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Changes b/Changes index bce138c..7cca863 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,4 @@ +llgal (0.13.18) * Fix slidenames for subgalleries when -n is used (reported by Richard Betham in Debian bug #652929). @@ -14,6 +15,7 @@ tag in the slide template. Thanks to Charles Nepote. * Really initialize exiftool only once per gallery. + -- Brice Goglin Mon, 01 Aug 2016 22:25:00 +0200 llgal (0.13.17) diff --git a/VERSION b/VERSION index bda222e..2274d48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.13.17 +0.13.18 diff --git a/doc/howto.html b/doc/howto.html index fe5f700..6b60aa4 100644 --- a/doc/howto.html +++ b/doc/howto.html @@ -491,7 +491,7 @@

How do I add keyboard shortcuts to m 
       <a href="<!--PREV-SLIDE-->" accesskey=p><!--PREV-SLIDE-LINK-TEXT--></a>
       &nbsp; &nbsp; &nbsp;
-      <a href=">!--INDEX-FILE-->" accesskey=i><!--INDEX-LINK-TEXT--></a>
+      <a href="<!--INDEX-FILE-->" accesskey=i><!--INDEX-LINK-TEXT--></a>
       &nbsp; &nbsp; &nbsp;
       <a href="<!--NEXT-SLIDE-->" accesskey=n><!--NEXT-SLIDE-LINK-TEXT--></a>
@@ -589,16 +589,6 @@

How do I scale my images to a s
-

- - Valid XHTML 1.1! - - - - Valid CSS! - -

-
The llgal team.
diff --git a/doc/upgrade.html b/doc/upgrade.html index 0bdf72b..2422d3a 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -135,16 +135,6 @@

How-to upgrade

-

- - Valid XHTML 1.1! - - - - Valid CSS! - -

-
The llgal team.
diff --git a/llgal.1 b/llgal.1 index 52086f0..0c6da4d 100644 --- a/llgal.1 +++ b/llgal.1 @@ -395,7 +395,7 @@ The corresponding configuration file option is .TP .BI --asu " " -Allow to define the unit used to show file sizes. +Define the unit used to show file sizes. Default is \fB"kB"\fR. The corresponding configuration file option is .IR show_size_unit . @@ -1195,7 +1195,7 @@ configuration option. .SH NOTES -Note that all numerical options may be resetted to their default value +Note that all numerical options may be reset to their default value by setting them a negative value. From 0b050b8d9bc4b3465cb28d0c4f73c3bb64e267df Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Thu, 6 Jul 2017 00:33:41 +0200 Subject: [PATCH 2/5] Add mp4 and 3gp to the list of auto-recognized video files Signed-off-by: Brice Goglin --- doc/llgalrc | 2 +- lib/Llgal/Config.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/llgalrc b/doc/llgalrc index 02f46b6..5e3914a 100644 --- a/doc/llgalrc +++ b/doc/llgalrc @@ -303,7 +303,7 @@ # image_extensions = "jpg|jpeg|gif|png|tif|tiff|bmp" # Extensions that are matched when searching movies (|-separated list) -# movie_extensions = "mpg|mpeg|avi|mov|ogm|wmv" +# movie_extensions = "mpg|mpeg|avi|mov|ogm|wmv|mp4|3gp" # Add all files to the list of entries # not only images and movies [-A] diff --git a/lib/Llgal/Config.pm b/lib/Llgal/Config.pm index 198af7f..d2c2cf7 100644 --- a/lib/Llgal/Config.pm +++ b/lib/Llgal/Config.pm @@ -405,7 +405,7 @@ sub add_defaults { # What files to insert in the gallery # image and movie extensions image_extensions => "jpg|jpeg|png|gif|tif|tiff|bmp", - movie_extensions => "mpg|mpeg|avi|mov|ogm|wmv", + movie_extensions => "mpg|mpeg|avi|mov|ogm|wmv|mp4|3gp", # add all files, not only images and movies (-A) add_all_files => 0, # add subdirectories to entry list (-S) From d5d1487337132372651dc2f2b81de0d8c25855ff Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Thu, 6 Jul 2017 00:34:03 +0200 Subject: [PATCH 3/5] Remove partial list of image/video extensions from the captions.header Signed-off-by: Brice Goglin --- data/captions.header | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/captions.header b/data/captions.header index ca96dae..94456cd 100644 --- a/data/captions.header +++ b/data/captions.header @@ -9,8 +9,8 @@ # TXT: text ---- caption # LNK: url ---- slide link text ---- caption # LNKNOSLIDE: url ---- direct link text without slide -# IMG: imagefile.{gif,png,jpg,jpeg} ---- caption -# MVI: movie.{avi,mpg,mpeg} ---- slide link text ---- caption +# IMG: imagefile ---- caption +# MVI: moviefile ---- slide link text ---- caption # FIL: file ---- slide link text ---- caption # DIR: directory ---- slide link text ---- caption # BREAK From f85dc90876606654a6e96a2a11ae9291b774d109 Mon Sep 17 00:00:00 2001 From: Clement F Date: Thu, 6 Jul 2017 01:02:17 +0200 Subject: [PATCH 4/5] Add a little JS to change slides with arrows --- data/slidetemplate.html | 6 ++++-- doc/examples/dynamic_comments_in_slides/slidetemplate.html | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/slidetemplate.html b/data/slidetemplate.html index 4c9864a..8e52be7 100644 --- a/data/slidetemplate.html +++ b/data/slidetemplate.html @@ -20,11 +20,11 @@ works just compare the template file with a generated slide. -->

- +             - +

@@ -47,5 +47,7 @@ + + diff --git a/doc/examples/dynamic_comments_in_slides/slidetemplate.html b/doc/examples/dynamic_comments_in_slides/slidetemplate.html index 280ed09..1d15482 100644 --- a/doc/examples/dynamic_comments_in_slides/slidetemplate.html +++ b/doc/examples/dynamic_comments_in_slides/slidetemplate.html @@ -18,11 +18,11 @@ works just compare the template file with a generated slide. -->

- +             - +

@@ -68,5 +68,6 @@ + From b5162ef91a3fc063d83bba2a816a2cc9d9b073ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20FOYER?= Date: Tue, 2 Oct 2018 11:42:42 +0100 Subject: [PATCH 5/5] Revert the suppression of final new-line --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3d519fd..62dc2ab 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.13.19 \ No newline at end of file +0.13.19