Skip to content

Commit ad8591b

Browse files
committed
#56 - Documented additional Docverter file types
1 parent 07f3dd6 commit ad8591b

File tree

2 files changed

+33
-28
lines changed

2 files changed

+33
-28
lines changed

README.md

+26-23
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,29 @@ This table shows the number of converters configured by default between file ext
1212

1313
fileconverter list extension-table
1414

15-
source | dbk | docx | eml | epub | epub3 | fb2 | html | jpg | man | md | odt | opml | pdf | pdf/grayscale | ps | rtf | txt
16-
--- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | ---
17-
bib | | | | | | | | | | | | | 1 | | | |
18-
dbk | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | | | 1 | 1
19-
doc | | | | | | | | | | | | | 1 | | | | 1
20-
html | 1 | 1 | 1 | 1 | 1 | 1 | 3 | 1 | 1 | 1 | 1 | 1 | 9 | | | 1 | 1
21-
jpg | | | | | | | | 1 | | | | | | | | |
22-
ltx | | | | | | | | | | | | | 1 | | | |
23-
md | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | | | 1 | 1
24-
opml | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | | | 1 | 1
25-
pdb | | | | | | | | | | | | | 1 | | | |
26-
pdf | | | | | | | | 1 | | | | | 1 | 1 | | |
27-
ps | | | | | | | | | | | | | 1 | | | |
28-
psw | | | | | | | | | | | | | 1 | | | |
29-
rst | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | | | 1 | 1
30-
rtf | | | | | | | | | | | | | 4 | | 2 | |
31-
sdw | | | | | | | | | | | | | 1 | | | |
32-
sxw | | | | | | | | | | | | | 1 | | | |
33-
tex | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | | | 1 | 1
34-
textile | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | | | 1 | 1
35-
txt | 1 | 1 | | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 2 | | | 1 | 1
36-
vor | | | | | | | | | | | | | 1 | | | |
37-
wiki | 1 | 1 | | 1 | 1 | 1 | 2 | | 1 | 2 | 1 | 1 | 1 | | | 1 | 1
15+
source | asciidoc | context | dbk | docbook | docx | eml | epub | epub3 | fb2 | html | jpg | latex | man | markdown | md | mediawiki | mobi | odt | opml | org | pdf | pdf/grayscale | ps | rtf | texinfo | textile | txt
16+
--- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | ---
17+
bib | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
18+
dbk | | | 1 | | 1 | | 1 | 1 | 1 | 1 | | | 1 | | 1 | | | 1 | 1 | | 1 | | | 1 | | | 1
19+
doc | | | | | | | | | | | | | | | | | | | | | 1 | | | | | | 1
20+
docbook | 1 | 1 | | 1 | 1 | | 1 | | | 1 | | 1 | | 1 | | 1 | 1 | | | 1 | 1 | | | 1 | 1 | 1 |
21+
html | 1 | 1 | 1 | 1 | 2 | 1 | 2 | 1 | 1 | 4 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 9 | | | 2 | 1 | 1 | 1
22+
jpg | | | | | | | | | | | 1 | | | | | | | | | | | | | | | |
23+
latex | 1 | 1 | | 1 | 1 | | 1 | | | 1 | | 1 | | 1 | | 1 | 1 | | | 1 | 1 | | | 1 | 1 | 1 |
24+
ltx | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
25+
markdown | 1 | 1 | | 1 | 1 | | 1 | | | 1 | | 1 | | 1 | | 1 | 1 | | | 1 | 1 | | | 1 | 1 | 1 |
26+
md | | | 1 | | 1 | | 1 | 1 | 1 | 1 | | | 1 | | 1 | | | 1 | 1 | | 1 | | | 1 | | | 1
27+
opml | | | 1 | | 1 | | 1 | 1 | 1 | 1 | | | 1 | | 1 | | | 1 | 1 | | 1 | | | 1 | | | 1
28+
pdb | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
29+
pdf | | | | | | | | | | | 1 | | | | | | | | | | 1 | 1 | | | | |
30+
ps | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
31+
psw | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
32+
rst | 1 | 1 | 1 | 1 | 2 | | 2 | 1 | 1 | 2 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 2 | | | 2 | 1 | 1 | 1
33+
rtf | | | | | | | | | | | | | | | | | | | | | 4 | | 2 | | | |
34+
sdw | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
35+
sxw | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
36+
tex | | | 1 | | 1 | | 1 | 1 | 1 | 1 | | | 1 | | 1 | | | 1 | 1 | | 1 | | | 1 | | | 1
37+
textile | 1 | 1 | 1 | 1 | 2 | | 2 | 1 | 1 | 2 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 2 | | | 2 | 1 | 1 | 1
38+
txt | | | 1 | | 1 | | 1 | 1 | 1 | 1 | | | 1 | | 1 | | | 1 | 1 | | 2 | | | 1 | | | 1
39+
vor | | | | | | | | | | | | | | | | | | | | | 1 | | | | | |
40+
wiki | | | 1 | | 1 | | 1 | 1 | 1 | 2 | | | 1 | | 2 | | | 1 | 1 | | 1 | | | 1 | | | 1

src/Configuration/ConfigurationDefaults.php

+7-5
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public function __construct(&$settings) {
3636
$lsb = trim(`which lsb_release`);
3737
if ($lsb !== '') {
3838
$lsb = escapeshellarg($lsb);
39-
$settings['operating_system'] = trim(`$lsb -is`);
40-
$settings['operating_system_version'] = trim(`$lsb -rs`);
39+
$settings['operating_system'] = trim(`$lsb -is`);
40+
$settings['operating_system_version'] = trim(`$lsb -rs`);
4141
}
4242
}
4343
elseif ($settings['operating_system'] === 'Windows NT') {
@@ -76,9 +76,6 @@ public function __construct(&$settings) {
7676
'xhtml2pdf:default' => array(
7777
'#engine' => 'Convert\\Xhtml2Pdf',
7878
),
79-
'docverter:default' => array(
80-
'#engine' => 'Convert\\Docverter',
81-
),
8279
'mpdf:default' => array(
8380
'#engine' => 'Convert\\Mpdf',
8481
),
@@ -104,6 +101,11 @@ public function __construct(&$settings) {
104101
'chain' => 'wiki->html->md',
105102
),
106103
),
104+
'(html|markdown|textile|rst|docbook|latex)->(pdf|markdown|html|latex|context|mediawiki|textile|org|texinfo|docbook|docx|epub|mobi|asciidoc|rtf)' => array(
105+
'docverter:default' => array(
106+
'#engine' => 'Convert\\Docverter',
107+
),
108+
),
107109
'(html|txt|md|rst|dbk|textile|opml|tex|wiki)->(pdf|html|docx|odt|dbk|md|txt|opml|rtf|epub|epub3|fb2|man)' => array(
108110
'pandoc:default' => array(
109111
'#engine' => 'Convert\\Pandoc',

0 commit comments

Comments
 (0)