Merge commit 'e992c260c059c53c4aabc980db85efd58f190205'

diff --cc src/be/nikiroo/fanfix/Main.java
Simple merge

diff --cc src/be/nikiroo/fanfix/data/MetaData.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/BasicLibrary.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/LocalLibrary.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibrary.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibraryServer.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibraryServerHtml.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/WebLibraryUrls.java
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/index.pre.html
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/package-info.java
index 0000000000000000000000000000000000000000,69bff54a2b25dd9b828a55f078c4342eaa010a78..69bff54a2b25dd9b828a55f078c4342eaa010a78
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/package-info.java
+++ b/src/be/nikiroo/fanfix/library/web/package-info.java

diff --cc src/be/nikiroo/fanfix/library/web/style.css
Simple merge

diff --cc src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java
index 0000000000000000000000000000000000000000,482a1b826e12514a0714cf5cd3256531851d4166..482a1b826e12514a0714cf5cd3256531851d4166
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/WebLibraryServerTemplates.java
+++ b/src/be/nikiroo/fanfix/library/web/templates/WebLibraryServerTemplates.java

diff --cc src/be/nikiroo/fanfix/library/web/templates/bookline.html
index 0000000000000000000000000000000000000000,9b1a6b78f7a5d8bfdb29ca85bb9a9f1c67588e88..9b1a6b78f7a5d8bfdb29ca85bb9a9f1c67588e88
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/bookline.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/bookline.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/browser.html
index 0000000000000000000000000000000000000000,f3f30478bab987a5d252d59b85cc0cae5b5aff0b..f3f30478bab987a5d252d59b85cc0cae5b5aff0b
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/browser.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/browser.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/browser.option.html
index 0000000000000000000000000000000000000000,49f7b5b1624ec6e388ac26207f8e8bccf0fa068e..49f7b5b1624ec6e388ac26207f8e8bccf0fa068e
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/browser.option.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/browser.option.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/browser.select.html
index 0000000000000000000000000000000000000000,447d845adccc95da44c43361237644c048037aad..447d845adccc95da44c43361237644c048037aad
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/browser.select.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/browser.select.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/index.banner.html
index 0000000000000000000000000000000000000000,c2cd1e7ff7ee0124533752910b02601d4ae84cf8..c2cd1e7ff7ee0124533752910b02601d4ae84cf8
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/index.banner.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/index.banner.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/index.post.html
index 0000000000000000000000000000000000000000,52ba19e7f5521374c7fe5121c908e272e3d5675f..52ba19e7f5521374c7fe5121c908e272e3d5675f
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/index.post.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/index.post.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/package-info.java
index 0000000000000000000000000000000000000000,5d4f3b2efaeffb8ff0894ba25c3444e35d97d24b..5d4f3b2efaeffb8ff0894ba25c3444e35d97d24b
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/package-info.java
+++ b/src/be/nikiroo/fanfix/library/web/templates/package-info.java

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html
index 0000000000000000000000000000000000000000,21cddc45048ea2bd6c2e0e671554920c20acd5ec..21cddc45048ea2bd6c2e0e671554920c20acd5ec
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.desc.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.desc.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html
index 0000000000000000000000000000000000000000,9d619879b38bc56d511057637ca1de01399e9502..9d619879b38bc56d511057637ca1de01399e9502
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.descline.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.descline.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.image.html
index 0000000000000000000000000000000000000000,24165162aee14c5b8b2b0328baf6b7ae4d4e9fc6..24165162aee14c5b8b2b0328baf6b7ae4d4e9fc6
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.image.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.image.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.link.html
index 0000000000000000000000000000000000000000,5812c80aaf7ea9708ec31baa9bbe017751c117c2..5812c80aaf7ea9708ec31baa9bbe017751c117c2
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.link.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.link.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html
index 0000000000000000000000000000000000000000,59f35be1452780577adc60145549c5e15874bca7..59f35be1452780577adc60145549c5e15874bca7
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.navbar.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.navbar.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html
index 0000000000000000000000000000000000000000,b85f9a9a4f28524c2b0d942074f1e52ac58ed6b3..b85f9a9a4f28524c2b0d942074f1e52ac58ed6b3
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.optionbar.button.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.button.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html
index 0000000000000000000000000000000000000000,1d1eaec1a0eacfac463a6cc4d2d8c367a44b795e..1d1eaec1a0eacfac463a6cc4d2d8c367a44b795e
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.optionbar.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.optionbar.html

diff --cc src/be/nikiroo/fanfix/library/web/templates/viewer.text.html
index 0000000000000000000000000000000000000000,4562ea470c269ef9a1da3de505bd2c228547f7f6..4562ea470c269ef9a1da3de505bd2c228547f7f6
mode 000000,100644..100644
--- /dev/null
--- 2/library/web/templates/viewer.text.html
+++ b/src/be/nikiroo/fanfix/library/web/templates/viewer.text.html

diff --cc src/be/nikiroo/fanfix/output/BasicOutput.java
Simple merge

diff --cc src/be/nikiroo/fanfix/output/InfoCover.java
Simple merge

diff --cc src/be/nikiroo/fanfix/reader/TextOutput.java
Simple merge

diff --cc src/be/nikiroo/fanfix/searchable/Fanfiction.java
Simple merge

diff --cc src/be/nikiroo/fanfix/searchable/MangaLel.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/BasicSupportImages.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/BasicSupportPara.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/BasicSupport_Deprecated.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/Cbz.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/Epub.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/FimfictionApi.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/InfoReader.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/MangaLel.java
Simple merge

diff --cc src/be/nikiroo/fanfix/supported/Text.java
Simple merge