[Liblas-commits] hg: 4 new changesets
liblas-commits at liblas.org
liblas-commits at liblas.org
Wed Sep 29 22:27:37 EDT 2010
changeset 68bd0acb1061 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=68bd0acb1061
summary: update
changeset da126f61bf05 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=da126f61bf05
summary: update version
changeset 2e16f8ba96c8 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=2e16f8ba96c8
summary: add link to pdf
changeset 3c918bbc326f in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=3c918bbc326f
summary: update to sphinx 1.0+ makefile
diffstat:
doc/Makefile | 174 ++++++++++++++++++++++++++++-----------------
doc/conf.py | 4 +-
doc/docs.txt | 12 +++
doc/utilities/las2oci.txt | 46 ++++-------
4 files changed, 140 insertions(+), 96 deletions(-)
diffs (truncated from 335 to 300 lines):
diff -r f2c9b18e8e37 -r 3c918bbc326f doc/Makefile
--- a/doc/Makefile Tue Sep 28 15:31:22 2010 -0500
+++ b/doc/Makefile Wed Sep 29 21:27:10 2010 -0500
@@ -5,95 +5,137 @@
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
+BUILDDIR = build
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-.PHONY: html help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
-
-html:
- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
- @echo
- @echo "Build finished. The HTML pages are in build/html."
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext pdf
help:
@echo "Please use \`make <target>' where <target> is one of"
- @echo " html to make standalone HTML files"
- @echo " dirhtml to make HTML files named index.html in directories"
- @echo " pickle to make pickle files"
- @echo " json to make JSON files"
- @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 " 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)"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @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 " text to make text files"
+ @echo " man to make manual pages"
+ @echo " gettext to make PO message catalogs"
+ @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)"
clean:
- -rm -rf build/*
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
dirhtml:
- $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) build/dirhtml
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
- @echo "Build finished. The HTML pages are in build/dirhtml."
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-doxygen:
- cd api; doxygen doxygen.conf; cd ..
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
- @echo "Doxygen built"
-
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
pickle:
- $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."
json:
- $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/df.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/df.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/df"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/df"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(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."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+gettext:
+ $(SPHINXBUILD) -b gettext $(ALLSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
+
pdf:
$(SPHINXBUILD) -b pdf $(ALLSPHINXOPTS) build/pdf
@echo
- @echo "Build finished; now you can process the PDF files."
-
-htmlhelp:
- $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
- @echo
- @echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in build/htmlhelp."
-
-qthelp:
- $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) build/qthelp
- @echo
- @echo "Build finished; now you can run "qcollectiongenerator" with the" \
- ".qhcp project file in build/qthelp, like this:"
- @echo "# qcollectiongenerator build/qthelp/libLAS.qhcp"
- @echo "To view the help file:"
- @echo "# assistant -collectionFile build/qthelp/libLAS.qhc"
-
-latex:
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
- @echo
- @echo "Build finished; the LaTeX files are in build/latex."
- @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
- "run these through (pdf)latex."
-
-changes:
- $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
- @echo
- @echo "The overview file is in build/changes."
-
-linkcheck:
- $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
- @echo
- @echo "Link check complete; look for any errors in the above output " \
- "or in build/linkcheck/output.txt."
-
-doctest:
- $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) build/doctest
- @echo "Testing of doctests in the sources finished, look at the " \
- "results in build/doctest/output.txt."
-
+ @echo "Build finished; now you can process the PDF files."
\ No newline at end of file
diff -r f2c9b18e8e37 -r 3c918bbc326f doc/conf.py
--- a/doc/conf.py Tue Sep 28 15:31:22 2010 -0500
+++ b/doc/conf.py Wed Sep 29 21:27:10 2010 -0500
@@ -51,9 +51,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.3.0'
+version = '1.6.0'
# The full version, including alpha/beta/rc tags.
-release = '1.3.0'
+release = '1.6.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -r f2c9b18e8e37 -r 3c918bbc326f doc/docs.txt
--- a/doc/docs.txt Tue Sep 28 15:31:22 2010 -0500
+++ b/doc/docs.txt Wed Sep 29 21:27:10 2010 -0500
@@ -4,6 +4,18 @@
libLAS Documentation
******************************************************************************
+.. note::
+ The entire documentation is also available as a single
+ `PDF document <./libLAS.pdf>`__ |image| and `ePub document <./libLAS.epub>`__
+
+.. include:: ./include/docnav.inc
+
+.. |image| image:: ./../_static/pdf.png
+ :height: 15
+ :width: 15
+ :alt: PDF icon
+ :target: /pdf/libLAS.pdf
+
.. toctree::
:maxdepth: 2
diff -r f2c9b18e8e37 -r 3c918bbc326f doc/utilities/las2oci.txt
--- a/doc/utilities/las2oci.txt Tue Sep 28 15:31:22 2010 -0500
+++ b/doc/utilities/las2oci.txt Wed Sep 29 21:27:10 2010 -0500
@@ -28,7 +28,7 @@
:ref:`las2oci` is a command-line utility that allows you to ingest a
.las file into Oracle.
-::
+.. code-block:: text
--------------------------------------------------------------------
las2oci (libLAS 1.6.0 with GeoTIFF 1.3.0 GDAL 1.8dev)
@@ -87,37 +87,24 @@
(PC_EXTENT, BLK_EXTENT,
USER_SDO_GEOM_METADATA) entries
--global-extent arg Extent window to define for the PC_EXTENT.
- Use a comma-separated list, for example,
- --global-extent minx, miny, maxx, maxy
+ Use a list, for example,
+ --global-extent minx miny maxx maxy
or
- --global-extent minx, miny, minz, maxx,
- maxy, maxz
+ --global-extent minx miny minz maxx maxy
+ maxz
--cached Cache the entire file on the first read
Transformation options:
- --a_srs arg Coordinate system to assign to input LAS file
--t_srs arg Coordinate system to reproject output LAS file to. Use
--a_srs or verify that your input LAS file has a
coordinate system according to lasinfo
- --offset arg A comma-separated list of offsets to set on the output
- file:
- --offset 0,0,0
- --offset min,min,min
- --scale arg A comma-separated list of scales to set on the output
- file:
- --scale 0.1,0.1,0.00001
- -f [ --format ] arg Set the LAS format of the new file (only 1.0-1.2
- supported at this time):
- --format 1.2
- -f 1.1
- --pad-header arg Add extra bytes to the existing header
Filtering options:
-e [ --extent ] arg Extent window that points must fall within to keep.
- Use a comma-separated list, for example,
- -e minx, miny, maxx, maxy
+ For example,
+ -e minx miny maxx maxy
or
- -e minx, miny, minz, maxx, maxy, maxz
+ -e minx miny minz maxx maxy maxz
-t [ --thin ] arg (=0) Simple decimation-style thinning.
More information about the Liblas-commits
mailing list