remove support for eps.

This also solves a problem with the images in the html documentation. Before, eps images have been used and converted to (nearly unreadable) pngs, even if native pngs have been available. Now, the native pngs are used. DVI are not provides any more.
bareos · Sep 14, 2015 · 5146447 · 5146447
1 parent 4667b82
commit 5146447
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 81,631 deletions.
diff --git a/debian/docs b/debian/docs
@@ -1,4 +1,3 @@
-manuals/en/main/bareos-manual-main-reference.dvi
 manuals/en/main/bareos-manual-main-reference.pdf
 manuals/en/main/html/
 manuals/en/developers/html/
diff --git a/manuals/en/main/Makefile b/manuals/en/main/Makefile
@@ -40,17 +40,20 @@ all: pdf html
 depend:
 	@for I in ${subdirs}; \
 		do (cd $$I; echo "==>Entering directory `pwd`"; $(MAKE) || exit 1); done
+	ln -s ../../images/conv images || true
 
 pdf: bareos-manual-main-reference.pdf
 
 html: html/bareos-manual-main-reference.html
 
 html/bareos-manual-main-reference.html: depend *.sty *.tex bareos-manual-main-reference.htlatex.cfg $(GENERATED) $(HTINDEXES) bareos-manual-main-reference.toc
-	mkdir -p html
+	mkdir -p html/
 	htlatex bareos-manual-main-reference "bareos-manual-main-reference.htlatex.cfg" "" -d./html/
+	mkdir -p html/images/
+	mv html/*.png html/images/
 
 %.idx:
-	$(LATEX) bareos-manual-main-reference.tex
+	$(PDFLATEX) bareos-manual-main-reference.tex
 
 %.ind: %.idx
 	$(MAKEINDEX) $<
@@ -65,7 +68,7 @@ html/bareos-manual-main-reference.html: depend *.sty *.tex bareos-manual-main-re
 	name=`basename $< .4dx`; $(MAKEINDEX) -o $${name}.htind $<
 
 bareos-manual-main-reference.toc: *.tex
-	$(LATEX) bareos-manual-main-reference.tex
+	$(PDFLATEX) bareos-manual-main-reference.tex
 
 bareos-manual-main-reference.dvi: depend *.sty *.tex $(GENERATED) $(INDEXES) bareos-manual-main-reference.toc
 	$(LATEX) bareos-manual-main-reference.tex

diff --git a/manuals/en/main/bareos-manual-main-reference.htlatex.cfg b/manuals/en/main/bareos-manual-main-reference.htlatex.cfg
@@ -1,7 +1,8 @@
 \Preamble{html,index=2,info,sections+}
+% ,imgdir:images/
 %\Preamble{html,index=2,mouseover,obj-toc,sections+}
+\Configure{charset}{utf-8}
 \Configure{@HEAD}{\HCode{<link href='http://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css' />}}
-\Css{body{font-family: 'Droid Sans', sans-serif;}}
 \begin{document}
 
     \Css{

diff --git a/manuals/en/main/bareos-manual-main-reference.tex b/manuals/en/main/bareos-manual-main-reference.tex
@@ -16,6 +16,7 @@
 
 \usepackage{float}
 \usepackage{graphicx}
+\DeclareGraphicsExtensions{.png,.jpg}
 \usepackage{longtable}
 \usepackage{makeidx}
 \usepackage{index}

diff --git a/manuals/en/main/bareos.sty b/manuals/en/main/bareos.sty
@@ -21,7 +21,8 @@
 %%
 %%
 %% define images directory
-\def\idir{../../images/conv/}  %% images directory
+%\def\idir{../../images/conv/}  %% images directory
+\def\idir{images/}
 
 %
 % Bareos paths and filenames

diff --git a/manuals/en/main/coverpage.tex b/manuals/en/main/coverpage.tex
@@ -1,7 +1,11 @@
 
 \begin{titlepage}
 
-\title{\includegraphics[width=0.8\linewidth]{\idir bareos-full-logo} \\
+\title{%
+% explicied sizes, to prevent problems with htlatex
+\includegraphics[width=0.8\textwidth,natwidth=743,natheight=233]{\idir bareos-full-logo.png} \\
+%\includegraphics{\idir bareos-full-logo} \\
+%\includegraphics[width=0.8\textwidth,natwidth=743,natheight=233]{\idir bareos-full-logo} \\
 \Huge{Bareos} $^{\normalsize \textregistered}$\\
 \huge{Backup Archiving REcovery Open Sourced}\\[2ex]
 Main Reference\\

diff --git a/manuals/images/Bareos-tray-monitor.eps b/manuals/images/Bareos-tray-monitor.eps