[geos-commits] [SCM] GEOS branch master updated. 6f46a0ba7c8c9194bbc14ded2ecbaaa9bf0c1630

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  6f46a0ba7c8c9194bbc14ded2ecbaaa9bf0c1630 (commit)
      from  3e299be627d3243be8d55ba0d10afd84a3d8ca2f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f46a0ba7c8c9194bbc14ded2ecbaaa9bf0c1630
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Dec 11 13:50:59 2018 -0800

    While we work up the nerves to bulk-format the
    tree, change the editorconfig file to reflect
    the decision, and add a note on a astyle call
    that should do the "right" thing.
    https://lists.osgeo.org/pipermail/geos-devel/2018-September/008582.html

diff --git a/.editorconfig b/.editorconfig
index 69886d0..9f4132e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,10 +10,10 @@ end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-# C++ files want tab indentation
-[*.{h,cpp}]
-indent_style = tab
-indent_size = 2
+# C/C++ files want 4-space indentation
+[*.{h,cpp,inl,h.in,c}]
+indent_style = space
+indent_size = 4
 
 # Makefiles want tab indentation
 [Makefile.am]
@@ -43,20 +43,3 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-# operation/union directories were found to be using spaces
-[src/operation/union/*.cpp]
-indent_style = space
-indent_size = 2
-[include/geos/operation/union/*.{h,inl}]
-indent_style = space
-indent_size = 2
-
-# XMLTester.cpp wants 2-space indent
-[tests/xmltester/XMLTester.cpp]
-indent_style = space
-indent_size = 4
-
-# Stackwalker.cpp wants 4-space indent
-[tests/xmltester/Stackwalker.cpp]
-indent_style = space
-indent_size = 2
diff --git a/README.md b/README.md
index 348b7bb..04ce52a 100644
--- a/README.md
+++ b/README.md
@@ -125,3 +125,14 @@ To build Doxygen documentation:
     cd doc
     make doxygen-html
 
+## Style
+
+To format your code into the desired style, use astyle 3.1:
+
+    astyle --style=stroustrup \
+           --pad-comma \
+           --indent=spaces=4 \
+           --max-code-length=120 \
+           --lineend=linux \
+           yourfile.cpp
+

-----------------------------------------------------------------------

Summary of changes:
 .editorconfig | 25 ++++---------------------
 README.md     | 11 +++++++++++
 2 files changed, 15 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
GEOS