Merge branch 'master' of gitlab-ssh.univ-lille.fr:michael.hauspie/emacs

configuration.org

@@ -321,7 +321,7 @@ Select the font I will use depending on the system
                                         ; Font on MacOS
     (progn
       (setq mh-font-fixed "Fira Code")
-      (setq mh-font-variable "Marianne")
+      (setq mh-font-variable "Sans Serif")
       )
                                         ; Font on Other Systems (Linux actually, I do not use emacs on windows)
   (progn
@@ -544,6 +544,7 @@ org with contributed packages added.
                '("el" . "src emacs-lisp"))
   (set-face-foreground 'org-verbatim "orange1")
   ;; Define a document class that do not use parts and start with chapters for latex export
+  (setq org-image-actual-width nil)
   )
 #+END_SRC
 
@@ -594,6 +595,7 @@ it with =visual-fill-column= to enhance the visual look of the presentation.
 (require 'org-faces)
 
 ;; Function to be called when changing slide
+
 (defun my/org-present-prepare-slide (buffer-name heading)
   ;; Show only top-level headlines
   (org-overview)
@@ -602,7 +604,8 @@ it with =visual-fill-column= to enhance the visual look of the presentation.
   (org-show-entry)
 
   ;; Show only direct subheadings of the slide but don't expand them
-  (org-show-children))
+  (org-show-children)
+  )
 
 ;; What to do when starting/ending a presentation
 (defun my/org-present-start ()
@@ -611,7 +614,7 @@ it with =visual-fill-column= to enhance the visual look of the presentation.
   (display-line-numbers-mode 0)
   (menu-bar-mode 0)
   (scroll-bar-mode 0)  
-
+  (org-display-inline-images)
   ;; Hide emphasis markers on formatted text
   (setq org-hide-emphasis-markers t)
 
@@ -656,10 +659,11 @@ it with =visual-fill-column= to enhance the visual look of the presentation.
 
 (defun my/org-present-end ()
   (visual-fill-column-mode 0)
-  (visual-line-mode 0)
+;  (visual-line-mode 0)
   (display-line-numbers-mode 1)
   (menu-bar-mode 1)
   (scroll-bar-mode 1)
+  (org-remove-inline-images)
   ;; Reset font customizations
   (setq-local face-remapping-alist nil)
   ;; Show emphasis markers on formatted text
@@ -684,10 +688,20 @@ it with =visual-fill-column= to enhance the visual look of the presentation.
 
 (use-package org-present
   :hook (
+         ;; Setup slides environnement when starting a presentation
          (org-present-mode . my/org-present-start)
+         ;; And restore it when leaving
          (org-present-mode-quit . my/org-present-end)
          )
+  ;; Keep using <left> and <right> to move point and uses pgup and pgdown to switch slides
+  :bind (:map org-present-mode-keymap
+              ("<next>" . 'org-present-next)
+              ("<prior>" . 'org-present-prev)
+              ("<left>" . nil)
+              ("<right>" . nil)
+         )
   :init
+  ;; Behavior when switching slides
   (add-hook 'org-present-after-navigate-functions 'my/org-present-prepare-slide)
   )
 (use-package visual-fill-column
@@ -1185,7 +1199,7 @@ cargo install slint-lsp
   #+end_src
 
 
-*** Protocol buffers
+** Protocol buffers
 
 #+begin_src emacs-lisp
 (use-package protobuf-mode)