summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkevmitch <kevmitch@gmail.com>2014-05-09 08:25:14 -0700
committerkevmitch <kevmitch@gmail.com>2014-05-09 08:25:14 -0700
commit0a328bd5c192da52084b1b17f2c545f10b1c2e90 (patch)
tree5f77a540ca13162e5550f4bb3cc9906999b00c8b
parent996ab61a6a3422c84f8924ebb72ffda833545777 (diff)
parentaee35666c1c48dcfbf9b1ae87598855d50945e03 (diff)
downloadmpv-0a328bd5c192da52084b1b17f2c545f10b1c2e90.tar.bz2
mpv-0a328bd5c192da52084b1b17f2c545f10b1c2e90.tar.xz
Merge pull request #774 from kevmitch/man_pdf_tweaks
man: tweak --sub-codepage for concision
-rw-r--r--DOCS/man/en/options.rst38
1 files changed, 18 insertions, 20 deletions
diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst
index d4e51d172a..4a432fa58b 100644
--- a/DOCS/man/en/options.rst
+++ b/DOCS/man/en/options.rst
@@ -2226,31 +2226,30 @@ OPTIONS
.. admonition:: Examples
- ``--sub-codepage=utf8:latin2`` Use Latin 2 if input is not UTF-8.
- - ``--sub-codepage=utf8:cp1250`` Use CP1250 if input is not UTF-8.
- ``--sub-codepage=cp1250`` Always force recoding to cp1250.
- The pseudo codepage ``UTF-8-BROKEN`` is used internally. If this is used
- as codepage, the subtitle will be interpreted as UTF-8, but with "Latin 1"
- as fallback for bytes which are not valid UTF-8 sequences. iconv is never
- involved in this mode.
+ The pseudo codepage ``UTF-8-BROKEN`` is used internally. When it
+ is the codepage, subtitles are interpreted as UTF-8 with "Latin 1" as
+ fallback for bytes which are not valid UTF-8 sequences. iconv is
+ never involved in this mode.
If the player was compiled with ENCA support, you can control it with the
- following syntax::
+ following syntax:
- ``--sub-codepage=enca:<language>:<fallback codepage>``
+ ``--sub-codepage=enca:<language>:<fallback codepage>``
- You can specify your language using a two letter language code to make
- ENCA detect the codepage automatically. If unsure, enter anything (if the
- language is invalid, mpv will complain and list valid languages).
- Fallback codepage specifies the codepage to use if autodetection fails.
- If no fallback is specified, ``UTF-8-BROKEN`` is used.
+ Language is specified using a two letter code to help ENCA detect
+ the codepage automatically. If an invalid language code is
+ entered, mpv will complain and list valid languages. (Note
+ however that this list will only be printed when the conversion code is actually
+ called, for example when loading an external subtitle). The
+ fallback codepage is used if autodetection fails. If no fallback
+ is specified, ``UTF-8-BROKEN`` is used.
.. admonition:: Examples
- - ``--sub-codepage=enca:cs:latin2`` guess the encoding, assuming the subtitles
- are Czech, fall back on latin 2, if the detection fails.
- - ``--sub-codepage=enca:pl:cp1250`` guess the encoding for Polish, fall back on
- cp1250.
+ - ``--sub-codepage=enca:pl:cp1250`` guess the encoding, assuming the subtitles
+ are Polish, fall back on cp1250
- ``--sub-codepage=enca:pl`` guess the encoding for Polish, fall back on UTF-8.
- ``--sub-codepage=enca`` try universal detection, fall back on UTF-8.
@@ -2258,10 +2257,9 @@ OPTIONS
``--sub-codepage=guess:<language>:<fallback codepage>``
- Note that libguess always needs a language. There is no universal detection
- mode. Use ``--sub-codepage=guess:help`` to get a list of languages (like with ENCA,
- it will be printed only if the conversion code is somehow called, for
- example when loading an external subtitle).
+ libguess always needs a language. There is no universal detection
+ mode. Use ``--sub-codepage=guess:help`` to get a list of
+ languages subject to the same caveat as with ENCA above.
``--sub-fix-timing``, ``--no-sub-fix-timing``
By default, external text subtitles are preprocessed to remove minor gaps