ether · SamTV12345 · Jan 16, 2026 · Jan 13, 2026 · Jan 14, 2026 · Jan 16, 2026
diff --git a/assets/pad/pad.templ b/assets/pad/pad.templ
@@ -3,10 +3,33 @@ package pad
 import (
     padModel "github.com/ether/etherpad-go/lib/models"
 	"github.com/ether/etherpad-go/lib/hooks"
-	    "github.com/ether/etherpad-go/lib/settings"
+	"github.com/ether/etherpad-go/lib/settings"
+	pluginTypes "github.com/ether/etherpad-go/lib/models/plugins"
 )
 
-templ EditBar(translations map[string]string) {
+// PluginToolbarButtons rendert die Toolbar-Buttons für alle aktivierten Plugins
+templ PluginToolbarButtons(translations map[string]string, buttonGroups []pluginTypes.ToolbarButtonGroup) {
+    for _, group := range buttonGroups {
+        <li class="separator acl-write"></li>
+        for _, btn := range group.Buttons {
+            <li data-type="button" data-key={btn.Key} data-l10n-id={btn.Title}>
+                <a class={"grouped-" + btn.Group + " ep_align"} data-align={btn.DataAlign} data-l10n-id={btn.Title} title={getTranslation(translations, btn.Title)} aria-label={getTranslation(translations, btn.Title)}>
+                    <button class={"buttonicon " + btn.Icon} data-align={btn.DataAlign} aria-label={getTranslation(translations, btn.Title)}></button>
+                </a>
+            </li>
+        }
+    }
+}
+
+// getTranslation gibt die Übersetzung zurück oder den Schlüssel, wenn nicht vorhanden
+func getTranslation(translations map[string]string, key string) string {
+    if val, ok := translations[key]; ok {
+        return val
+    }
+    return key
+}
+
+templ EditBar(translations map[string]string, buttonGroups []pluginTypes.ToolbarButtonGroup) {
       <div id="editbar" class="toolbar enabledtoolbar" style="display: flex;">
           <div id="toolbar-overlay"></div>
 
@@ -21,6 +44,8 @@ templ EditBar(translations map[string]string) {
           <li data-type="button" data-key="outdent"><a class="grouped-right" title={translations["pad.toolbar.unindent.title"]} aria-label={translations["pad.toolbar.unindent.title"]}><button class=" buttonicon buttonicon-outdent" title={translations["pad.toolbar.unindent.title"]} aria-label={translations["pad.toolbar.unindent.title"]}></button></a></li><li class="separator"></li><li data-type="button" data-key="undo"><a class="grouped-left" title={translations["pad.toolbar.undo.title"]} aria-label={translations["pad.toolbar.undo.title"]}><button class=" buttonicon buttonicon-undo" title={translations["pad.toolbar.undo.title"]} aria-label={translations["pad.toolbar.undo.title"]}></button></a></li>
           <li data-type="button" data-key="redo"><a class="grouped-right" title={translations["pad.toolbar.redo.title"]} aria-label={translations["pad.toolbar.redo.title"]}><button class=" buttonicon buttonicon-redo" title={translations["pad.toolbar.redo.title"]} aria-label={translations["pad.toolbar.redo.title"]}></button></a></li><li class="separator"></li><li data-type="button" data-key="clearauthorship"><a class="" title={translations["pad.toolbar.clearAuthorship.title"]} aria-label={translations["pad.toolbar.clearAuthorship.title"]}><button class=" buttonicon buttonicon-clearauthorship" title={translations["pad.toolbar.clearAuthorship.title"]} aria-label={translations["pad.toolbar.clearAuthorship.title"]}></button></a></li>
 
+          @PluginToolbarButtons(translations, buttonGroups)
+
           </ul>
           <ul class="menu_right" role="toolbar">
 
@@ -323,7 +348,7 @@ templ ChatBox(translations map[string]string) {
 
 
 
-templ PadIndex(pad padModel.Model, jsScript string, translations map[string]string, settings *settings.Settings, availableFonts []string) {
+templ PadIndex(pad padModel.Model, jsScript string, translations map[string]string, settings *settings.Settings, availableFonts []string, buttonGroups []pluginTypes.ToolbarButtonGroup) {
   <html class="pad super-light-toolbar super-light-editor light-background">
   <head>
     <title>{settings.Title}</title>
@@ -334,7 +359,7 @@ templ PadIndex(pad padModel.Model, jsScript string, translations map[string]stri
     <link rel="localizations" type="application/l10n+json" href="/locales.json"/>
   </head>
   <body>
-  @EditBar(translations)
+  @EditBar(translations, buttonGroups)
     <div id="editorcontainerbox" class="flex-layout">
               <div id="editorcontainer" class="editorcontainer"></div>
 

diff --git a/assets/pad/pad_templ.go b/assets/pad/pad_templ.go
diff --git a/lib/api/io/exportHandler.go b/lib/api/io/exportHandler.go
@@ -14,13 +14,18 @@ func GetExport(ctx *fiber.Ctx, exportHandler *io.ExportEtherpad, settings *setti
 	padId := ctx.Params("pad")
 	rev := ctx.Params("rev")
 	exportType := ctx.Params("type")
-	typesToExport := []string{
-		"pdf", "doc", "docx", "txt", "html", "odt", "etherpad",
+	typesToExport := map[string]string{
+		"pdf":      "pdf",
+		"word":     "docx",
+		"txt":      "txt",
+		"html":     "html",
+		"open":     "odt",
+		"etherpad": "etherpad",
 	}
 	// All formats are now supported internally, no external tools needed
-	externalTypes := []string{}
+	var externalTypes []string
 
-	if !slices.Contains(typesToExport, exportType) {
+	if _, ok := typesToExport[exportType]; !ok {
 		return ctx.Status(400).SendString("Invalid export type")
 	}
 
@@ -51,7 +56,7 @@ func GetExport(ctx *fiber.Ctx, exportHandler *io.ExportEtherpad, settings *setti
 
 		logger.Infof("Exporting pad %s revision %s to %s", padId, rev, exportType)
 
-		return exportHandler.DoExport(ctx, padId, readOnlyId, exportType)
+		return exportHandler.DoExport(ctx, padId, readOnlyId, typesToExport[exportType])
 	}
 
 	return ctx.Status(401).SendString("Unauthorized to access this pad")

diff --git a/lib/api/static/init.go b/lib/api/static/init.go
@@ -176,6 +176,8 @@ func Init(store *lib.InitStore) {
 
 	store.C.Get("/pluginfw/plugin-definitions.json", plugins.ReturnPluginResponse)
 
+	store.C.Static("/static/plugins/", "./plugins")
+
 	adminHtml, err := getAdminBody(store.UiAssets, store.RetrievedSettings)
 
 	if err != nil {

diff --git a/lib/hooks/events/exportEvents.go b/lib/hooks/events/exportEvents.go
@@ -0,0 +1,49 @@
+package events
+
+import (
+	"github.com/ether/etherpad-go/lib/apool"
+	"github.com/ether/etherpad-go/lib/models"
+)
+
+// LinePDFForExportContext is the context for the getLinePDFForExport hook
+type LinePDFForExportContext struct {
+	Line        *models.LineModel
+	LineContent *string
+	Apool       *apool.APool
+	AttribLine  *string
+	Text        *string
+	PadId       *string
+	Alignment   *string // "left", "center", "right", "justify"
+}
+
+// LineDocxForExportContext is the context for the getLineDocxForExport hook
+type LineDocxForExportContext struct {
+	Line        *models.LineModel
+	LineContent *string
+	Apool       *apool.APool
+	AttribLine  *string
+	Text        *string
+	PadId       *string
+	Alignment   *string // "left", "center", "right", "justify"
+}
+
+// LineOdtForExportContext is the context for the getLineOdtForExport hook
+type LineOdtForExportContext struct {
+	Line        *models.LineModel
+	LineContent *string
+	Apool       *apool.APool
+	AttribLine  *string
+	Text        *string
+	PadId       *string
+	Alignment   *string // "left", "center", "right", "justify"
+}
+
+// LineTxtForExportContext is the context for the getLineTxtForExport hook
+type LineTxtForExportContext struct {
+	Line        *models.LineModel
+	LineContent *string
+	Apool       *apool.APool
+	AttribLine  *string
+	Text        *string
+	PadId       *string
+}
diff --git a/lib/hooks/events/getLineHTMLForExport.go b/lib/hooks/events/getLineHTMLForExport.go
@@ -0,0 +1,15 @@
+package events
+
+import (
+	"github.com/ether/etherpad-go/lib/apool"
+	"github.com/ether/etherpad-go/lib/models"
+)
+
+type LineHtmlForExportContext struct {
+	Line        *models.LineModel
+	LineContent *string
+	Apool       *apool.APool
+	AttribLine  *string
+	Text        *string
+	PadId       *string
+}
diff --git a/lib/hooks/hook.go b/lib/hooks/hook.go
@@ -14,6 +14,14 @@ func NewHook() Hook {
 	}
 }
 
+func (h *Hook) EnqueueGetLineHtmlForExportHook(ctx func(hookName string, ctx any)) {
+	h.EnqueueHook("getLineHTMLForExport", ctx)
+}
+
+func (h *Hook) ExecuteGetLineHtmlForExportHooks(ctx any) {
+	h.ExecuteHooks("getLineHTMLForExport", ctx)
+}
+
 func (h *Hook) EnqueueHook(key string, ctx func(hookName string, ctx any)) string {
 	var uuid = utils.UUID()
 	var _, ok = h.hooks[key]

diff --git a/lib/io/exportDocx.go b/lib/io/exportDocx.go
@@ -11,18 +11,22 @@ import (
 	"github.com/ether/etherpad-go/lib/apool"
 	"github.com/ether/etherpad-go/lib/author"
 	"github.com/ether/etherpad-go/lib/changeset"
+	"github.com/ether/etherpad-go/lib/hooks"
+	"github.com/ether/etherpad-go/lib/hooks/events"
 	padLib "github.com/ether/etherpad-go/lib/pad"
 )
 
 type ExportDocx struct {
 	padManager    *padLib.Manager
 	authorManager *author.Manager
+	Hooks         *hooks.Hook
 }
 
-func NewExportDocx(padManager *padLib.Manager, authorManager *author.Manager) *ExportDocx {
+func NewExportDocx(padManager *padLib.Manager, authorManager *author.Manager, hooksSystem *hooks.Hook) *ExportDocx {
 	return &ExportDocx{
 		padManager:    padManager,
 		authorManager: authorManager,
+		Hooks:         hooksSystem,
 	}
 }
 
@@ -39,6 +43,7 @@ type docxParagraph struct {
 	segments  []docxTextSegment
 	listType  string // "bullet", "number", or ""
 	listLevel int    // 0-based level
+	alignment string // "left", "center", "right", "justify"
 }
 
 func (e *ExportDocx) GetPadDocxDocument(padId string, optRevNum *int) ([]byte, error) {
@@ -82,6 +87,21 @@ func (e *ExportDocx) GetPadDocxDocument(padId string, optRevNum *int) ([]byte, e
 			return nil, err
 		}
 
+		// Call hook to allow plugins to modify the paragraph (e.g., set alignment)
+		hookContext := &events.LineDocxForExportContext{
+			Apool:      &retrievedPad.Pool,
+			AttribLine: &aline,
+			Text:       &lineText,
+			PadId:      &padId,
+			Alignment:  nil,
+		}
+		e.Hooks.ExecuteHooks("getLineDocxForExport", hookContext)
+
+		// Apply alignment from hook if set
+		if hookContext.Alignment != nil {
+			para.alignment = *hookContext.Alignment
+		}
+
 		paragraphs = append(paragraphs, para)
 	}
 
@@ -127,15 +147,33 @@ func (e *ExportDocx) generateDocumentXML(paragraphs []docxParagraph) string {
 	for _, para := range paragraphs {
 		bodyContent.WriteString("<w:p>")
 
-		// Add paragraph properties for lists
-		if para.listType != "" {
+		// Add paragraph properties for lists and alignment
+		if para.listType != "" || para.alignment != "" {
 			bodyContent.WriteString("<w:pPr>")
-			// numId 1 = bullet, numId 2 = numbered
-			numId := 1
-			if para.listType == "number" {
-				numId = 2
+
+			// Add alignment if set
+			if para.alignment != "" {
+				alignVal := "left"
+				switch para.alignment {
+				case "center":
+					alignVal = "center"
+				case "right":
+					alignVal = "right"
+				case "justify":
+					alignVal = "both"
+				}
+				bodyContent.WriteString(fmt.Sprintf(`<w:jc w:val="%s"/>`, alignVal))
+			}
+
+			// Add list properties
+			if para.listType != "" {
+				// numId 1 = bullet, numId 2 = numbered
+				numId := 1
+				if para.listType == "number" {
+					numId = 2
+				}
+				bodyContent.WriteString(fmt.Sprintf(`<w:numPr><w:ilvl w:val="%d"/><w:numId w:val="%d"/></w:numPr>`, para.listLevel-1, numId))
 			}
-			bodyContent.WriteString(fmt.Sprintf(`<w:numPr><w:ilvl w:val="%d"/><w:numId w:val="%d"/></w:numPr>`, para.listLevel-1, numId))
 			bodyContent.WriteString("</w:pPr>")
 		}
 
@@ -208,7 +246,7 @@ func (e *ExportDocx) parseLineSegments(text string, aline string, padPool *apool
 		return para, nil
 	}
 
-	// Check for list markers
+	// Check for list markers and alignment
 	if aline != "" {
 		ops, err := changeset.DeserializeOps(aline)
 		if err != nil {
@@ -217,19 +255,36 @@ func (e *ExportDocx) parseLineSegments(text string, aline string, padPool *apool
 		if len(*ops) > 0 {
 			op := (*ops)[0]
 			attribs := changeset.FromString(op.Attribs, padPool)
+
+			// Check for align attribute and remove leading * marker
+			alignStr := attribs.Get("align")
+			if alignStr != nil {
+				para.alignment = *alignStr
+				// Remove the leading * marker for aligned lines
+				if len(text) > 0 && text[0] == '*' {
+					text = text[1:]
+					newAline, err := changeset.Subattribution(aline, 1, nil)
+					if err != nil {
+						return para, err
+					}
+					aline = *newAline
+				}
+			}
+
 			listTypeStr := attribs.Get("list")
 			if listTypeStr != nil {
 				// Parse list type and level (e.g., "bullet1", "number2")
 				para.listType, para.listLevel = parseListType(*listTypeStr)
 
-				if len(text) > 0 {
+				// Remove leading * if not already removed by align
+				if len(text) > 0 && text[0] == '*' {
 					text = text[1:]
+					newAline, err := changeset.Subattribution(aline, 1, nil)
+					if err != nil {
+						return para, err
+					}
+					aline = *newAline
 				}
-				newAline, err := changeset.Subattribution(aline, 1, nil)
-				if err != nil {
-					return para, err
-				}
-				aline = *newAline
 			}
 		}
 	}

diff --git a/lib/io/exportEtherpad.go b/lib/io/exportEtherpad.go
@@ -38,9 +38,9 @@ func NewExportEtherpad(hooks *hooks.Hook, padManager *pad.Manager, db db.DataSto
 		PadManager:    padManager,
 		AuthorManager: authorMgr,
 		exportTxt:     &exportTxt,
-		exportDocx:    NewExportDocx(padManager, authorMgr),
-		exportOdt:     NewExportOdt(padManager, authorMgr),
-		exportHtml:    NewExportHtml(padManager, authorMgr),
+		exportDocx:    NewExportDocx(padManager, authorMgr, hooks),
+		exportOdt:     NewExportOdt(padManager, authorMgr, hooks),
+		exportHtml:    NewExportHtml(padManager, authorMgr, hooks),
 		logger:        logger,
 	}
 
@@ -51,6 +51,7 @@ func NewExportEtherpad(hooks *hooks.Hook, padManager *pad.Manager, db db.DataSto
 		exportEtherpad: exportEtherpad,
 		padManager:     padManager,
 		authorManager:  authorMgr,
+		Hooks:          hooks,
 	}
 
 	return exportEtherpad
@@ -209,15 +210,15 @@ func (e *ExportEtherpad) DoExport(ctx *fiber.Ctx, id string, readOnlyId *string,
 			return ctx.Status(500).SendString(err.Error())
 		}
 		return ctx.Send(pdfBytes)
-	case "doc", "docx":
+	case "doc", "docx", "word":
 		ctx.Set("Content-Type", "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
 		docxBytes, err := e.exportDocx.GetPadDocxDocument(id, optRevNum)
 		if err != nil {
 			e.logger.Warnf("Failed to get docx document for id: %s with cause %s", id, err.Error())
 			return ctx.Status(500).SendString(err.Error())
 		}
 		return ctx.Send(docxBytes)
-	case "odt":
+	case "odt", "open":
 		ctx.Set("Content-Type", "application/vnd.oasis.opendocument.text")
 		odtBytes, err := e.exportOdt.GetPadOdtDocument(id, optRevNum)
 		if err != nil {