Merge branch 'master' into savelyev

RELEASING.md

@@ -8,44 +8,49 @@ Creating a release comprises the following tasks:
 
 - Check the list of not linked concepts - with new concept sets some of these could
   be ticked off!
-```shell script
-concepticon notlinked
-```
+  ```shell script
+  concepticon notlinked
+  ```
 
 - Run [bibtool](http://www.gerd-neugebauer.de/software/TeX/BibTool/en/) on the references 
 to normalize them for import:
-```shell script
-bibtool -r concepticondata/references/bibtool.rsc -o concepticondata/references/references.bib concepticondata/references/references.bib
-```
+  ```shell script
+  bibtool -r concepticondata/references/bibtool.rsc -o concepticondata/references/references.bib concepticondata/references/references.bib
+  ```
 
 - Recreate the statistics pages:
-```shell script
-concepticon stats
-```
+  ```shell script
+  concepticon stats
+  ```
 
 - Recreate and push the linking data:
-```shell script
-concepticon make_linkdata
-```
+  ```shell script
+  concepticon make_linkdata
+  ```
 
 - Make sure all changes are pushed and merged into the `master` branch.
 - Make sure all tests pass, and also address warnings about missing PDFs (see [handling source PDFs](#upload_sources))
-```shell script
-concepticon test
-```
+  ```shell script
+  concepticon test
+  ```
 
-- Make sure the data in `master` can be imported into the web app `clld/concepticon`.
-- Make sure all tests pass for the web app.
+- Make sure the data in `master` can be imported into the web app `clld/concepticon` by running
+  ```shell script
+  concepticon-app init --dry-run
+  ```
+  and observing that all tests pass for the web app.
 
 - Commit the updates for this version and push updated data:
-```
-git tag -a v<version> -m"release <version>"
-git push origin --tags
-```
+  ```shell script
+  git commit -a -m"<version> release"
+  git tag -a v<version> -m"release <version>"
+  git push origin
+  git push origin --tags
+  ```
 
 - Draft a release via GitHub UI 
   - picking the correct tag, e.g. `v1.1.0`
-  - using `CLLD Concepticon 1.0.0` as the title
+  - using `CLLD Concepticon <version>` as the title
   - and giving the citation obtained running `concepticon citation` as release description.
 
 - After a while, check on https://zenodo.org for the DOI assigned to the release
@@ -54,6 +59,9 @@ git push origin --tags
 - Create a [new milestone](https://github.com/concepticon/concepticon-data/milestones) to
   link to issues for the next version.
 
+- Publish the release at https://concepticon.clld.org following the instructions
+  at https://github.com/clld/concepticon/blob/master/RELEASING.md
+
 
 <a name="upload_sources"> </a>
 ## Handling source PDFs

concepticondata/conceptlists.tsv

@@ -197,7 +197,7 @@ Woll-2010-301	Woll, Bencie and Crasborn, Onno and van der Kooij, Els, and Mesch,
 Matisoff-1978-200	Matisoff, James A.	1978		200	areal	English	Sino-Tibetan		Matisoff2000, Matisoff1978	Matisoff2000, Matisoff1978	This list was first proposed in 1978, but our current source is based on a reprinted version of the list published in 2000. The list was intended as a counterpart to «global» concept lists which were proposed by authors such as M. Swadesh ([1955](:bib:Swadesh1955)) as general-purpose lists which ideally would be applicable to all languages of the world. In contrast, Matisoff proposed his list as being «Culturally and Linguistically Meaningful for Southeast Asia» (CALMSEA), but not necessarily for other language areas.	363-368,284-296	
 Benedict-1976-100	Benedict, Paul K.	1976		100	basic	English	Sino-Tibetan		Benedict1976	Benedict1976	This list was used to arrive at an initial subgrouping of the Sino-Tibetan languages. As a result, Chinese was identified as the first outgroup. The list is without doubt based on [Swadeshs list of 100 items](:ref:Swadesh-1955-100), yet the concept labels differ to some extent. Benedict mentions another source (Burlin 1971) upon which the list is based, but this source could so far not been inspected.	168	
 SatterthwaitePhillips-2011-50	Satterthwaite-Phillips, Damian	2011		50	ultra-stable	English	Sino-Tibetan languages		SatterthwaitePhillips2011	SatterthwaitePhillips2011	This list contains the 50 most stable concepts out of [a base list of 423 concepts](:ref:SatterthwaitePhillips-2011-423). The author uses an automated approach to infer potentially cognate words, and then determines the number of inferred reflexes per syllable.	161-164	
-Huber-1992-375	Huber, Randall Q. and Reed, Robert B.	1992		368	questionnaire	Spanish, English	South American		Huber1992	Huber1992	A large concept list originally compiled for the study of South American languages. Although it is supposed to contain 375 items, it has, in fact, 368 entries. The missing 7 entries cannot be found in the book and must have been accidentally omitted during printing.	375-381	
+Huber-1992-375	Huber, Randall Q. and Reed, Robert B.	1992		367	questionnaire	Spanish, English	South American		Huber1992	Huber1992	A large concept list originally compiled for the study of South American languages. Although it is supposed to contain 375 items, it has, in fact, 367 entries. The missing 8 entries cannot be found in the book and must have been accidentally omitted during printing.	375-381	
 Mann-2004-500	Mann, Noel Walter	2004		500	areal	English	South-East Asia	http://li.payap.ac.th/images/stories/survey/Mann%20(2004)%20(MSEA%20Comparative%20Wordlist).pdf	Mann2004	Mann2004	This list is a comparative conceptlist in which 500 concepts are compared to their distribution across different concept lists, including the [100](:ref:Swadesh-1955-100) and [200 item lists](:ref:Swadesh-1952-200) by Swadesh (1955, 1952), the [200 item list by Matisoff (1978)](:ref:Matisoff-1978-200), and the [281](:ref:SIL-1980-281) and [436 item lists](:ref:SIL-2002-436) by the [SIL](http://sil.org) project.	Mar 13	
 Mann-2004-118	Mann, Noel Walter	2004		118	specific	English	South-East Asian	http://li.payap.ac.th/images/stories/survey/Mann%20(2004)%20(MSEA%20Comparative%20Wordlist).pdf	Mann2004	Mann2004	This is an excerpt of a longer comparative wordlist proposed in [Mann (2004)](:ref:Mann-2004-500). In this list, only those basic concepts are listed which occur in at least three different word lists, namely the combined lists of Swadesh [(1952, 1955)](:ref:Mann-2004-209), as proposed by Mann himself, the [210-item list by Matisoff (1978)](:ref:Mann-2004-210), also in the analysis of Mann, and the [Southeast Asia 436 wordlist](:ref:SIL-2002-436). Note, that, although this list should actually be based on the larger comparative list of 500 items in the same reference, the concept labels diverge in part from the ones used in the larger list. Thus, instead of «cut», we find «cut (with knife)», and «cloud» is labelled as «cloud (white)».	13-16	
 SIL-1980-281	Summer Institute of Linguistics	1980		281	questionnaire,areal	English	South-East Asian Languages		SIL1980	SIL1980	This list of 281 items represents an early list of concepts considered to be useful for research on South-East Asian languages. The list itself was apparently created by building on earlier lists by Swadesh ([1950](:ref:Swadesh-1950-215) and [1955](:ref:Swadesh-1955-100)), and later extended by adding more items, but it is essentially based on the lists of Samarin (1967), especially the longer [list of 218 items](:ref:Samarin-1967-218). The list indicates items which belong to Swadesh's original 100 item list by adding an asterisk to the number, and items belonging to Swadesh's larger list of 215 items by adding the symbol «=» to the number. In our representation, these symbols are preserved, but were placed in an additional column labelled SWADESH.