[Gpg4win-commits] r1539 - in trunk/doc: . manual manual/images-hyperlatex
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Sep 1 14:21:29 CEST 2010
Author: emanuel
Date: 2010-09-01 14:21:25 +0200 (Wed, 01 Sep 2010)
New Revision: 1539
Added:
trunk/doc/manual/images-hyperlatex/english.png
trunk/doc/manual/images-hyperlatex/german.png
Modified:
trunk/doc/ChangeLog
trunk/doc/manual/Makefile.am
trunk/doc/manual/gpg4win-compendium-de.tex
trunk/doc/manual/gpg4win-compendium-en.tex
Log:
Changed html build.
Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog 2010-09-01 06:52:13 UTC (rev 1538)
+++ trunk/doc/ChangeLog 2010-09-01 12:21:25 UTC (rev 1539)
@@ -8,6 +8,12 @@
manual/images-compendium/sc-ol-adele-sendOpenpgpKey-attachment_en.png:
Add new English screenshots by Drew.
+ * manual/Makefile.am, manual/gpg4win-compendium-de.tex,
+ manual/gpg4win-compendium-en.tex,
+ manual/images-hyperlatex/german.png,
+ manual/images-hyperlatex/english.png: Change html build and
+ directory strukture. Add language icons.
+
2010-08-31 Emanuel Schuetze <emanuel at intevation.de>
* manual/Makefile.am: Adapt Makefile.am to added screenshots.
Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am 2010-09-01 06:52:13 UTC (rev 1538)
+++ trunk/doc/manual/Makefile.am 2010-09-01 12:21:25 UTC (rev 1539)
@@ -19,6 +19,8 @@
TEXI2PDF = texi2pdf
INDEX = makeindex
+HYPERLATEX = hyperlatex
+HTML_DIR = compendium-html
png_compendium_files = \
images-compendium/adele01.png \
@@ -262,7 +264,9 @@
images-hyperlatex/noprevious.png \
images-hyperlatex/noup.png \
images-hyperlatex/previous.png \
- images-hyperlatex/up.png
+ images-hyperlatex/up.png \
+ images-hyperlatex/german.png \
+ images-hyperlatex/english.png
eps_compendium_files = $(png_compendium_files:%.png=%.eps)
eps_manual_files = $(png_manual_files:.png=.eps)
@@ -275,7 +279,7 @@
CLEANFILES = $(eps_compendium_files) $(eps_manual_files) \
*.dvi *.pdf *.pdf *.toc *.log *.aux *.out *.idx *.ilg *.ind \
- *.html *.html.d-stamp* *.html.d
+ *.html *.html.d-stamp* *.html.d $(HTML_DIR)
DISTCLEANFILES = version.tex
clean:
@@ -290,9 +294,8 @@
BUILT_SOURCES = $(png_compendium_files)
all-local: gpg4win-compendium-de.pdf \
- gpg4win-compendium-de.html.d-stamp \
gpg4win-compendium-en.pdf \
- gpg4win-compendium-en.html.d-stamp
+ html
gpg4win-compendium-de.pdf : version.tex
gpg4win-compendium-en.pdf : version.tex
@@ -326,11 +329,33 @@
dvi-de: gpg4win-compendium-de.dvi
dvi-en: gpg4win-compendium-en.dvi
-html: gpg4win-compendium-de.html.d-stamp \
- gpg4win-compendium-en.html.d-stamp
-html-de: gpg4win-compendium-de.html.d-stamp
-html-en: gpg4win-compendium-en.html.d-stamp
+cleanhtml:
+ rm -rf $(HTML_DIR)
+
+html: cleanhtml html-de html-en html-images
+
+html-de:
+ $(HYPERLATEX) gpg4win-compendium-de
+
+html-en:
+ $(HYPERLATEX) gpg4win-compendium-en
+
+html-images:
+ mkdir -p $(HTML_DIR)/images-hyperlatex;\
+ for f in $(png_hyperlatex_files); do \
+ if [ -f "$$f" ]; then cp "$$f" $(HTML_DIR)/images-hyperlatex ;\
+ elif [ -f "$(srcdir)/$$f" ]; then cp "$(srcdir)/$$f" $(HTML_DIR)/images-hyperlatex ;\
+ fi ;\
+ done ;\
+ mkdir -p $(HTML_DIR)/images-compendium;\
+ for f in $(png_compendium_files); do \
+ if [ -f "$$f" ]; then cp "$$f" $(HTML_DIR)/images-compendium ;\
+ elif [ -f "$(srcdir)/$$f" ]; then cp "$(srcdir)/$$f" $(HTML_DIR)/images-compendium ;\
+ fi ;\
+ done
+
+
# The html.d directories are used to collect all relevant files for
# the NSI scripts. This is also required because hyperlatex is not
# able to work in VPATH environment.
@@ -369,21 +394,24 @@
for f in $$files; do \
x=$$(basename "$$f") ;\
case $$x in *.png) : ;; *) rm -f $$x ;; esac ;\
- done
- @mv -f $@.tmp $@
+ done ;\
+ @mv -f $@.tmp $@
-online: gpg4win-compendium-de.html.d-stamp gpg4win-compendium-en.html.d-stamp
+online: html
set -e; \
- echo "Going to put current manuals online for www.gpg4win.org ..."; \
- user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
- for d in $^; do \
- (x=$$(echo $$d | sed 's/.d-stamp$$/.d/') ;\
- echo "Cding to: $$x";\
- cd $$x ;\
- rsync -v * \
- $${user}@wald.intevation.org:/gpg4win/htdocs/doc/ ); \
- done
+ echo "Going to put current compendium-html online for www.gpg4win.org ..."; \
+ user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
+ echo user;\
+ rsync -rvz --delete $(HTML_DIR)/ $${user}@wald.intevation.org:/gpg4win/htdocs/doc/
+onlinedryrun: html
+ set -e; \
+ echo "(DRY RUN) Going to put current compendium-html online for www.gpg4win.org ..."; \
+ user=`svn info | sed -n '/^URL:/ s,.*svn+ssh://\\([^@]*\\).*,\\1,p'`;\
+ echo user;\
+ rsync -rvzn --delete $(HTML_DIR)/ $${user}@wald.intevation.org:/gpg4win/htdocs/doc/
+
+
preview: gpg4win-compendium-de.html.d-stamp gpg4win-compendium-en.html.d-stamp
set -e; \
echo "Rsyncing the HTML manuals to the preview host ..."; \
Modified: trunk/doc/manual/gpg4win-compendium-de.tex
===================================================================
--- trunk/doc/manual/gpg4win-compendium-de.tex 2010-09-01 06:52:13 UTC (rev 1538)
+++ trunk/doc/manual/gpg4win-compendium-de.tex 2010-09-01 12:21:25 UTC (rev 1539)
@@ -42,7 +42,7 @@
% we need this to not let smae filenames overwrite each other
% when we have more than one compendium. The Makefile.am needs
% to be updated for this as well - not a trivial change.
-%\W\htmldirectory{./compendium-de-html}
+\W\htmldirectory{compendium-html/de}
% Hyperref should be among the last packages loaded
\usepackage[breaklinks,
@@ -107,7 +107,7 @@
\texorhtml{%
\includegraphics[#1]{images-compendium/#2}%
}{%
- \htmlimg{images-compendium/#2.png}%
+ \htmlimg{../images-compendium/#2.png}%
}
\end{center}
}
@@ -140,12 +140,15 @@
\htmltitle{Gpg4win-Kompendium}
% TOC link in panel
\htmlpanelfield{Inhalt}{hlxcontents}
+ % link to EN version
+ \htmlpanelfield{\htmlattributes*{img}{style=border:none title=English}
+ \htmlimg{../images-hyperlatex/english.png}{English}}{../en/\HlxThisUrl}
% name of the html files
- \htmlname{gpg4win-compendium-de}
+ \htmlname{gpg4win-compendium}
% redefine bmod
\newcommand{\bmod}{mod}
% use hlx icons (default path)
- \newcommand{\HlxIcons}{./images-hyperlatex}
+ \newcommand{\HlxIcons}{../images-hyperlatex}
% Footer
\htmladdress{$\copyright$ \compendiumDateDE, v\compendiumVersionDE
Modified: trunk/doc/manual/gpg4win-compendium-en.tex
===================================================================
--- trunk/doc/manual/gpg4win-compendium-en.tex 2010-09-01 06:52:13 UTC (rev 1538)
+++ trunk/doc/manual/gpg4win-compendium-en.tex 2010-09-01 12:21:25 UTC (rev 1539)
@@ -44,7 +44,7 @@
% we need this to not let smae filenames overwrite each other
% when we have more than one compendium. The Makefile.am needs
% to be updated for this as well - not a trivial change.
-%\W\htmldirectory{./compendium-de-html}
+\W\htmldirectory{compendium-html/en}
% Hyperref should be among the last packages loaded
@@ -119,7 +119,7 @@
\texorhtml{%
\includegraphics[#1]{images-compendium/#2}%
}{%
- \htmlimg{images-compendium/#2.png}%
+ \htmlimg{../images-compendium/#2.png}%
}
\end{center}
}
@@ -151,13 +151,16 @@
% HTML title
\htmltitle{Gpg4win Compendium}
% TOC link in panel
- \htmlpanelfield{Inhalt}{hlxcontents}
+ \htmlpanelfield{Contents}{hlxcontents}
+ % link to DE version
+ \htmlpanelfield{\htmlattributes*{img}{style=border:none title=German}
+ \htmlimg{../images-hyperlatex/german.png}{German}}{../de/\HlxThisUrl}
% name of the html files
- \htmlname{gpg4win-compendium-en}
+ \htmlname{gpg4win-compendium}
% redefine bmod
\newcommand{\bmod}{mod}
% use hlx icons (default path)
- \newcommand{\HlxIcons}{./images-hyperlatex}
+ \newcommand{\HlxIcons}{../images-hyperlatex}
% Footer
\htmladdress{$\copyright$ \compendiumDateEN, v\compendiumVersionEN
Added: trunk/doc/manual/images-hyperlatex/english.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/manual/images-hyperlatex/english.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/manual/images-hyperlatex/german.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/manual/images-hyperlatex/german.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
More information about the Gpg4win-commits
mailing list