diff options
Diffstat (limited to 'doc/reference/libcrystfel/xml')
| -rw-r--r-- | doc/reference/libcrystfel/xml/coding-standards.xml | 157 | ||||
| -rw-r--r-- | doc/reference/libcrystfel/xml/gtkdocentities.ent.cmake.in | 8 |
2 files changed, 0 insertions, 165 deletions
diff --git a/doc/reference/libcrystfel/xml/coding-standards.xml b/doc/reference/libcrystfel/xml/coding-standards.xml deleted file mode 100644 index d51ba293..00000000 --- a/doc/reference/libcrystfel/xml/coding-standards.xml +++ /dev/null @@ -1,157 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" -[ - <!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'"> -]> -<refentry id="CrystFEL-coding-standards"> -<refmeta> -<refentrytitle role="top_of_page" id="CrystFEL-coding-standards.top_of_page">CrystFEL coding standards</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo> - Coding standards -</refmiscinfo> -</refmeta> -<refnamediv></refnamediv> - - -<refsect1 id="CrystFEL-coding-standards.description" role="desc"> -<title role="desc.title">Summary</title> -<para> -This page documents the coding conventions used within the CrystFEL source code. Read these to help when reading the code or before making modifications destined to be sent upstream. -</para> -</refsect1> - - -<refsect1 id="CrystFEL-coding-standards.license"> -<title>Licensing and copyright</title> -<para> -CrystFEL is distributed under the terms of the GNU General Public License version 3 or higher. Contributions are very welcome provided they also use this license. -</para> -<para> -Whenever you edit a source file, don't forget to update the copyright dates at the top. Add your name and email address if they're not there already. Be sure to add your name to the 'AUTHORS' file in the top level folder, as well. -</para> -</refsect1> - - -<refsect1 id="CrystFEL-coding-standards.formatting"> -<title>Formatting</title> -<para> -<emphasis>Indentation</emphasis> is done with <emphasis>tabs</emphasis> and -<emphasis>alignment</emphasis> is done with spaces. This way, the code looks -neat whatever width you configure your editor to display tabs as. This means, -for example: -</para> -<para> -<programlisting> -struct something -{ - int thing; /* <--- spaces used to align comments */ - int thing_with_longer_name; /* <--- spaces used to align comments */ -} - -void somefunction(int something) -{ - /* <--- Tab character used at the start of this line */ -} -</programlisting> -</para> -<para> -However, code must be <emphasis>strictly</emphasis> wrapped at 80 columns, or -what would be 80 columns if the tabs were displayed as 8 spaces. -If you think you need more width, you're at too many levels of indentation and -need to break things down a bit. There are no exceptions whatsoever. -</para> -<para> -When performing a two or three dimensional iteration, for example over image -coordinates or Miller indices, it is acceptable to indent as follows: -</para> -<para> -<programlisting> -for ( h=-10; h<+10; h++ ) { -for ( k=-10; k<+10; k++ ) { -for ( l=-10; l<+10; l++ ) { - - /* Do stuff */ - -} -} -} -</programlisting> -</para> -</refsect1> - - -<refsect1 id="CrystFEL-coding-standards.brackets"> -<title>Brackets and so on</title> -<para> -Brackets and so on should go like this: -</para> -<para> -<programlisting> -/* Multiple line comments have stars - * down one side */ -void somefunction(int someparam) -{ - /* Single line comments use this style (not //) */ - if ( a < b ) { - /* 'if' statements usually have the opening brace on the same - * line as the condition. */ - } else { - /* 'else's are 'cuddled' */ - } - - if ( some && very && long && condition && that && spans - && two && lines ) - { - /* Opening brace is on a line by itself in the case of a very - * long condition */ - } -} - -/* Comments use proper capitalisation to make things look neat */ -</programlisting> -</para> -<para>'struct' blocks can have the braces like functions or 'if' statements. Usually the former looks nicer if the struct is large.</para> -<para>Parentheses should have spaces after them in 'if' statements, but not in function calls. Function arguments should have spaces after the comma. There should be no space between the function name and the opening bracket. That means:</para> -<para><programlisting> -if ( something ) { - do_something(a, b, c); -} -</programlisting></para> -<para>instead of:</para> -<para><programlisting> -if (something) { - do_something (a,b,c); -} -</programlisting></para> -</refsect1> - - -<refsect1 id="CrystFEL-coding-standards.cleverness"> -<title>Cleverness</title> -<para> -Yes, we all know you can insert a new node into an RB-tree while simultaneously -calculating Pi to 150 decimal places in one line of code. You don't need to -prove it here. As a general rule, if you think you're about to do something clever, <emphasis>don't do it at all</emphasis>. -</para> -</refsect1> - - -<refsect1 id="CrystFEL-coding-standards.commitmessages"> -<title>VCS commit messages</title> -<para>The first line of your commit message should include a one line summary of the changes, in the form "Do XYZ". That is, not "Did XYZ".</para> -<para>Make the minimum possible changes in each commit. Try to really distill your changes down to the bare bones, and keep 'cleaning up' in separate commits. Remember that Git thinks about 'changes' rather than 'versions'.</para> -</refsect1> - - -<refsect1 id="CrystFEL-coding-standards.evilness"> -<title>Evil dictator</title> -<para> -Despite your following all of the above, I will probably still touch up your -code in some places while (or shortly after) integrating it into mainline -CrystFEL. Please try not to take it personally. -</para> -</refsect1> - -</refentry> diff --git a/doc/reference/libcrystfel/xml/gtkdocentities.ent.cmake.in b/doc/reference/libcrystfel/xml/gtkdocentities.ent.cmake.in deleted file mode 100644 index 3fd9b080..00000000 --- a/doc/reference/libcrystfel/xml/gtkdocentities.ent.cmake.in +++ /dev/null @@ -1,8 +0,0 @@ -<!ENTITY package "libcrystfel"> -<!ENTITY package_bugreport "taw@physics.org"> -<!ENTITY package_name "libcrystfel"> -<!ENTITY package_string "crystfel ${PROJECT_VERSION}+${GIT_SHA1}"> -<!ENTITY package_tarname "libcrystfel"> -<!ENTITY package_url "https://www.desy.de/~twhite/crystfel"> -<!ENTITY package_version "${PROJECT_VERSION}+${GIT_SHA1}"> - |