Improve mmm-mode

lisp/init-mmm-mode.el

@@ -1,16 +1,29 @@
 (use-package mmm-mode
-
   :config
-
   (setq mmm-global-mode 'maybe)
   (mmm-add-mode-ext-class nil "\\.php?\\'" 'html-php)
   (mmm-add-mode-ext-class nil "\\.ctp?\\'" 'html-php)
   (set-face-background 'mmm-default-submode-face nil)
-  (mmm-add-classes
-   '((html-php
-      :submode php-mode
-      :front "<\\?\\(php\\)?"
-      :back "\\?>")))
+
+  (mmm-add-group 'html-php
+                 '((html-php-output
+                    :submode php-mode
+                    :face mmm-output-submode-face
+                    :front "<\\?php *echo "
+                    :back "\\(\\?>\\|\\'\\)"
+                    :include-front t
+                    :front-offset 5
+                    :insert ((?e php-echo nil @ "<?php" @ " echo " _ " " @ "?>" @))
+                    )
+                   (html-php-code
+                    :submode php-mode
+                    :face mmm-code-submode-face
+                    :front "<\\?\\(php\\)?"
+                    :back "\\(\\?>\\|\\'\\)"
+                    :insert ((?p php-section nil @ "<?php" @ " " _ " " @ "?>" @)
+                             (?b php-block nil @ "<?php" @ "\n" _ "\n" @ "?>" @))
+                    )))
+
   )
 
 (provide 'init-mmm-mode)