Commit 2c2bec63 authored by Sebastian Ramacher's avatar Sebastian Ramacher

Merge branch 'release/0.4.1'

parents 68eaadf1 3561293e
......@@ -33,9 +33,11 @@ The use of magic to detect mime types is optional and can be disabled by
configuring the build system with -Denable-magic=false.
The use of seccomp to create a sandboxed environment is optional and can be
enabled by configure the build system with -Denable-seccomp=true. Note that the
sandbox is currently only available as experimental preview. Some commands,
shortcuts and other functionality might break.
disabled by configure the build system with -Denable-seccomp=false. The sandbox
will by default be set to "normal" mode, which should not interfere with the
normal operation of zathura. For strict sandbox mode set "sandbox strict" in
zathurarc. Strict sandbox mode will reduce the available functionality of
zathura and provide a read only document viewer.
Installation
------------
......
_zathura() {
_init_completion || return
local EXTS=""
for PLUGIN in @PLUGINDIR@/lib*.so; do
case ${PLUGIN##*/} in
libpdf-poppler.so)
EXTS="$EXTS|pdf"
;;
libpdf-mupdf.so)
EXTS="$EXTS|pdf|epub|oxps"
;;
libps.so)
EXTS="$EXTS|ps|eps|epsi|epsf"
;;
libdjvu.so)
EXTS="$EXTS|djvu|djv"
;;
libcb.so)
EXTS="$EXTS|cb7|cbr|cbz|cbt|rar|zip|7z|tar"
;;
esac
done
_filedir "${EXTS#|}"
}
complete -F _zathura zathura
......@@ -44,3 +44,19 @@ if appstream_util.found()
args: ['validate-relax', appdata.full_path()]
)
endif
conf_data = configuration_data()
conf_data.set('PLUGINDIR', join_paths(prefix, plugindir))
bash_completion = configure_file(
input: 'bash-completion.in',
output: 'zathura',
configuration: conf_data
)
zsh_completion = configure_file(
input: 'zsh-completion.in',
output: '_zathura',
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'))
#compdef zathura
local -a all_opts
all_opts=(
'(-c --config-dir=DIR)'{-c,--config-dir}'[Path to config directory]:config directory:_files -/'
'(-d --data-dir=DIR)'{-d,--data-dir}'[Path to data directory]:data directory:_files -/'
'--cache-dir=DIR[Path to cache directory]:cache directory:_files -/'
'(-p --plugins-dir=DIR)'{-p,--plugins-dir}'[Path to plugins directory]:plugins directory:_files -/'
'(-e --reparent=XID)'{-e,--reparent}'[Reparents to window specified by XID (X11)]:xid'
'(-w --password=password)'{-w,--password}'[Document password]:password'
'(-P --page=page)'{-p,--page}'[Page number to go to]:page number'
'(-l --log-level=level)'{-l,--log-level}'[Log level]:level:(error warning info debug)'
'(-x --snyctex-editor-command=cmd)'{-x,--synxtec-editor-command}'[Synctex editor (forwarded to the synctex command)]:command'
'--synctex-forward=position[Move to given synctex position]:position'
'--synctex-pid=pid[Highlight position in given process]:pid'
'--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]'
'*:file:->files'
)
local context state state_descr line
typeset -A opt_args
_arguments -S "$all_opts[@]" && return 0
local exts
for PLUGIN in @PLUGINDIR@/lib*.so; do
case ${PLUGIN##*/} in
libpdf-poppler.so)
exts="$exts|pdf"
;;
libpdf-mupdf.so)
exts="$exts|pdf|epub|oxps"
;;
libps.so)
exts="$exts|ps|eps|epsi|epsf"
;;
libdjvu.so)
exts="$exts|djvu|djv"
;;
libcb.so)
exts="$exts|cb7|cbr|cbz|cbt|rar|zip|7z|tar"
;;
esac
done
case $state in
(files)
_files -g "*.($exts)"
;;
esac
ZATHURA_PLUGINS_PATH
Path to the directory containing plugins. This directory is only considered if
no other directory was specified using --plugins-dir.
......@@ -12,8 +12,8 @@
-w, --password=password
The documents password. If multiple documents are opened at once, the
password will be used for the first one and zathura will ask for the
passwords of the remaining files if needed .
password will be used for the first one and zathura will ask for the
passwords of the remaining files if needed.
-P, --page=number
Opens the document at the given page number. Pages are numbered starting
......
......@@ -5,7 +5,7 @@ interface. To support synctex backwards synchronization, zathura provides a
D-Bus interface that can be called by the editor. For convince zathura also
knows how to parse the output of the *synctex view* command. It is enough to
pass the arguments to *synctex view*'s *-i* option to zathura via
*--syntex-forward* and zathura will pass the information to the correct
*--synctex-forward* and zathura will pass the information to the correct
instance.
For gvim forward and backwards synchronization support can be set up as follows:
......
......@@ -25,7 +25,7 @@ today = time.strftime('%Y-%m-%d', time.gmtime(maxdate))
# -- Project configuration ------------------------------------------------
project = 'zathura'
copyright = '2009-2015, pwmt.org'
copyright = '2009-2018, pwmt.org'
version = '0.2.7'
release = '0.2.7'
......
......@@ -16,6 +16,11 @@ Options
.. include:: _options.txt
Environment variables
---------------------
.. include:: _env.txt
Mouse and key bindings
----------------------
......
......@@ -685,8 +685,9 @@ synchronization is not available.
filemonitor
^^^^^^^^^^^
Defines the filemonitor backend. Possible values are "glib" and "signal" (if
signal handling is supported).
Defines the file monitor backend used to check for changes in files. Possible
values are "glib", "signal" (if signal handling is supported), and "noop". The
"noop" file monitor does not trigger reloads.
* Value type: String
* Default value: glib
......@@ -766,7 +767,10 @@ the following pattern <1 page per row>:[<2 pages per row>[: ...]]. The last
value in the list will be used for all other number of pages per row if not set
explicitly.
Per default, the first column is set to 2 for double-page layout.
Per default, the first column is set to 2 for double-page layout, i.e. the faule
is set to 1:2. A value of 1:1:3 would put the first page in dual-page layour in
the first column, and for layouts with more columns the first page would be put
in the 3rd column.
* Value type: String
* Default value: 1:2
......@@ -1057,6 +1061,30 @@ is a read only sandbox that is intended for viewing documents only.
* Value type: String
* Default value: normal
Some features are disabled when using strict sandbox mode:
* saving/writing files
* use of input methods like ibus
* printing
* bookmarks and history
No feature regressions are expected when using normal sandbox mode.
window-icon-document
^^^^^^^^^^^^^^^^^^^^
Defines whether the window document should be updated based on the first page of
a dcument.
* Value type: Boolean
* Default value: false
page-right-to-left
^^^^^^^^^^^^^^^^^^
Defines whether pages in multi-column view should start from the right side.
* Value type: Boolean
* Default value: false
SEE ALSO
========
......
sphinx = find_program('sphinx-build')
custom_target('man pages',
command: [sphinx, '-b', 'man', join_paths(meson.current_source_dir(), 'man'), meson.current_build_dir()],
command: [
sphinx,
'-b', 'man',
'-D', 'version=' + version,
'-D', 'release=' + version,
join_paths(meson.current_source_dir(), 'man'),
meson.current_build_dir()],
output: ['zathura.1', 'zathurarc.5'],
input: [
'man/conf.py',
......
project('zathura', 'c',
version: '0.4.0',
version: '0.4.1',
meson_version: '>=0.45',
default_options: 'c_std=c11',
)
......@@ -25,7 +25,7 @@ conf_data.set('ZVAPI', plugin_api_version)
conf_data.set('ZVABI', plugin_abi_version)
conf_data.set('version', version)
cc = meson.get_compiler('c', required: false)
cc = meson.get_compiler('c')
prefix = get_option('prefix')
localedir = get_option('localedir')
......@@ -83,7 +83,11 @@ if get_option('enable-synctex') and synctex.found()
build_dependencies += synctex
defines += '-DWITH_SYNCTEX'
if synctex.version() < '2.0.0'
defines += '-DWITH_SYNCTEX1'
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
endif
endif
......@@ -127,6 +131,7 @@ sources = files(
'zathura/document.c',
'zathura/file-monitor.c',
'zathura/file-monitor-glib.c',
'zathura/file-monitor-noop.c',
'zathura/file-monitor-signal.c',
'zathura/jumplist.c',
'zathura/links.c',
......
......@@ -15,6 +15,6 @@ option('enable-magic',
)
option('enable-seccomp',
type: 'boolean',
value: false,
value: true,
description: 'Enable experimental seccomp support if available.'
)
......@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: zathura\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-16 01:11+0100\n"
"PO-Revision-Date: 2018-03-11 19:53+0000\n"
"POT-Creation-Date: 2018-09-04 18:27+0200\n"
"PO-Revision-Date: 2018-05-23 20:44+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"
......@@ -83,14 +83,14 @@ 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:313
#: zathura/commands.c:339 zathura/commands.c:439 zathura/commands.c:566
#: zathura/shortcuts.c:413 zathura/shortcuts.c:1225 zathura/shortcuts.c:1260
#: zathura/shortcuts.c:1287
#: 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/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:444
#: zathura/commands.c:42 zathura/commands.c:82 zathura/commands.c:440
msgid "Invalid number of arguments given."
msgstr "Nombre d'arguments invàlids."
......@@ -177,53 +177,57 @@ msgstr "Massa arguments."
msgid "No arguments given."
msgstr "Cap argument subministrat."
#: zathura/commands.c:286
#: zathura/commands.c:284
msgid "Printing is not permitted in strict sandbox mode"
msgstr ""
#: zathura/commands.c:319 zathura/commands.c:345
#: zathura/commands.c:315 zathura/commands.c:341
msgid "Document saved."
msgstr "Document desat."
#: zathura/commands.c:321 zathura/commands.c:347
#: zathura/commands.c:317 zathura/commands.c:343
msgid "Failed to save document."
msgstr "No s'ha pogut desar el document."
#: zathura/commands.c:324 zathura/commands.c:350
#: zathura/commands.c:320 zathura/commands.c:346
msgid "Invalid number of arguments."
msgstr "Nombre d'arguments invàlids."
#: zathura/commands.c:463
#: zathura/commands.c:459
#, 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:465
#: zathura/commands.c:461
#, c-format
msgid "Wrote attachment '%s' to '%s'."
msgstr "S'ha escrit el fitxer adjunt '%s' a '%s'."
#: zathura/commands.c:509
#: zathura/commands.c:505
#, c-format
msgid "Wrote image '%s' to '%s'."
msgstr "S'ha escrit la imatge '%s' a '%s'."
#: zathura/commands.c:511
#: zathura/commands.c:507
#, c-format
msgid "Couldn't write image '%s' to '%s'."
msgstr "No s'ha pogut escriure la imatge '%s' a '%s'."
#: zathura/commands.c:518
#: zathura/commands.c:514
#, c-format
msgid "Unknown image '%s'."
msgstr "Imatge desconeguda '%s'."
#: zathura/commands.c:522
#: zathura/commands.c:518
#, c-format
msgid "Unknown attachment or image '%s'."
msgstr "Imatge o fitxer adjunt desconegut '%s'."
#: zathura/commands.c:579
#: zathura/commands.c:536
msgid "Exec is not permitted in strict sandbox mode"
msgstr ""
#: zathura/commands.c:580
msgid "Argument must be a number."
msgstr "L'argument ha de ser un nombre."
......@@ -242,387 +246,387 @@ msgid "Images"
msgstr "Imatges"
#. zathura settings
#: zathura/config.c:145
#: zathura/config.c:165
msgid "Database backend"
msgstr "Base de dades de rerefons"
#: zathura/config.c:146
#: zathura/config.c:166
msgid "File monitor backend"
msgstr ""
#: zathura/config.c:148
#: zathura/config.c:168
msgid "Zoom step"
msgstr "Pas d'ampliació"
#: zathura/config.c:150
#: zathura/config.c:170
msgid "Padding between pages"
msgstr "Separació entre pàgines"
#: zathura/config.c:152
#: zathura/config.c:172
msgid "Number of pages per row"
msgstr "Nombre de pàgines per fila"
#: zathura/config.c:154
#: zathura/config.c:174
msgid "Column of the first page"
msgstr "Columna de la primera pàgina"
#: zathura/config.c:156
#: zathura/config.c:176
msgid "Scroll step"
msgstr "Pas de desplaçament"
#: zathura/config.c:158
#: zathura/config.c:178
msgid "Horizontal scroll step"
msgstr "Pas de desplaçament horitzontal"
#: zathura/config.c:160
#: zathura/config.c:180
msgid "Full page scroll overlap"
msgstr "Superposició de pàgines completes de desplaçament"
#: zathura/config.c:162
#: zathura/config.c:182
msgid "Zoom minimum"
msgstr "Zoom mínim"
#: zathura/config.c:164
#: zathura/config.c:184
msgid "Zoom maximum"
msgstr "Zoom màxim"
#: zathura/config.c:166
#: zathura/config.c:186
msgid "Maximum number of pages to keep in the cache"
msgstr ""
#: zathura/config.c:168
#: zathura/config.c:188
msgid "Maximum size in pixels of thumbnails to keep in the cache"
msgstr ""
#: zathura/config.c:170
#: zathura/config.c:190
msgid "Number of positions to remember in the jumplist"
msgstr "Nombre de posicions per recordar al jumplist"
#: zathura/config.c:172
#: zathura/config.c:192
msgid "Recoloring (dark color)"
msgstr "Recolorejant (color fosc)"
#: zathura/config.c:173
#: zathura/config.c:193
msgid "Recoloring (light color)"
msgstr "Recolorejant (color clar)"
#: zathura/config.c:174
#: zathura/config.c:194
msgid "Color for highlighting"
msgstr "Color de realçament"
#: zathura/config.c:176
#: zathura/config.c:196
msgid "Color for highlighting (active)"
msgstr "Color de realçament (activat)"
#: zathura/config.c:178
#: zathura/config.c:198
msgid "'Loading ...' background color"
msgstr ""
#: zathura/config.c:180
#: zathura/config.c:200
msgid "'Loading ...' foreground color"
msgstr ""
#: zathura/config.c:183
#: zathura/config.c:203
msgid "Index mode foreground color"
msgstr ""
#: zathura/config.c:184
#: zathura/config.c:204
msgid "Index mode background color"
msgstr ""
#: zathura/config.c:185
#: zathura/config.c:205
msgid "Index mode foreground color (active element)"
msgstr ""
#: zathura/config.c:186
#: zathura/config.c:206
msgid "Index mode background color (active element)"
msgstr ""
#: zathura/config.c:189
#: zathura/config.c:209
msgid "Recolor pages"
msgstr "Recolorejant les pàgines"
#: zathura/config.c:191
#: zathura/config.c:211
msgid "When recoloring keep original hue and adjust lightness only"
msgstr "Quan recoloregis manté el to original i ajusta només la lluminositat"
#: zathura/config.c:193
#: zathura/config.c:213
msgid "When recoloring keep original image colors"
msgstr ""
#: zathura/config.c:195
#: zathura/config.c:215
msgid "Wrap scrolling"
msgstr "Desplaçament recollit"
#: zathura/config.c:197
#: zathura/config.c:217
msgid "Page aware scrolling"
msgstr "Desplaçament recollit"
#: zathura/config.c:199
#: zathura/config.c:219
msgid "Advance number of pages per row"
msgstr "Avançar nombre de pàgines per fila"
#: zathura/config.c:201
#: zathura/config.c:221
msgid "Horizontally centered zoom"
msgstr "Zoom centrat horitzontalment"
#: zathura/config.c:203
#: zathura/config.c:223
msgid "Vertically center pages"
msgstr ""
#: zathura/config.c:205
#: zathura/config.c:225
msgid "Align link target to the left"
msgstr ""
#: zathura/config.c:207
#: zathura/config.c:227
msgid "Let zoom be changed when following links"
msgstr ""
#: zathura/config.c:209
#: zathura/config.c:229
msgid "Center result horizontally"
msgstr "Centra el resultat horitzontalment"
#: zathura/config.c:211
#: zathura/config.c:231
msgid "Transparency for highlighting"
msgstr "Transparència del realçat"
#: zathura/config.c:213
#: zathura/config.c:233
msgid "Render 'Loading ...'"
msgstr "Renderitza 'Carregant ...'"
#: zathura/config.c:214
#: zathura/config.c:234
msgid "Adjust to when opening file"
msgstr "Ajustar al fitxer quan s'obri"
#: zathura/config.c:216
#: zathura/config.c:236
msgid "Show hidden files and directories"
msgstr "Mostra els directoris i fitxers ocults"
#: zathura/config.c:218
#: zathura/config.c:238
msgid "Show directories"
msgstr "Mostra els directoris"
#: zathura/config.c:220
#: zathura/config.c:240
msgid "Show recent files"
msgstr ""
#: zathura/config.c:222
#: zathura/config.c:242
msgid "Always open on first page"
msgstr "Obrir sempre la primera pàgina"
#: zathura/config.c:224
#: zathura/config.c:244
msgid "Highlight search results"
msgstr "Realça els resultats de recerca"
#: zathura/config.c:227
#: zathura/config.c:247
msgid "Enable incremental search"
msgstr "Habilita la cerca incremental"
#: zathura/config.c:229
#: zathura/config.c:249
msgid "Clear search results on abort"
msgstr "Esborra els resultats de recerca a l'interrompre"
#: zathura/config.c:231
#: zathura/config.c:251
msgid "Use basename of the file in the window title"
msgstr "Utilitza el nom base del fitxer en el títol de la finestra"
#: zathura/config.c:233
#: zathura/config.c:253
msgid "Use ~ instead of $HOME in the filename in the window title"
msgstr ""
#: zathura/config.c:235
#: zathura/config.c:255
msgid "Display the page number in the window title"
msgstr ""
#: zathura/config.c:237
#: zathura/config.c:257
msgid "Use basename of the file in the statusbar"
msgstr ""
#: zathura/config.c:239
#: zathura/config.c:259
msgid "Use ~ instead of $HOME in the filename in the statusbar"
msgstr ""
#: zathura/config.c:241
#: zathura/config.c:261
msgid "Enable synctex support"
msgstr "Habilitar la compatibilitat amb synctex"
#: zathura/config.c:243
#: zathura/config.c:263
msgid "Synctex editor command"
msgstr ""
#: zathura/config.c:245
#: zathura/config.c:265
msgid "Enable D-Bus service"
msgstr ""
#: zathura/config.c:247
#: zathura/config.c:267
msgid "Save history at each page change"
msgstr ""
#: zathura/config.c:249
#: zathura/config.c:269
msgid "The clipboard into which mouse-selected data will be written"
msgstr ""
#: zathura/config.c:251
#: zathura/config.c:271
msgid "Enable notification after selecting text"
msgstr ""
#: zathura/config.c:252
#: zathura/config.c:272
msgid "Sandbox level"
msgstr ""
#. define default inputbar commands
#: zathura/config.c:441
#: zathura/config.c:461
msgid "Add a bookmark"
msgstr "Afegir un marcador"
#: zathura/config.c:442
#: zathura/config.c:462
msgid "Delete a bookmark"
msgstr "Esborrar un marcador"
#: zathura/config.c:443
#: zathura/config.c:463
msgid "List all bookmarks"
msgstr "Llista tots els marcadors"
#: zathura/config.c:444
#: zathura/config.c:464
msgid "Close current file"
msgstr "Tancar el fitxer actual"
#: zathura/config.c:445
#: zathura/config.c:465
msgid "Show file information"
msgstr "Mostra informació sobre el fitxer"
#: zathura/config.c:446 zathura/config.c:447
#: zathura/config.c:466 zathura/config.c:467
msgid "Execute a command"
msgstr "Executar una comanda"
#. like vim
#: zathura/config.c:448
#: zathura/config.c:468
msgid "Show help"
msgstr "Mostrar l'ajuda"
#: zathura/config.c:449
#: zathura/config.c:469
msgid "Open document"
msgstr "Obrir document"
#: zathura/config.c:450
#: zathura/config.c:470
msgid "Close zathura"
msgstr "Tancar Zathura"
#: zathura/config.c:451
#: zathura/config.c:471
msgid "Print document"
msgstr "Imprimir document"
#: zathura/config.c:452
#: zathura/config.c:472
msgid "Save document"
msgstr "Desar document"
#: zathura/config.c:453
#: zathura/config.c:473
msgid "Save document (and force overwriting)"
msgstr "Desar document (i forçar la sobreescritura)"
#: zathura/config.c:454
#: zathura/config.c:474
msgid "Save attachments"
msgstr "Desa els fitxers adjunts"
#: zathura/config.c:455
#: zathura/config.c:475
msgid "Set page offset"
msgstr "Assigna el desplaçament de pàgina"
#: zathura/config.c:456
#: zathura/config.c:476
msgid "Mark current location within the document"
msgstr "Marca la posició actual dins el document"
#: zathura/config.c:457
#: zathura/config.c:477
msgid "Delete the specified marks"
msgstr "Esborrar les marques especificades"
#: zathura/config.c:458
#: zathura/config.c:478
msgid "Don't highlight current search results"
msgstr "No realcis els resultats de la recerca actual"
#: zathura/config.c:459
#: zathura/config.c:479
msgid "Highlight current search results"
msgstr "Realça els resultats de recerca actual"