Commit 78205781 authored by Sebastian Ramacher's avatar Sebastian Ramacher
Browse files

Merge branch 'release/0.4.4'

parents f9adb25f 33042286
Copyright (c) 2009-2018 pwmt.org
Copyright (c) 2009-2019 pwmt.org
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
......
......@@ -7,20 +7,32 @@ girara user interface library and several document libraries.
Requirements
------------
meson (>= 0.47)
gtk3 (>= 3.22)
glib (>= 2.50)
girara (>= 0.3.2)
sqlite3 (optional, >= 3.5.9)
check (optional build dependency, for tests)
libmagic from file(1) (optional, for mime-type detection)
libsynctex from TeXLive (optional, for SyncTeX support)
libseccomp (optional, for sandbox support)
librvsg-bin (optional build dependency, for icons)
Sphinx (optional build dependency, for manpages and HTML documentation)
doxygen (optional build dependency, for HTML documentation)
breathe (optional build dependency, for HTML documentation)
sphinx_rtd_theme (optional build dependency, for HTML documentation)
The following dependencies are required:
* gtk3 (>= 3.22)
* glib (>= 2.50)
* girara (>= 0.3.2)
The following dependencies are optional:
* sqlite3 (>= 3.6.23): splite3 database backend
* libmagic from file(1): for mime-type detection
* libsynctex from TeXLive (>= 1.19): SyncTeX support
* libseccomp: sandbox support
For building zathura, the following dependencies are also required:
* meson (>= 0.47)
* gettext
The following dependencies are optional build-time only dependencies:
* check: for tests
* librvsg-bin: PNG icons
* Sphinx: manpages and HTML documentation
* doxygen: HTML documentation
* breathe: for HTML documentation
* sphinx_rtd_theme: for HTML documentation
Note that Sphinx is needed to build the manpages. If it is not installed, the
man pages won't be built. For building the HTML documentation, doxygen, breathe
......
......@@ -5,10 +5,10 @@ _zathura() {
for PLUGIN in @PLUGINDIR@/lib*.so; do
case ${PLUGIN##*/} in
libpdf-poppler.so)
EXTS="$EXTS|pdf"
EXTS="$EXTS|pdf|PDF"
;;
libpdf-mupdf.so)
EXTS="$EXTS|pdf|epub|oxps"
EXTS="$EXTS|pdf|PDF|epub|oxps"
;;
libps.so)
EXTS="$EXTS|ps|eps|epsi|epsf"
......@@ -19,7 +19,7 @@ _zathura() {
libcb.so)
EXTS="$EXTS|cb7|cbr|cbz|cbt|rar|zip|7z|tar"
;;
esac
esac
done
_filedir "${EXTS#|}"
......
# Complete custom suffix based on libraries installed
function __fish_complete_zathura
for plugin in @PLUGINDIR@/*.so
switch (basename $plugin)
case libpdf-poppler.so
__fish_complete_suffix .pdf
case libpdf-mupdf.so
__fish_complete_suffix .pdf
__fish_complete_suffix .epub
__fish_complete_suffix .oxps
case libps.so
__fish_complete_suffix .ps
__fish_complete_suffix .eps
__fish_complete_suffix .epsi
__fish_complete_suffix .epsf
case libdjvu.so
__fish_complete_suffix .djvu
__fish_complete_suffix .djv
case libcb.so
__fish_complete_suffix .cb7
__fish_complete_suffix .cbr
__fish_complete_suffix .cbz
__fish_complete_suffix .cbt
__fish_complete_suffix .rar
__fish_complete_suffix .zip
__fish_complete_suffix .7z
__fish_complete_suffix .tar
end
end
end
complete -c zathura -x -a '(__fish_complete_zathura)'
complete -c zathura -s e -l reparent -d 'Reparents to window specified by xid'
complete -c zathura -s c -l config-dir -d 'Path to config directory' \
-x -a '(__fish_complete_directories (commandline -ct) "Config directory")'
complete -c zathura -s d -l data-dir -d 'Path to data directory' \
-x -a '(__fish_complete_directories (commandline -ct) "Data directory")'
complete -c zathura -l cache-dir -d 'Path to cache directory' \
-x -a '(__fish_complete_directories (commandline -ct) "Cache directory")'
complete -c zathura -s p -l plugins-dir -d 'Path to plugins directory' \
-x -a '(__fish_complete_directories (commandline -ct) "Plugins directory")'
complete -c zathura -s w -l password -d 'Document password'
complete -c zathura -s P -l page -d 'Page number to go to'
complete -c zathura -s l -l log-level -d 'Log level' -x -a 'debug info warning error'
complete -c zathura -s x -l synctex-editor-command -d 'Synctex editor (forwarded to the synctex command)' -x
complete -c zathura -l synctex-forward -d 'Move to given synctex position' -x
complete -c zathura -l synctex-pid -d 'Highlight position in given process' -x -a '(__fish_complete_pids)'
complete -c zathura -l mode -d 'Start in a non-default mode' -x -a 'presentation fullscreen'
complete -c zathura -l fork -d 'Fork into the background'
complete -c zathura -s h -l help -d 'Show help options'
complete -c zathura -s v -l version -d 'Print version information'
......@@ -64,6 +64,12 @@ zsh_completion = configure_file(
output: '_zathura',
configuration: conf_data
)
fish_completion = configure_file(
input: 'fish-completion.in',
output: 'zathura.fish',
configuration: conf_data
)
install_data(bash_completion, install_dir: join_paths(datadir, 'bash-completion', 'completions'))
install_data(zsh_completion, install_dir: join_paths(datadir, 'zsh', 'vendor-completions'))
install_data(zsh_completion, install_dir: join_paths(datadir, 'zsh', 'site-functions'))
install_data(fish_completion, install_dir: join_paths(datadir, 'fish', 'completions'))
......@@ -16,7 +16,7 @@ all_opts=(
'--mode=mode[Start in a non-default mode]:mode:(presentation fullscreen)'
'--fork[Fork into the background]'
'-h --help[Show help message]'
'-V --version[Print version information]'
'-v --version[Print version information]'
'*:file:->files'
)
......@@ -28,10 +28,10 @@ local exts
for PLUGIN in @PLUGINDIR@/lib*.so; do
case ${PLUGIN##*/} in
libpdf-poppler.so)
exts="$exts|pdf"
exts="$exts|pdf|PDF"
;;
libpdf-mupdf.so)
exts="$exts|pdf|epub|oxps"
exts="$exts|pdf|PDF|epub|oxps"
;;
libps.so)
exts="$exts|ps|eps|epsi|epsf"
......@@ -42,7 +42,7 @@ for PLUGIN in @PLUGINDIR@/lib*.so; do
libcb.so)
exts="$exts|cb7|cbr|cbz|cbt|rar|zip|7z|tar"
;;
esac
esac
done
case $state in
......
......@@ -35,6 +35,9 @@
Instead of looking for an instance having the correct file opened, try only
the instance with the given PID. Note that if the given PID does not have the
correct file open or does not exist, no new instance will be spanned.
--mode=mode
Start in a non-default mode
--fork
Fork into background
......
......@@ -62,16 +62,6 @@ accordingly or to escape the hash symbol.
set default-fg "#CCBBCC"
set default-fg \#CCBBCC
map - Mapping a shortcut
------------------------
It is possible to map or remap new key bindings to shortcut functions which
allows a high level of customization. The ``:map`` command can also be used in
the *zathurarc* file to make those changes permanent:
::
map [mode] <binding> <shortcut function> <argument>
include - Including another config file
---------------------------------------
This commands allows one to include other configuration files. If a relative
......@@ -82,6 +72,16 @@ is currently processed.
include another-config
map - Mapping a shortcut
------------------------
It is possible to map or remap new key bindings to shortcut functions which
allows a high level of customization. The ``:map`` command can also be used in
the *zathurarc* file to make those changes permanent:
::
map [mode] <binding> <shortcut function> <argument>
Mode
^^^^
The ``map`` command expects several arguments where only the ``binding`` as well as
......@@ -104,14 +104,14 @@ hand it is possible to just assign single letters, numbers or signs to it:
::
map a shortcut_function
map b shortcut_function
map c shortcut_function
map 1 shortcut_function
map 2 shortcut_function
map 3 shortcut_function
map ! shortcut_function
map ? shortcut_function
map a shortcut_function optional_argument
map b shortcut_function optional_argument
map c shortcut_function optional_argument
map 1 shortcut_function optional_argument
map 2 shortcut_function optional_argument
map 3 shortcut_function optional_argument
map ! shortcut_function optional_argument
map ? shortcut_function optional_argument
Using modifiers
^^^^^^^^^^^^^^^
......@@ -122,7 +122,8 @@ keyboard. It is possible to use the following modifiers:
* C - Control
* S - Shift
Now it is required to define the ``binding`` with the following structure:
If any of the modifiers should be used for a binding, it is required to define
the ``binding`` with the following structure:
::
......@@ -244,7 +245,8 @@ The following shortcut functions can be mapped:
* ``jumplist``
Move forwards/backwards in the jumplist.
Move forwards/backwards in the jumplist. Pass ``forward`` as argument to
move to the next entry and ``backward`` to move to the previous one.
* ``navigate``
......@@ -313,11 +315,19 @@ The following shortcut functions can be mapped:
Zoom in or out.
* ``mark_add``
Set a quickmark.
* ``mark_evaluate``
Go to a quickmark.
* ``feedkeys``
Simulate key presses. Note that all keys will be interpreted as if pressing a
key on the keyboard. To input uppercase letters, follow the same convention as
for key bindings, i.e. for ``X``, use ``<S-X>``.
Pass arguments
^^^^^^^^^^^^^^
......@@ -333,12 +343,14 @@ Possible arguments are:
* best-fit
* bottom
* backward
* collapse
* collapse-all
* default
* down
* expand
* expand-all
* forward
* full-down
* full-up
* half-down
......@@ -891,13 +903,6 @@ Defines if scrolling by half or full pages stops at page boundaries.
* Value type: Boolean
* Default value: false
smooth-scroll
^^^^^^^^^^^^^
Defines if scrolling via touchpad should be smooth.
* Value type: Boolean
* Default value: false
link-zoom
^^^^^^^^^
En/Disables the ability of changing zoom when following links.
......@@ -1055,7 +1060,7 @@ sandbox
Defines the sandbox mode to use for the seccomp syscall filter. Possible
values are "none", "normal" and "strict". If "none" is used, the sandbox
will be disabled. The use of "normal" will provide minimal protection and
allow normal use of seccomp with support for all features. The "strict" mode
allow normal use of zathura with support for all features. The "strict" mode
is a read only sandbox that is intended for viewing documents only.
* Value type: String
......@@ -1070,6 +1075,9 @@ Some features are disabled when using strict sandbox mode:
No feature regressions are expected when using normal sandbox mode.
When running under WSL, the default is "none" since seccomp is not supported in
that environment.
window-icon-document
^^^^^^^^^^^^^^^^^^^^
Defines whether the window document should be updated based on the first page of
......
project('zathura', 'c',
version: '0.4.3',
version: '0.4.4',
meson_version: '>=0.47',
default_options: 'c_std=c11',
)
......@@ -37,7 +37,7 @@ plugindir = join_paths(get_option('libdir'), 'zathura')
# required dependencies
libm = cc.find_library('m', required: false)
girara = dependency('girara-gtk3', version: '>=0.3.2')
girara = dependency('girara-gtk3', version: '>=0.3.3')
glib = dependency('glib-2.0', version: '>=2.50')
gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows')
gthread = dependency('gthread-2.0', version: '>=2.50')
......@@ -68,8 +68,8 @@ flags = cc.get_supported_arguments(flags)
# optional dependencies
additional_sources = []
sqlite = dependency('sqlite3', version: '>=3.5.9', required: get_option('sqlite'))
synctex = dependency('synctex', required: get_option('synctex'))
sqlite = dependency('sqlite3', version: '>=3.6.23', required: get_option('sqlite'))
synctex = dependency('synctex', version: '>=1.19', required: get_option('synctex'))
magic = cc.find_library('magic', required: get_option('magic'))
seccomp = dependency('libseccomp', required: get_option('seccomp'))
......@@ -82,12 +82,8 @@ endif
if synctex.found()
build_dependencies += synctex
defines += '-DWITH_SYNCTEX'
if synctex.version() < '2.0.0'
if synctex.version() >= '1.19.0'
warning('You are using a synctex version pre-SONAME bump, but post-ABI-break. Please make sure to always run zathura using the correct synctex version.')
else
defines += '-DWITH_SYNCTEX1'
endif
if synctex.version() < '2.0.0' and synctex.version() >= '1.19.0'
warning('You are using a synctex version pre-SONAME bump, but post-ABI-break. Please make sure to always run zathura using the correct synctex version.')
endif
endif
......
This diff is collapsed.
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-09 23:06+0100\n"
"PO-Revision-Date: 2018-05-23 20:44+0000\n"
"POT-Creation-Date: 2019-09-06 22:48+0200\n"
"PO-Revision-Date: 2019-08-11 19:46+0000\n"
"Last-Translator: Sebastian Ramacher <sebastian+dev@ramacher.at>\n"
"Language-Team: Catalan (http://www.transifex.com/pwmt/zathura/language/ca/)\n"
"Language: ca\n"
......@@ -57,40 +57,40 @@ msgstr ""
msgid "PDF;PS;PostScript;DjVU;document;presentation;viewer;"
msgstr ""
#: zathura/callbacks.c:308
#: zathura/callbacks.c:310
#, c-format
msgid "'%s' must not be 0. Set to 1."
msgstr ""
#: zathura/callbacks.c:393
#: zathura/callbacks.c:395
#, c-format
msgid "Invalid input '%s' given."
msgstr "Entrada invàlida '%s'."
#: zathura/callbacks.c:429
#: zathura/callbacks.c:431
#, c-format
msgid "Invalid index '%s' given."
msgstr "Índex invàlid '%s'."
#: zathura/callbacks.c:668
#: zathura/callbacks.c:670
#, c-format
msgid "Copied selected text to selection %s: %s"
msgstr ""
#: zathura/callbacks.c:701
#: zathura/callbacks.c:703
#, c-format
msgid "Copied selected image to selection %s"
msgstr ""
#: zathura/commands.c:36 zathura/commands.c:76 zathura/commands.c:103
#: zathura/commands.c:165 zathura/commands.c:279 zathura/commands.c:309
#: zathura/commands.c:335 zathura/commands.c:435 zathura/commands.c:567
#: zathura/commands.c:165 zathura/commands.c:281 zathura/commands.c:311
#: zathura/commands.c:337 zathura/commands.c:437 zathura/commands.c:569
#: zathura/shortcuts.c:413 zathura/shortcuts.c:1222 zathura/shortcuts.c:1257
#: zathura/shortcuts.c:1284
msgid "No document opened."
msgstr "No s'ha obert cap document."
#: zathura/commands.c:42 zathura/commands.c:82 zathura/commands.c:440
#: zathura/commands.c:42 zathura/commands.c:82 zathura/commands.c:442
msgid "Invalid number of arguments given."
msgstr "Nombre d'arguments invàlids."
......@@ -138,15 +138,15 @@ msgid "Title"
msgstr ""
#: zathura/commands.c:176
msgid "Author"
msgid "Subject"
msgstr ""
#: zathura/commands.c:177
msgid "Subject"
msgid "Keywords"
msgstr ""
#: zathura/commands.c:178
msgid "Keywords"
msgid "Author"
msgstr ""
#: zathura/commands.c:179
......@@ -165,69 +165,77 @@ msgstr ""
msgid "Modification date"
msgstr ""
#: zathura/commands.c:187 zathura/commands.c:207
#: zathura/commands.c:183
msgid "Format"
msgstr ""
#: zathura/commands.c:184
msgid "Other"
msgstr ""
#: zathura/commands.c:189 zathura/commands.c:209
msgid "No information available."
msgstr "Cap informació disponible."
#: zathura/commands.c:245
#: zathura/commands.c:247
msgid "Too many arguments."
msgstr "Massa arguments."
#: zathura/commands.c:256
#: zathura/commands.c:258
msgid "No arguments given."
msgstr "Cap argument subministrat."
#: zathura/commands.c:284
#: zathura/commands.c:286
msgid "Printing is not permitted in strict sandbox mode"
msgstr ""
#: zathura/commands.c:315 zathura/commands.c:341
#: zathura/commands.c:317 zathura/commands.c:343
msgid "Document saved."
msgstr "Document desat."
#: zathura/commands.c:317 zathura/commands.c:343
#: zathura/commands.c:319 zathura/commands.c:345
msgid "Failed to save document."
msgstr "No s'ha pogut desar el document."
#: zathura/commands.c:320 zathura/commands.c:346
#: zathura/commands.c:322 zathura/commands.c:348
msgid "Invalid number of arguments."
msgstr "Nombre d'arguments invàlids."
#: zathura/commands.c:459
#: zathura/commands.c:461
#, c-format
msgid "Couldn't write attachment '%s' to '%s'."
msgstr "No s'ha pogut escriure el fitxer adjunt '%s' a '%s'."
#: zathura/commands.c:461
#: zathura/commands.c:463
#, c-format
msgid "Wrote attachment '%s' to '%s'."
msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'."
#: zathura/commands.c:505
#: zathura/commands.c:507
#, c-format
msgid "Wrote image '%s' to '%s'."
msgstr "S'ha escrit la imatge '%s' a '%s'."
#: zathura/commands.c:507
#: zathura/commands.c:509
#, c-format
msgid "Couldn't write image '%s' to '%s'."
msgstr "No s'ha pogut escriure la imatge '%s' a '%s'."
#: zathura/commands.c:514
#: zathura/commands.c:516
#, c-format
msgid "Unknown image '%s'."
msgstr "Imatge desconeguda '%s'."
#: zathura/commands.c:518
#: zathura/commands.c:520
#, c-format
msgid "Unknown attachment or image '%s'."
msgstr "Imatge o fitxer adjunt desconegut '%s'."
#: zathura/commands.c:536
#: zathura/commands.c:538
msgid "Exec is not permitted in strict sandbox mode"
msgstr ""
#: zathura/commands.c:580
#: zathura/commands.c:582
msgid "Argument must be a number."
msgstr "L'argument ha de ser un nombre."
......@@ -246,339 +254,339 @@ msgid "Images"
msgstr "Imatges"
#. zathura settings
#: zathura/config.c:184
#: zathura/config.c:183
msgid "Database backend"
msgstr "Base de dades de rerefons"
#: zathura/config.c:185
#: zathura/config.c:184
msgid "File monitor backend"
msgstr ""
#: zathura/config.c:187
#: zathura/config.c:186
msgid "Zoom step"
msgstr "Pas d'ampliació"
#: zathura/config.c:189
#: zathura/config.c:188
msgid "Padding between pages"
msgstr "Separació entre pàgines"
#: zathura/config.c:191
#: zathura/config.c:190
msgid "Number of pages per row"
msgstr "Nombre de pàgines per fila"
#: zathura/config.c:193
#: zathura/config.c:192
msgid "Column of the first page"
msgstr "Columna de la primera pàgina"
#: zathura/config.c:195
#: zathura/config.c:194
msgid "Render pages from right to left"
msgstr ""
#: zathura/config.c:197
#: zathura/config.c:196
msgid "Scroll step"
msgstr "Pas de desplaçament"
#: zathura/config.c:199
#: zathura/config.c:198
msgid "Horizontal scroll step"
msgstr "Pas de desplaçament horitzontal"
#: zathura/config.c:201
#: zathura/config.c:200
msgid "Full page scroll overlap"
msgstr "Superposició de pàgines completes de desplaçament"
#: zathura/config.c:203
#: zathura/config.c:202
msgid "Zoom minimum"
msgstr "Zoom mínim"
#: zathura/config.c:205
#: zathura/config.c:204
msgid "Zoom maximum"
msgstr "Zoom màxim"
#: zathura/config.c:207
#: zathura/config.c:206
msgid "Maximum number of pages to keep in the cache"
msgstr ""
#: zathura/config.c:209
#: zathura/config.c:208
msgid "Maximum size in pixels of thumbnails to keep in the cache"
msgstr ""
#: zathura/config.c:211
#: zathura/config.c:210
msgid "Number of positions to remember in the jumplist"
msgstr "Nombre de posicions per recordar al jumplist"
#: zathura/config.c:213
#: zathura/config.c:212
msgid "Recoloring (dark color)"
msgstr "Recolorejant (color fosc)"
#: zathura/config.c:214
#: zathura/config.c:213
msgid "Recoloring (light color)"
msgstr "Recolorejant (color clar)"
#: zathura/config.c:215
#: zathura/config.c:214
msgid "Color for highlighting"
msgstr "Color de realçament"
#: zathura/config.c:217
#: zathura/config.c:216
msgid "Color for highlighting (active)"
msgstr "Color de realçament (activat)"
#: zathura/config.c:219
#: zathura/config.c:218
msgid "'Loading ...' background color"
msgstr ""
#: zathura/config.c:221
#: zathura/config.c:220
msgid "'Loading ...' foreground color"
msgstr ""
#: zathura/config.c:224
#: zathura/config.c:223
msgid "Index mode foreground color"
msgstr ""
#: zathura/config.c:225
#: zathura/config.c:224
msgid "Index mode background color"
msgstr ""
#: zathura/config.c:226