Index: conf.py =================================================================== --- conf.py (revision 9421) +++ conf.py (working copy) @@ -174,12 +174,21 @@ # -- Options for LaTeX output -------------------------------------------------- -# The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' +latex_elements = { +# The paper size ('letterpaper' or 'a4paper'). +'papersize': 'a4paper', # The font size ('10pt', '11pt' or '12pt'). -#latex_font_size = '10pt' +'pointsize': '11pt', +# remove blank pages +'classoptions': ',oneside', +'babel': '\\usepackage[english]{babel}' + +# Additional stuff for the LaTeX preamble. +#'preamble': '' +} + # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ @@ -195,12 +204,17 @@ # not chapters. #latex_use_parts = False -# Additional stuff for the LaTeX preamble. -#latex_preamble = '' +# If true, show page references after internal links. +#latex_show_pagerefs = False +# If true, show URL addresses after external links. +#latex_show_urls = False + # Documents to append as an appendix to all manuals. #latex_appendices = [] +# If false, no module index is generated. +#latex_domain_indices = True # Linkcheck configuration, see http://sphinx.pocoo.org/latest/config.html#options-for-the-linkcheck-builder Index: Makefile =================================================================== --- Makefile (revision 9421) +++ Makefile (working copy) @@ -9,6 +9,7 @@ TMP = /tmp/osgeolive_make TRANSLATIONS = ca de el es it fr ja ko pl ru zh LANGUAGES = en $(TRANSLATIONS) +PDF_LANG = en START_DIR = $(shell pwd) # Internal variables. @@ -28,6 +29,7 @@ @echo " htmlhelp to make HTML files and a HTML help project" @echo " qthelp to make HTML files and a qthelp project" @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" @echo " changes to make an overview of all changed/added/deprecated items" @echo " linkcheck to check all external links for integrity" @echo " doctest to run all doctests embedded in the documentation (if enabled)" @@ -143,8 +145,11 @@ echo `pwd` ../bin/extract_licenses.sh > licenses.csv -html: sphinxbuild fix_header_links banner_links win_installer_links test_page css link_to_en_docs link_to_en_docs +fix_index: + cp index.template index.rst +html: fix_index sphinxbuild fix_header_links banner_links win_installer_links test_page css link_to_en_docs link_to_en_docs + dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @echo @@ -175,13 +180,49 @@ @echo "To view the help file:" @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/OSGeo-Live.qhc" -latex: sphinxbuild fix_header_links banner_links win_installer_links test_page css link_to_en_docs link_to_en_docs +link_to_en_docs_pdf: + # For quickstart, standards and overview docs which have not been + # translated, link to english doc + for LANG in $(PDF_LANG) ; do \ + for DOC in en/*/* ; do \ + TRANSLATED_DOC=`echo $$DOC | sed -e"s/en/$$LANG/"` ; \ + TARGET_EN=`echo $$DOC | sed -e"s#^#../../#"` ; \ + if [ ! -f $$TRANSLATED_DOC ] ; then \ + rm -f $$TRANSLATED_DOC ; \ + ln -s $$TARGET_EN $$TRANSLATED_DOC ; \ + fi ; \ + done ; \ + done + # link to english docs for the docs in head directory + for LANG in $(PDF_LANG) ; do \ + for DOC in en/download.rst en/contact.rst en/index.rst en/sponsors.rst en/sponsors_osgeo.rst en/disclaimer.rst en/presentation.rst en/copyright.rst ; do \ + TRANSLATED_DOC=`echo $$DOC | sed -e"s/en/$$LANG/"` ; \ + TARGET_EN=`echo $$DOC | sed -e"s#^#../#"` ; \ + if [ ! -f $$TRANSLATED_DOC ] ; then \ + rm -f $$TRANSLATED_DOC ; \ + ln -s $$TARGET_EN $$TRANSLATED_DOC ; \ + fi ; \ + done ; \ + done + +fix_index_pdf: + for LANG in $(PDF_LANG) ; do \ + cat index_pdf.template | sed "s/LANG_PDF/$$LANG/#" > index.rst ; \ + done + +latex: fix_index_pdf licenses.csv link_to_en_docs_pdf $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex @echo @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ "run these through (pdf)latex." +latexpdf: fix_index_pdf licenses.csv link_to_en_docs_pdf + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + changes: $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes @echo Index: en/index.rst =================================================================== --- en/index.rst (revision 9421) +++ en/index.rst (working copy) @@ -2,6 +2,22 @@ Welcome to |osgeo-live-version| ================================================================================ +.. only:: latex + + .. toctree:: + :maxdepth: 1 + :glob: + + overview/toc + quickstart/toc + standards/standards + download + contact + copyright + disclaimer + sponsors + sponsors_osgeo + `OSGeo-Live `_ is a self-contained bootable DVD, USB thumb drive or Virtual Machine based on `Xubuntu `_, that allows you to try a wide variety of open source geospatial software without installing anything. It is composed @@ -27,36 +43,39 @@ Many applications are also provided with installers for `Apple OSX <../MacInstallers/>`_ and `Microsoft Windows <../WindowsInstallers/>`_. +.. only:: html -Quick Starts --------------------------------------------------------------------------------- + Quick Starts + -------------------------------------------------------------------------------- -.. toctree:: - :maxdepth: 1 + .. toctree:: + :maxdepth: 1 - Getting started with the OSGeo-Live DVD - Change language or keyboard type - Install OSGeo-Live on your hard disk - Run OSGeo-Live in a Virtual Machine - Create an OSGeo-Live bootable USB thumb drive + Getting started with the OSGeo-Live DVD + Change language or keyboard type + Install OSGeo-Live on your hard disk + Run OSGeo-Live in a Virtual Machine + Create an OSGeo-Live bootable USB thumb drive -.. toctree:: - :maxdepth: 1 - :hidden: - :glob: + .. toctree:: + :maxdepth: 1 + :hidden: + :glob: - overview/overview - quickstart/*quickstart - standards/standards - contact - copyright - disclaimer - download - sponsors - sponsors_osgeo - presentation - test + overview/overview + quickstart/quickstart + standards/standards + contact + copyright + disclaimer + download + sponsors + sponsors_osgeo + presentation + test + + Presentation -------------------------------------------------------------------------------- A half hour presentation, highlighting all OSGeo-Live applications, is available as a video, along with source slides and script.