Merge branch 'master' of git://github.com/JHenneberg/BookStack into JHenneberg-master

diff --combined resources/js/services/code.js
index a8cede5f4447787c8721c071c4214a0add48883e,29b1bde8e160c1895884ae2cc06bf52de13221df..21f331a63bd270300399167b2f0152fad0e374e3
--- 1/resources/js/services/code.js
--- 2/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@@ -5,15 -5,17 +5,17 @@@ import Clipboard from "clipboard/dist/c
  import 'codemirror/mode/css/css';
  import 'codemirror/mode/clike/clike';
  import 'codemirror/mode/diff/diff';
+ import 'codemirror/mode/fortran/fortran';
  import 'codemirror/mode/go/go';
+ import 'codemirror/mode/haskell/haskell';
  import 'codemirror/mode/htmlmixed/htmlmixed';
  import 'codemirror/mode/javascript/javascript';
  import 'codemirror/mode/julia/julia';
  import 'codemirror/mode/lua/lua';
- import 'codemirror/mode/haskell/haskell';
  import 'codemirror/mode/markdown/markdown';
  import 'codemirror/mode/mllike/mllike';
  import 'codemirror/mode/nginx/nginx';
+ import 'codemirror/mode/pascal/pascal';
  import 'codemirror/mode/php/php';
  import 'codemirror/mode/powershell/powershell';
  import 'codemirror/mode/properties/properties';
@@@ -25,7 -27,6 +27,6 @@@ import 'codemirror/mode/sql/sql'
  import 'codemirror/mode/toml/toml';
  import 'codemirror/mode/xml/xml';
  import 'codemirror/mode/yaml/yaml';
- import 'codemirror/mode/pascal/pascal';
  
  // Addons
  import 'codemirror/addon/scroll/scrollpastend';
@@@ -43,6 -44,8 +44,8 @@@ const modeMap = 
      'c#': 'text/x-csharp',
      csharp: 'text/x-csharp',
      diff: 'diff',
+     for: 'fortran',
+     fortran: 'fortran',
      go: 'go',
      haskell: 'haskell',
      hs: 'haskell',
@@@ -111,7 -114,7 +114,7 @@@ function highlightWithin(parent) 
  function highlightElem(elem) {
      const innerCodeElem = elem.querySelector('code[class^=language-]');
      elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
 -    const content = elem.textContent;
 +    const content = elem.textContent.trimEnd();
  
      let mode = '';
      if (innerCodeElem !== null) {