1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/.hgignore	Sat Dec 17 03:14:48 2016 +0300
     1.3 @@ -0,0 +1,4 @@
     1.4 +syntax: glob
     1.5 +
     1.6 +syntax: regexp
     1.7 +.*\.git\/.*

     2.1 --- a/ckeditor/plugins/crossreference/README.md	Thu Dec 15 18:17:46 2016 +0300
     2.2 +++ b/ckeditor/plugins/crossreference/README.md	Sat Dec 17 03:14:48 2016 +0300
     2.3 @@ -3,6 +3,10 @@
     2.4  
     2.5  Adds cross references links with optional auto-numeration for chapters, images, tables and references. Other types of references can be defined in config.
     2.6  
     2.7 +## Online demo
     2.8 +
     2.9 +Try the plugin demo at <http://indvd00m.com/crossreference/>.
    2.10 +
    2.11  ## Description
    2.12  
    2.13  Two main conceptions - anchor and link to anchor. There are 4 type of references defined by default: chapter, image, table, reference. Example of anchor of type `image` in raw html:
    2.14 @@ -145,7 +149,7 @@
    2.15  | `name` | Type name. | String | Yes |
    2.16  | `anchorTextTemplate` | Template for anchor text. This text will be put in `a` tag. You can use variables in format `${variableName}`. Variables is a properties of an anchor object (see [Example of an anchor object](https://github.com/indvd00m/crossreference#example-of-an-anchor-object) section). | String | No |
    2.17  | `linkTextTemplate` | Template for link text. This text will be put in `a` tag. You can use variables in format `${variableName}`. Variables is a properties of an anchor object (see [Example of an anchor object](https://github.com/indvd00m/crossreference#example-of-an-anchor-object) section). | String | No |
    2.18 -| `numeration` | Definition of type numeration. See [Example of a numeration config](https://github.com/indvd00m/crossreference#example-of-a-numeration-config) section. | Object | No |
    2.19 +| `numeration` | Definition of type numeration. See [Example of a numeration definition](https://github.com/indvd00m/crossreference#example-of-a-numeration-definition) section. | Object | No |
    2.20  | `anchorsProvider` | See [Example of type with anchors provider](https://github.com/indvd00m/crossreference#example-of-type-with-anchors-provider) section. | String 'default' or function | No |
    2.21  | `allowCreateAnchors` | Can user create anchors of this type in anchors dialog. | Boolean | No |
    2.22  | `groupAnchors` | If `true`, anchors can be filtered by group in link dialog. | Boolean | No |
    2.23 @@ -233,7 +237,7 @@
    2.24  
    2.25  ## Installation
    2.26  
    2.27 - 1. Download the plugin.
    2.28 + 1. Download the plugin: https://github.com/indvd00m/crossreference/releases.
    2.29   
    2.30   2. Extract (decompress) the downloaded file into the plugins folder of your
    2.31  	CKEditor installation.
    2.32 @@ -247,7 +251,9 @@
    2.33  See https://github.com/indvd00m/crossreference/issues.
    2.34  
    2.35  ## Icons:
    2.36 - 
    2.37 +
    2.38 +https://icons8.com/web-app/21792/unicast
    2.39 +
    2.40  https://icons8.com/web-app/15117/anchor
    2.41  
    2.42  https://icons8.com/web-app/38051/link

     3.1 --- a/ckeditor/plugins/crossreference/plugin.js	Thu Dec 15 18:17:46 2016 +0300
     3.2 +++ b/ckeditor/plugins/crossreference/plugin.js	Sat Dec 17 03:14:48 2016 +0300
     3.3 @@ -1,7 +1,7 @@
     3.4  CKEDITOR.plugins.add('crossreference', {
     3.5  	lang : [ 'en', 'ru' ],
     3.6  	requires : 'dialog,notification',
     3.7 -	icons : 'crossreference',
     3.8 +	icons : 'crossreference,anchor,link,update',
     3.9  	hidpi : true,
    3.10  	init : function(editor) {
    3.11  		
    3.12 @@ -428,6 +428,7 @@
    3.13  					text = text.replace(/\$\{levelShift\}/g, shift);
    3.14  				}
    3.15  				
    3.16 +				text = text.replace(/\s+/g, ' ');
    3.17  				text = text.trim();
    3.18  				
    3.19  				return text;