Merge branch 'patch-1' of https://github.com/Jmuccigr/reveal.js into dev
This commit is contained in:
		
						commit
						5848a432d9
					
				
					 3 changed files with 24 additions and 6 deletions
				
			
		
							
								
								
									
										18
									
								
								README.md
									
										
									
									
									
								
							
							
						
						
									
										18
									
								
								README.md
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -126,11 +126,15 @@ You can write your content as a separate file and have reveal.js load it at runt
 | 
			
		|||
When used locally, this feature requires that reveal.js [runs from a local web server](#full-setup).  The following example customises all available options:
 | 
			
		||||
 | 
			
		||||
```html
 | 
			
		||||
<section data-markdown="example.md"  
 | 
			
		||||
         data-separator="^\n\n\n"  
 | 
			
		||||
         data-separator-vertical="^\n\n"  
 | 
			
		||||
         data-separator-notes="^Note:"  
 | 
			
		||||
<section data-markdown="example.md"
 | 
			
		||||
         data-separator="^\n\n\n"
 | 
			
		||||
         data-separator-vertical="^\n\n"
 | 
			
		||||
         data-separator-notes="^Note:"
 | 
			
		||||
         data-charset="iso-8859-15">
 | 
			
		||||
    <!--
 | 
			
		||||
        Note that Windows uses `\r\n` instead of `\n` as its linefeed character.
 | 
			
		||||
        For a regex that supports all operating systems, use `\r?\n` instead of `\n`.
 | 
			
		||||
    -->
 | 
			
		||||
</section>
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -272,6 +276,8 @@ Reveal.initialize({
 | 
			
		|||
	hideAddressBar: true,
 | 
			
		||||
 | 
			
		||||
	// Opens links in an iframe preview overlay
 | 
			
		||||
	// Add `data-preview-link` and `data-preview-link="false"` to customise each link
 | 
			
		||||
	// individually
 | 
			
		||||
	previewLinks: false,
 | 
			
		||||
 | 
			
		||||
	// Transition style
 | 
			
		||||
| 
						 | 
				
			
			@ -798,7 +804,9 @@ Reveal.addEventListener( 'fragmenthidden', function( event ) {
 | 
			
		|||
 | 
			
		||||
### Code syntax highlighting
 | 
			
		||||
 | 
			
		||||
By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present, surrounding whitespace is automatically removed.  HTML will be escaped by default. To avoid this, for example if you are using `<mark>` to call out a line of code, add the `data-noescape` attribute to the `<code>` element.
 | 
			
		||||
By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. To enable syntax highlighting, you'll have to load the highlight plugin ([plugin/highlight/highlight.js](plugin/highlight/highlight.js)) and a highlight.js CSS theme (Reveal comes packaged with the zenburn theme: [lib/css/zenburn.css](lib/css/zenburn.css)).
 | 
			
		||||
 | 
			
		||||
Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present, surrounding whitespace is automatically removed.  HTML will be escaped by default. To avoid this, for example if you are using `<mark>` to call out a line of code, add the `data-noescape` attribute to the `<code>` element.
 | 
			
		||||
 | 
			
		||||
```html
 | 
			
		||||
<section>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue