X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d7ef322bd562485405be95d8812d4ad79ac458fb..6861512e712b1f573102b6114177d0e156f7c160:/apps/toolbar/fixtures/initial_toolbar.yaml?ds=inline

diff --git a/apps/toolbar/fixtures/initial_toolbar.yaml b/apps/toolbar/fixtures/initial_toolbar.yaml
index c2fb84d5..539236f6 100644
--- a/apps/toolbar/fixtures/initial_toolbar.yaml
+++ b/apps/toolbar/fixtures/initial_toolbar.yaml
@@ -1,111 +1,67 @@
--   fields: {name: Akapity, position: 0, slug: akapity}
+-   fields: {name: "Nag\u0142\xF3wki", position: 0, slug: naglowki}
     model: toolbar.buttongroup
-    pk: 14
+    pk: 1
 -   fields: {name: Autokorekta, position: 0, slug: autokorekta}
     model: toolbar.buttongroup
     pk: 2
--   fields: {name: Autotagowanie, position: 0, slug: autotagowanie}
-    model: toolbar.buttongroup
-    pk: 28
--   fields: {name: Bloki, position: 0, slug: bloki}
+-   fields: {name: Mastery, position: 0, slug: mastery}
     model: toolbar.buttongroup
-    pk: 21
+    pk: 11
 -   fields: {name: 'Dramat ', position: 0, slug: dramat}
     model: toolbar.buttongroup
     pk: 12
 -   fields: {name: "Elementy pocz\u0105tkowe", position: 0, slug: elementy-poczatkowe}
     model: toolbar.buttongroup
     pk: 13
--   fields: {name: Mastery, position: 0, slug: mastery}
+-   fields: {name: Akapity, position: 0, slug: akapity}
     model: toolbar.buttongroup
-    pk: 11
--   fields: {name: "Nag\u0142\xF3wki", position: 0, slug: naglowki}
+    pk: 14
+-   fields: {name: Style znakowe, position: 0, slug: style-znakowe}
     model: toolbar.buttongroup
-    pk: 1
+    pk: 15
+-   fields: {name: Separatory, position: 0, slug: separatory}
+    model: toolbar.buttongroup
+    pk: 16
+-   fields: {name: Wersy, position: 0, slug: wersy}
+    model: toolbar.buttongroup
+    pk: 17
+-   fields: {name: Bloki, position: 0, slug: bloki}
+    model: toolbar.buttongroup
+    pk: 21
 -   fields: {name: "Pocz\u0105tek dramatu", position: 0, slug: poczatek-dramatu}
     model: toolbar.buttongroup
     pk: 22
 -   fields: {name: Przypisy, position: 0, slug: przypisy}
     model: toolbar.buttongroup
     pk: 26
--   fields: {name: Separatory, position: 0, slug: separatory}
-    model: toolbar.buttongroup
-    pk: 16
--   fields: {name: Style znakowe, position: 0, slug: style-znakowe}
+-   fields: {name: Autotagowanie, position: 0, slug: autotagowanie}
     model: toolbar.buttongroup
-    pk: 15
+    pk: 28
 -   fields: {name: Uwaga, position: 0, slug: uwaga}
     model: toolbar.buttongroup
     pk: 29
--   fields: {name: Wersy, position: 0, slug: wersy}
-    model: toolbar.buttongroup
-    pk: 17
--   fields:
-        accesskey: a
-        group: [14, 12]
-        label: akapit
-        link: ''
-        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "akap"}'
-        scriptlet: insert_tag
-        slug: akapit
-        tooltip: wstawia akapit
-    model: toolbar.button
-    pk: 39
--   fields:
-        accesskey: ''
-        group: [14]
-        label: akapit cd.
-        link: ''
-        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "akap_cd"}'
-        scriptlet: insert_tag
-        slug: akapit-cd
-        tooltip: "ci\u0105g dalszy akapitu po wewn\u0105trzakapitowym wtr\u0105ceniu"
-    model: toolbar.button
-    pk: 40
--   fields:
-        accesskey: d
-        group: [14]
-        label: akapit dialogowy
-        link: ''
-        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "akap_dialog"}'
-        scriptlet: insert_tag
-        slug: akapit-dialogowy
-        tooltip: wstawia akapit dialogowy
-    model: toolbar.button
-    pk: 41
--   fields:
-        accesskey: ''
-        group: [28]
-        label: akapity
-        link: ''
-        params: '{"tag": "akap"}'
-        scriptlet: autotag
-        slug: akapity
-        tooltip: "autotagowanie akapit\xF3w"
-    model: toolbar.button
-    pk: 97
 -   fields:
         accesskey: ''
-        group: [1]
-        label: akt
+        group: [2]
+        label: ",,\u2026\" na \xAB\u2026\xBB"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_akt"}'
-        scriptlet: insert_tag
-        slug: akt
-        tooltip: ''
+        params: '{"exprs": [[",,", "\u00ab"], ["\"", "\u00bb"]]}'
+        scriptlet: fulltextregexp
+        slug: na-francuskie
+        tooltip: "Zamienia cudzys\u0142owy podw\xF3jne na francuskie"
     model: toolbar.button
-    pk: 14
+    pk: 2
 -   fields:
         accesskey: ''
-        group: [13]
-        label: autor
+        group: [2]
+        label: ",,\u2026\" na \xBB\u2026\xAB"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "autor_utworu"}'
-        scriptlet: insert_tag
-        slug: autor
-        tooltip: ''
+        params: '{"exprs": [[",,", "\u00bb"], ["\"", "\u00ab"]]}'
+        scriptlet: fulltextregexp
+        slug: na-niemieckie
+        tooltip: "Zamienia cudzys\u0142owy podw\xF3jne na niemieckie"
     model: toolbar.button
-    pk: 32
+    pk: 3
 -   fields:
         accesskey: ''
         group: [2]
@@ -119,7 +75,9 @@
             "<akap_dialog>--- "]]}], ["lineregexp", {"exprs": [["^\\s+|\\s+$", ""],
             ["\\s+", " "], ["(,,)\\s+", "$1"], ["\\s+(\")", "$1"], ["([^\\.])(\\s*)</p",
             "$1.$2</p"], ["([\\.:;!\\?])([^\\s\\\\])", "$1 $2"], ["([^\\s])\\s+([\\.:;!\\?])",
-            "$1$2"], ["\\s+,([^,])", ",$1"], ["([^,]),([^\\s\\\\,])", "$1, $2"]]}]]'
+            "$1$2"], ["\\s+,([^,])", ",$1"], ["([^,]),([^\\s\\\\,])", "$1, $2"],
+            ["([A-Za-z])0", "$1o"], ["(\\. )0([A-Za-z])", "$1O$2"], [" 0([A-Za-z])", " o$1"],
+            ["([A-Za-z])1", "$1l"], ["(\\. )1([A-Za-z])", "$1L$2"], [" 1([A-Za-z])", " l$1"]]}]]'
         scriptlet: macro
         slug: basic_correction
         tooltip: "Wykonuj\u0119 podstawow\u0105 korekt\u0119 tekstu."
@@ -127,129 +85,125 @@
     pk: 4
 -   fields:
         accesskey: ''
-        group: [2]
-        label: "zamiana cudzys\u0142ow\xF3w 1"
+        group: [1]
+        label: "cz\u0119\u015B\u0107/ksi\u0119ga"
         link: ''
-        params: '{"exprs": [["\u00ab|\u201e", ",,"], ["\u00bb", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
-            "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
-            ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}'
-        scriptlet: lineregexp
-        slug: cudzyslow-francuski
-        tooltip: "zamiana \" na ,, oraz  \xABa\xBB na ,,a\""
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_czesc"}'
+        scriptlet: insert_tag
+        slug: czesc
+        tooltip: ''
     model: toolbar.button
-    pk: 89
+    pk: 10
 -   fields:
         accesskey: ''
-        group: [2]
-        label: "zamiana cudzys\u0142ow\xF3w 2"
+        group: [1]
+        label: "rozdzia\u0142"
         link: ''
-        params: '{"exprs": [["\u00bb|\u201e", ",,"], ["\u00ab", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
-            "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
-            ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}'
-        scriptlet: lineregexp
-        slug: cudzyslow-niemiecki
-        tooltip: "zamienia \" na ,, oraz \xBBa\xAB na ,,a\""
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_rozdzial"}'
+        scriptlet: insert_tag
+        slug: rozdzial
+        tooltip: ''
     model: toolbar.button
-    pk: 77
+    pk: 11
 -   fields:
         accesskey: ''
         group: [1]
-        label: "cz\u0119\u015B\u0107/ksi\u0119ga"
+        label: "podrozdzia\u0142"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_czesc"}'
+        params: '{"tag": "naglowek_podrozdzial"}'
         scriptlet: insert_tag
-        slug: czesc
+        slug: podrozdzial
         tooltip: ''
     model: toolbar.button
-    pk: 10
+    pk: 12
 -   fields:
         accesskey: ''
-        group: [13, 22]
-        label: dedykacja
+        group: [1]
+        label: "\u015Br\xF3dtytu\u0142"
         link: ''
-        params: '{"tag": "dedykacja"}'
+        params: '{"tag": "srodtytul"}'
         scriptlet: insert_tag
-        slug: dedykacja
+        slug: srodtytul
         tooltip: ''
     model: toolbar.button
-    pk: 74
+    pk: 13
 -   fields:
         accesskey: ''
-        group: [12]
-        label: didaskalia
+        group: [1]
+        label: akt
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "didaskalia"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_akt"}'
         scriptlet: insert_tag
-        slug: didaskalia
+        slug: akt
         tooltip: ''
     model: toolbar.button
-    pk: 62
+    pk: 14
 -   fields:
         accesskey: ''
-        group: [22]
-        label: "didaskalia pocz\u0105tkowe"
+        group: [1]
+        label: scena
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "miejsce_czas"}'
+        params: '{"tag": "naglowek_scena"}'
         scriptlet: insert_tag
-        slug: didaskalia-poczatkowe
-        tooltip: "komentarze wprowadzaj\u0105ce przed tekstem dramatu"
+        slug: scena
+        tooltip: ''
     model: toolbar.button
-    pk: 79
+    pk: 15
 -   fields:
         accesskey: ''
         group: [12]
-        label: didaskalia tekstowe
+        label: "nag\u0142\xF3wek kwestii"
         link: ''
-        params: '{"tag": "didask_tekst"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_osoba"}'
         scriptlet: insert_tag
-        slug: didaskalia-tekstowe
-        tooltip: "didaskalia umieszczone w obr\u0119bie innego tekstu"
+        slug: naglowek-kwestii
+        tooltip: "nag\u0142\xF3wek kwestii - nazwa osoby"
     model: toolbar.button
-    pk: 63
+    pk: 16
 -   fields:
         accesskey: ''
-        group: [21]
-        label: "d\u0142ugi cytat"
+        group: [11]
+        label: "tag g\u0142\xF3wny"
         link: ''
-        params: '{"tag": "dlugi_cytat"}'
+        params: '{"tag": "utwor"}'
         scriptlet: insert_tag
-        slug: dlugi-cytat
-        tooltip: "d\u0142ugi cytat wyr\xF3\u017Cniony sk\u0142adem"
+        slug: tag-glowny
+        tooltip: ''
     model: toolbar.button
-    pk: 42
+    pk: 17
 -   fields:
         accesskey: ''
-        group: [21]
-        label: "d\u0142ugi cyt. poet."
+        group: [11]
+        label: opowiadanie
         link: ''
-        params: '{"tag": "poezja_cyt"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "opowiadanie"}'
         scriptlet: insert_tag
-        slug: dlugi-cyt-poet
-        tooltip: "d\u0142ugi cytat wierszowany wyr\xF3\u017Cniony sk\u0142adem"
+        slug: opowiadanie
+        tooltip: ''
     model: toolbar.button
-    pk: 67
+    pk: 18
 -   fields:
         accesskey: ''
         group: [11]
-        label: dramat wiersz.
+        label: "powie\u015B\u0107"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "dramat_wierszowany_l"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "powiesc"}'
         scriptlet: insert_tag
-        slug: dramat-wiersz
+        slug: powiesc
         tooltip: ''
     model: toolbar.button
-    pk: 20
+    pk: 19
 -   fields:
         accesskey: ''
         group: [11]
-        label: "dramat wiersz./w. \u0142am"
+        label: dramat wiersz.
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "dramat_wierszowany_lp"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "dramat_wierszowany_l"}'
         scriptlet: insert_tag
-        slug: dramat-wiersz-w-lam
-        tooltip: "dramat wierszowany o zw\u0119\u017Conej szeroko\u015Bci \u0142amu"
+        slug: dramat-wiersz
+        tooltip: ''
     model: toolbar.button
-    pk: 22
+    pk: 20
 -   fields:
         accesskey: ''
         group: [11]
@@ -263,317 +217,312 @@
     pk: 21
 -   fields:
         accesskey: ''
-        group: [13]
-        label: "dzie\u0142o nadrz\u0119dne"
+        group: [11]
+        label: "dramat wiersz./w. \u0142am"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "dzielo_nadrzedne"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "dramat_wierszowany_lp"}'
         scriptlet: insert_tag
-        slug: dzielo-nadrzedne
-        tooltip: ''
+        slug: dramat-wiersz-w-lam
+        tooltip: "dramat wierszowany o zw\u0119\u017Conej szeroko\u015Bci \u0142amu"
     model: toolbar.button
-    pk: 38
+    pk: 22
 -   fields:
         accesskey: ''
-        group: []
-        label: extra
+        group: [11]
+        label: liryka
         link: ''
-        params: '{"tag": "extra"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "liryka_l"}'
         scriptlet: insert_tag
-        slug: extra
-        tooltip: "uwagi dotycz\u0105ce sk\u0142adu"
+        slug: liryka
+        tooltip: ''
     model: toolbar.button
-    pk: 96
+    pk: 23
 -   fields:
         accesskey: ''
-        group: []
-        label: Wydrukuj
-        link: print/html
-        params: '[]'
+        group: [11]
+        label: "liryka/w. \u0142am"
+        link: ''
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "liryka_lp"}'
         scriptlet: insert_tag
-        slug: htmleditor-print
-        tooltip: ''
+        slug: liryka-w-lam
+        tooltip: "utw\xF3r liryczny o zw\u0119\u017Conej szeroko\u015Bci \u0142amu"
     model: toolbar.button
-    pk: 87
+    pk: 24
 -   fields:
-        accesskey: k
-        group: [12]
-        label: kwestia
+        accesskey: ''
+        group: [11]
+        label: wywiad
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 1, "tag": "kwestia"}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "wywiad"}'
         scriptlet: insert_tag
-        slug: kwestia
-        tooltip: "wstawia kwesti\u0119"
+        slug: wywiad
+        tooltip: ''
     model: toolbar.button
-    pk: 82
+    pk: 25
 -   fields:
         accesskey: ''
-        group: [12]
-        label: kwestioakapit
+        group: [13]
+        label: autor
         link: ''
-        params: '[["insert_tag", {"tag": "akap"}], ["insert_tag", {"padding_top":
-            1, "padding_bottom": 1, "tag": "kwestia"}]]'
-        scriptlet: macro
-        slug: kwestioakapit
+        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "autor_utworu"}'
+        scriptlet: insert_tag
+        slug: autor
         tooltip: ''
     model: toolbar.button
-    pk: 101
+    pk: 32
 -   fields:
         accesskey: ''
-        group: [12]
-        label: kwestiostrofa
+        group: [13]
+        label: nazwa utworu
         link: ''
-        params: '[["insert_stanza", {"tag": "strofa"}], ["insert_tag", {"padding_top":
-            1, "padding_bottom": 1, "tag": "kwestia"}]]'
-        scriptlet: macro
-        slug: kwestiostrofa
+        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "nazwa_utworu"}'
+        scriptlet: insert_tag
+        slug: nazwa-utworu
         tooltip: ''
     model: toolbar.button
-    pk: 102
+    pk: 33
 -   fields:
         accesskey: ''
-        group: [11]
-        label: liryka
+        group: [1]
+        label: "podtytu\u0142"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "liryka_l"}'
+        params: '{"tag": "podtytul"}'
         scriptlet: insert_tag
-        slug: liryka
+        slug: podtytul
         tooltip: ''
     model: toolbar.button
-    pk: 23
+    pk: 34
 -   fields:
-        accesskey: ''
-        group: [11]
-        label: "liryka/w. \u0142am"
+        accesskey: v
+        group: [13]
+        label: nota
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "liryka_lp"}'
+        params: '{"tag": "nota"}'
         scriptlet: insert_tag
-        slug: liryka-w-lam
-        tooltip: "utw\xF3r liryczny o zw\u0119\u017Conej szeroko\u015Bci \u0142amu"
+        slug: nota
+        tooltip: ''
     model: toolbar.button
-    pk: 24
+    pk: 35
 -   fields:
         accesskey: ''
-        group: [22]
-        label: "lista os\xF3b"
+        group: [13, 22]
+        label: motto podpis
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "lista_osob"}'
+        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "motto_podpis"}'
         scriptlet: insert_tag
-        slug: lista-osob
-        tooltip: "lista os\xF3b poprzedzaj\u0105ca tekst dramatu"
+        slug: motto-podpis
+        tooltip: ''
     model: toolbar.button
-    pk: 93
+    pk: 37
 -   fields:
         accesskey: ''
-        group: [22]
-        label: 'typ osoby '
+        group: [13]
+        label: "dzie\u0142o nadrz\u0119dne"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 1, "tag": "lista_osoba", "attrs":
-            {"typ": ""}}'
+        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "dzielo_nadrzedne"}'
         scriptlet: insert_tag
-        slug: lista-osob-pole
-        tooltip: osoby z takim samym opisem
+        slug: dzielo-nadrzedne
+        tooltip: ''
     model: toolbar.button
-    pk: 78
+    pk: 38
 -   fields:
-        accesskey: ''
-        group: [15]
-        label: matemat.
+        accesskey: a
+        group: [14, 12]
+        label: akapit
         link: ''
-        params: '{"tag": "mat"}'
+        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "akap"}'
         scriptlet: insert_tag
-        slug: matemat
-        tooltip: "wyra\u017Cenia matematyczne lub zmienne symboliczne"
+        slug: akapit
+        tooltip: wstawia akapit
     model: toolbar.button
-    pk: 47
+    pk: 39
 -   fields:
         accesskey: ''
-        group: [13, 22]
-        label: motto
+        group: [14]
+        label: akapit cd.
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "motto"}'
+        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "akap_cd"}'
         scriptlet: insert_tag
-        slug: motto
-        tooltip: ''
+        slug: akapit-cd
+        tooltip: "ci\u0105g dalszy akapitu po wewn\u0105trzakapitowym wtr\u0105ceniu"
     model: toolbar.button
-    pk: 75
+    pk: 40
 -   fields:
-        accesskey: ''
-        group: [13, 22]
-        label: motto podpis
+        accesskey: d
+        group: [14]
+        label: akapit dialogowy
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "motto_podpis"}'
+        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "akap_dialog"}'
         scriptlet: insert_tag
-        slug: motto-podpis
-        tooltip: ''
+        slug: akapit-dialogowy
+        tooltip: wstawia akapit dialogowy
     model: toolbar.button
-    pk: 37
+    pk: 41
 -   fields:
         accesskey: ''
-        group: [2]
-        label: ",,\u2026\" na \xAB\u2026\xBB"
+        group: [21]
+        label: "d\u0142ugi cytat"
         link: ''
-        params: '{"exprs": [[",,", "\u00ab"], ["\"", "\u00bb"]]}'
-        scriptlet: fulltextregexp
-        slug: na-francuskie
-        tooltip: "Zamienia cudzys\u0142owy podw\xF3jne na francuskie"
+        params: '{"tag": "dlugi_cytat"}'
+        scriptlet: insert_tag
+        slug: dlugi-cytat
+        tooltip: "d\u0142ugi cytat wyr\xF3\u017Cniony sk\u0142adem"
     model: toolbar.button
-    pk: 2
+    pk: 42
 -   fields:
-        accesskey: ''
-        group: [28]
-        label: "nag\u0142. dramatu"
+        accesskey: f
+        group: [12, 15]
+        label: "wyr\xF3\u017Cnienie"
         link: ''
-        params: '{"exprs": [["^AKT(\\s\\w*)$", "<naglowek_akt>AKT$1</naglowek_akt>"],
-            ["^SCENA(\\s\\w*)$", "<naglowek_scena>SCENA$1</naglowek_scena>"], ["([A-Z\u0104\u0106\u0118\u0141\u0143\u00d3\u015a\u017b\u0179]{2}[A-Z\u0104\u0106\u0118\u0141\u0143\u00d3\u015a\u017b\u0179\\s]+)$",
-            "<naglowek_osoba>$1</naglowek_osoba>"]]}'
-        scriptlet: lineregexp
-        slug: nagl-dramatu
-        tooltip: "autotagowanie akt\xF3w, scen, nag\u0142\xF3wk\xF3w os\xF3b"
+        params: '{"tag": "wyroznienie"}'
+        scriptlet: insert_tag
+        slug: wyroznienie
+        tooltip: "wyr\xF3\u017Cnienie autorskie"
     model: toolbar.button
-    pk: 103
+    pk: 44
 -   fields:
         accesskey: ''
-        group: [12]
-        label: "nag\u0142\xF3wek kwestii"
+        group: [15]
+        label: "tytu\u0142 dzie\u0142a typ 1"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_osoba"}'
+        params: '{"tag": "tytul_dziela", "attrs": {"typ": "1"}}'
         scriptlet: insert_tag
-        slug: naglowek-kwestii
-        tooltip: "nag\u0142\xF3wek kwestii - nazwa osoby"
+        slug: tytul-dziela-typ
+        tooltip: "tytu\u0142 dzie\u0142a w cytowanym tytule dzie\u0142a"
     model: toolbar.button
-    pk: 16
+    pk: 45
 -   fields:
-        accesskey: ''
-        group: [22]
-        label: "nag\u0142\xF3wek listy"
+        accesskey: e
+        group: [15]
+        label: "s\u0142owo obce"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "naglowek_listy"}'
+        params: '{"tag": "slowo_obce"}'
         scriptlet: insert_tag
-        slug: naglowek-listy
-        tooltip: "nag\u0142\xF3wek listy os\xF3b"
+        slug: slowo-obce
+        tooltip: "frazy w j\u0119zykach innych ni\u017C polski/definiendum w przypisie"
     model: toolbar.button
-    pk: 94
+    pk: 46
 -   fields:
         accesskey: ''
-        group: [2]
-        label: ",,\u2026\" na \xBB\u2026\xAB"
+        group: [15]
+        label: matemat.
         link: ''
-        params: '{"exprs": [[",,", "\u00bb"], ["\"", "\u00ab"]]}'
-        scriptlet: fulltextregexp
-        slug: na-niemieckie
-        tooltip: "Zamienia cudzys\u0142owy podw\xF3jne na niemieckie"
+        params: '{"tag": "mat"}'
+        scriptlet: insert_tag
+        slug: matemat
+        tooltip: "wyra\u017Cenia matematyczne lub zmienne symboliczne"
     model: toolbar.button
-    pk: 3
+    pk: 47
 -   fields:
         accesskey: ''
-        group: [13]
-        label: nazwa utworu
+        group: [15]
+        label: www
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "nazwa_utworu"}'
+        params: '{"tag": "www"}'
         scriptlet: insert_tag
-        slug: nazwa-utworu
+        slug: www
         tooltip: ''
     model: toolbar.button
-    pk: 33
+    pk: 48
 -   fields:
         accesskey: ''
-        group: [13]
-        label: nota
+        group: [29]
+        label: uwaga
         link: ''
-        params: '{"tag": "nota"}'
+        params: '{"tag": "uwaga"}'
         scriptlet: insert_tag
-        slug: nota
-        tooltip: ''
+        slug: uwaga
+        tooltip: 'uwagi redaktorsko-korektorskie '
     model: toolbar.button
-    pk: 35
+    pk: 51
 -   fields:
         accesskey: ''
-        group: [13]
-        label: nota red.
+        group: [16]
+        label: "\u015Bwiat\u0142o"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "nota_red"}'
+        params: '{"nocontent": "true", "tag": "sekcja_swiatlo"}'
         scriptlet: insert_tag
-        slug: nota-red
-        tooltip: nota redakcyjna
+        slug: sep-swiatlo
+        tooltip: "\u015Bwiat\u0142o rozdzielaj\u0105ce sekcje tekstu"
     model: toolbar.button
-    pk: 104
+    pk: 53
 -   fields:
         accesskey: ''
-        group: [11]
-        label: opowiadanie
+        group: [16]
+        label: asterysk
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "opowiadanie"}'
+        params: '{"nocontent": "true", "tag": "sekcja_asterysk"}'
         scriptlet: insert_tag
-        slug: opowiadanie
-        tooltip: ''
+        slug: sep-asterysk
+        tooltip: rozdzielenie partii tekstu asteryskiem
     model: toolbar.button
-    pk: 18
+    pk: 54
 -   fields:
-        accesskey: b
-        group: [12]
-        label: osoba
+        accesskey: ''
+        group: [16]
+        label: linia
         link: ''
-        params: '{"tag": "osoba"}'
+        params: '{"nocontent": "true", "tag": "separator_linia"}'
         scriptlet: insert_tag
-        slug: osoba
-        tooltip: "wstawia nazw\u0119 osoby w didaskaliach"
+        slug: sep-linia
+        tooltip: "rozdzielenie partii tekstu pozioma lini\u0105"
     model: toolbar.button
-    pk: 64
+    pk: 55
 -   fields:
         accesskey: ''
-        group: [22]
-        label: osoba na liscie
+        group: [16]
+        label: "zast\u0119pnik wersu"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 1, "tag": "lista_osoba"}'
+        params: '{"tag": "zastepnik_wersu"}'
         scriptlet: insert_tag
-        slug: osoba-na-liscie
-        tooltip: "nazwa osoby na liscie os\xF3b"
+        slug: zastepnik-wersu
+        tooltip: wykropkowanie wersu
     model: toolbar.button
-    pk: 95
+    pk: 56
 -   fields:
         accesskey: ''
-        group: [1]
-        label: "podrozdzia\u0142"
+        group: [12]
+        label: didaskalia
         link: ''
-        params: '{"tag": "naglowek_podrozdzial"}'
+        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "didaskalia"}'
         scriptlet: insert_tag
-        slug: podrozdzial
+        slug: didaskalia
         tooltip: ''
     model: toolbar.button
-    pk: 12
+    pk: 62
 -   fields:
         accesskey: ''
-        group: [1]
-        label: "podtytu\u0142"
+        group: [12]
+        label: didaskalia tekstowe
         link: ''
-        params: '{"tag": "podtytul"}'
+        params: '{"tag": "didask_tekst"}'
         scriptlet: insert_tag
-        slug: podtytul
-        tooltip: ''
+        slug: didaskalia-tekstowe
+        tooltip: "didaskalia umieszczone w obr\u0119bie innego tekstu"
     model: toolbar.button
-    pk: 34
+    pk: 63
 -   fields:
-        accesskey: ''
-        group: [11]
-        label: "powie\u015B\u0107"
+        accesskey: b
+        group: [12]
+        label: osoba
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "powiesc"}'
+        params: '{"tag": "osoba"}'
         scriptlet: insert_tag
-        slug: powiesc
-        tooltip: ''
+        slug: osoba
+        tooltip: "wstawia nazw\u0119 osoby w didaskaliach"
     model: toolbar.button
-    pk: 19
+    pk: 64
 -   fields:
         accesskey: ''
-        group: []
-        label: Wydrukuj
-        link: print/xml
-        params: '[]'
+        group: [21]
+        label: "d\u0142ugi cyt. poet."
+        link: ''
+        params: '{"tag": "poezja_cyt"}'
         scriptlet: insert_tag
-        slug: print-xml
-        tooltip: ''
+        slug: dlugi-cyt-poet
+        tooltip: "d\u0142ugi cytat wierszowany wyr\xF3\u017Cniony sk\u0142adem"
     model: toolbar.button
-    pk: 86
+    pk: 67
 -   fields:
         accesskey: ''
         group: [26]
@@ -588,14 +537,14 @@
 -   fields:
         accesskey: ''
         group: [26]
-        label: przypis edytorski
+        label: "przypis t\u0142umacza"
         link: ''
-        params: '{"tag": "pe"}'
+        params: '{"tag": "pt"}'
         scriptlet: insert_tag
-        slug: przypis-edytorski
+        slug: przypis-tlumacza
         tooltip: ''
     model: toolbar.button
-    pk: 71
+    pk: 69
 -   fields:
         accesskey: ''
         group: [26]
@@ -610,102 +559,105 @@
 -   fields:
         accesskey: ''
         group: [26]
-        label: "przypis t\u0142umacza"
+        label: przypis edytorski
         link: ''
-        params: '{"tag": "pt"}'
+        params: '{"tag": "pe"}'
         scriptlet: insert_tag
-        slug: przypis-tlumacza
+        slug: przypis-edytorski
         tooltip: ''
     model: toolbar.button
-    pk: 69
+    pk: 71
 -   fields:
         accesskey: ''
-        group: [1]
-        label: "rozdzia\u0142"
+        group: [21]
+        label: wywiad pytanie
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "naglowek_rozdzial"}'
+        params: '{"tag": "wywiad_pyt"}'
         scriptlet: insert_tag
-        slug: rozdzial
+        slug: wywiad-pytanie
         tooltip: ''
     model: toolbar.button
-    pk: 11
+    pk: 72
 -   fields:
         accesskey: ''
-        group: [1]
-        label: scena
+        group: [21]
+        label: "wywiad odpowied\u017A"
         link: ''
-        params: '{"tag": "naglowek_scena"}'
+        params: '{"tag": "wywiad_odp"}'
         scriptlet: insert_tag
-        slug: scena
+        slug: wywiad-odpowiedz
         tooltip: ''
     model: toolbar.button
-    pk: 15
+    pk: 73
 -   fields:
         accesskey: ''
-        group: [16]
-        label: asterysk
+        group: [13, 22]
+        label: dedykacja
         link: ''
-        params: '{"nocontent": "true", "tag": "sekcja_asterysk"}'
+        params: '{"tag": "dedykacja"}'
         scriptlet: insert_tag
-        slug: sep-asterysk
-        tooltip: rozdzielenie partii tekstu asteryskiem
+        slug: dedykacja
+        tooltip: ''
     model: toolbar.button
-    pk: 54
+    pk: 74
 -   fields:
         accesskey: ''
-        group: [16]
-        label: linia
+        group: [13, 22]
+        label: motto
         link: ''
-        params: '{"nocontent": "true", "tag": "separator_linia"}'
+        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "motto"}'
         scriptlet: insert_tag
-        slug: sep-linia
-        tooltip: "rozdzielenie partii tekstu pozioma lini\u0105"
+        slug: motto
+        tooltip: ''
     model: toolbar.button
-    pk: 55
+    pk: 75
 -   fields:
-        accesskey: ''
-        group: [16]
-        label: "\u015Bwiat\u0142o"
+        accesskey: u
+        group: [2]
+        label: "A<sup>\u2193</sup>"
         link: ''
-        params: '{"nocontent": "true", "tag": "sekcja_swiatlo"}'
-        scriptlet: insert_tag
-        slug: sep-swiatlo
-        tooltip: "\u015Bwiat\u0142o rozdzielaj\u0105ce sekcje tekstu"
+        params: '[]'
+        scriptlet: lowercase
+        slug: tolowercase
+        tooltip: "Zamie\u0144 wielkie litery na ma\u0142e"
     model: toolbar.button
-    pk: 53
+    pk: 76
 -   fields:
-        accesskey: e
-        group: [15]
-        label: "s\u0142owo obce"
+        accesskey: ''
+        group: [2]
+        label: "zamiana cudzys\u0142ow\xF3w 2"
         link: ''
-        params: '{"tag": "slowo_obce"}'
-        scriptlet: insert_tag
-        slug: slowo-obce
-        tooltip: "frazy w j\u0119zykach innych ni\u017C polski/definiendum w przypisie"
+        params: '{"exprs": [["\u00bb|\u201e", ",,"], ["\u00ab", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
+            "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
+            ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}'
+        scriptlet: lineregexp
+        slug: cudzyslow-niemiecki
+        tooltip: "zamienia \" na ,, oraz \xBBa\xAB na ,,a\""
     model: toolbar.button
-    pk: 46
+    pk: 77
 -   fields:
         accesskey: ''
-        group: [2]
-        label: slug
+        group: [22]
+        label: 'typ osoby '
         link: ''
-        params: '[]'
-        scriptlet: slugify
-        slug: slug
-        tooltip: slugifikacja
+        params: '{"padding_top": 1, "padding_bottom": 1, "tag": "lista_osoba", "attrs":
+            {"typ": ""}}'
+        scriptlet: insert_tag
+        slug: lista-osob-pole
+        tooltip: osoby z takim samym opisem
     model: toolbar.button
-    pk: 105
+    pk: 78
 -   fields:
         accesskey: ''
-        group: [1]
-        label: "\u015Br\xF3dtytu\u0142"
+        group: [22]
+        label: "didaskalia pocz\u0105tkowe"
         link: ''
-        params: '{"tag": "srodtytul"}'
+        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "miejsce_czas"}'
         scriptlet: insert_tag
-        slug: srodtytul
-        tooltip: ''
+        slug: didaskalia-poczatkowe
+        tooltip: "komentarze wprowadzaj\u0105ce przed tekstem dramatu"
     model: toolbar.button
-    pk: 13
+    pk: 79
 -   fields:
         accesskey: s
         group: [12, 17]
@@ -718,60 +670,84 @@
     model: toolbar.button
     pk: 81
 -   fields:
-        accesskey: ''
-        group: [28]
-        label: strofy
+        accesskey: k
+        group: [12]
+        label: kwestia
         link: ''
-        params: '{"tag": "strofa"}'
-        scriptlet: autotag
-        slug: strofy
-        tooltip: autotagowanie strof
+        params: '{"padding_top": 1, "padding_bottom": 1, "tag": "kwestia"}'
+        scriptlet: insert_tag
+        slug: kwestia
+        tooltip: "wstawia kwesti\u0119"
     model: toolbar.button
-    pk: 99
+    pk: 82
 -   fields:
-        accesskey: ''
-        group: [11]
-        label: "tag g\u0142\xF3wny"
+        accesskey: w
+        group: [12, 17]
+        label: "wers mocno wci\u0119ty"
         link: ''
-        params: '{"tag": "utwor"}'
+        params: '{"tag": "wers_wciety", "attrs": {"typ": ""}}'
         scriptlet: insert_tag
-        slug: tag-glowny
-        tooltip: ''
+        slug: wers-mocno-wciety
+        tooltip: "argumenty wersu wci\u0119tego: od 2 do 6"
     model: toolbar.button
-    pk: 17
+    pk: 84
 -   fields:
-        accesskey: u
-        group: [2]
-        label: "A<sup>\u2193</sup>"
+        accesskey: ''
+        group: [12, 17]
+        label: wers cd.
         link: ''
+        params: '{"tag": "wers_cd"}'
+        scriptlet: insert_tag
+        slug: wers-cd
+        tooltip: "cz\u0119\u015B\u0107 wersu przeniesiona do innego wiersza"
+    model: toolbar.button
+    pk: 85
+-   fields:
+        accesskey: ''
+        group: []
+        label: Wydrukuj
+        link: print/xml
         params: '[]'
-        scriptlet: lowercase
-        slug: tolowercase
-        tooltip: "Zamie\u0144 wielkie litery na ma\u0142e"
+        scriptlet: insert_tag
+        slug: print-xml
+        tooltip: ''
     model: toolbar.button
-    pk: 76
+    pk: 86
 -   fields:
         accesskey: ''
-        group: [28]
-        label: trim begin
-        link: ''
-        params: '{"text": "\n<!-- TRIM_BEGIN -->\n"}'
-        scriptlet: insert_text
-        slug: trim-begin
-        tooltip: "Wstawia pocz\u0105tkowy znacznik ci\u0119cia cz\u0119\u015Bci"
+        group: []
+        label: Wydrukuj
+        link: print/html
+        params: '[]'
+        scriptlet: insert_tag
+        slug: htmleditor-print
+        tooltip: ''
     model: toolbar.button
-    pk: 106
+    pk: 87
 -   fields:
         accesskey: ''
-        group: [28]
-        label: trim end
+        group: [2]
+        label: "zamiana cudzys\u0142ow\xF3w 1"
         link: ''
-        params: '{"text": "\n<!-- TRIM_END -->\n"}'
-        scriptlet: insert_text
-        slug: trim-end
-        tooltip: "Wstawia ko\u0144cowy znacznik ci\u0119cia cz\u0119\u015Bci"
+        params: '{"exprs": [["\u00ab|\u201e", ",,"], ["\u00bb", "\""], ["([^=])\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
+            "$1,,$2"], ["^\"([\u0104\u0118\u00d3\u0141\u017b\u0179\u0106\u0143\u0105\u017c\u017a\u015b\u0144\u00f3\u0142\u0107\\w])",
+            ",,$1"], ["(,,)\\s+|\\s+(\")", "$1"]]}'
+        scriptlet: lineregexp
+        slug: cudzyslow-francuski
+        tooltip: "zamiana \" na ,, oraz  \xABa\xBB na ,,a\""
+    model: toolbar.button
+    pk: 89
+-   fields:
+        accesskey: q
+        group: [12, 17]
+        label: "wers wci\u0119ty"
+        link: ''
+        params: '{"tag": "wers_wciety", "attrs": {"typ": "1"}}'
+        scriptlet: insert_tag
+        slug: wers-wciety
+        tooltip: "wstawia wers wci\u0119ty"
     model: toolbar.button
-    pk: 107
+    pk: 91
 -   fields:
         accesskey: r
         group: [15]
@@ -785,70 +761,70 @@
     pk: 92
 -   fields:
         accesskey: ''
-        group: [15]
-        label: "tytu\u0142 dzie\u0142a typ 1"
+        group: [22]
+        label: "lista os\xF3b"
         link: ''
-        params: '{"tag": "tytul_dziela", "attrs": {"typ": "1"}}'
+        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "lista_osob"}'
         scriptlet: insert_tag
-        slug: tytul-dziela-typ
-        tooltip: "tytu\u0142 dzie\u0142a w cytowanym tytule dzie\u0142a"
+        slug: lista-osob
+        tooltip: "lista os\xF3b poprzedzaj\u0105ca tekst dramatu"
     model: toolbar.button
-    pk: 45
+    pk: 93
 -   fields:
         accesskey: ''
-        group: [29]
-        label: uwaga
+        group: [22]
+        label: "nag\u0142\xF3wek listy"
         link: ''
-        params: '{"tag": "uwaga"}'
+        params: '{"padding_top": 1, "padding_bottom": 2, "tag": "naglowek_listy"}'
         scriptlet: insert_tag
-        slug: uwaga
-        tooltip: 'uwagi redaktorsko-korektorskie '
+        slug: naglowek-listy
+        tooltip: "nag\u0142\xF3wek listy os\xF3b"
     model: toolbar.button
-    pk: 51
+    pk: 94
 -   fields:
         accesskey: ''
-        group: [14, 17]
-        label: wers akap.
+        group: [22]
+        label: osoba na liscie
         link: ''
-        params: '{"tag": "wers_akap"}'
+        params: '{"padding_top": 1, "padding_bottom": 1, "tag": "lista_osoba"}'
         scriptlet: insert_tag
-        slug: wers-akap
-        tooltip: "wers rozpoczynaj\u0105cy si\u0119 wci\u0119ciem akapitowym"
+        slug: osoba-na-liscie
+        tooltip: "nazwa osoby na liscie os\xF3b"
     model: toolbar.button
-    pk: 83
+    pk: 95
 -   fields:
         accesskey: ''
-        group: [12, 17]
-        label: wers cd.
+        group: []
+        label: extra
         link: ''
-        params: '{"tag": "wers_cd"}'
+        params: '{"tag": "extra"}'
         scriptlet: insert_tag
-        slug: wers-cd
-        tooltip: "cz\u0119\u015B\u0107 wersu przeniesiona do innego wiersza"
+        slug: extra
+        tooltip: "uwagi dotycz\u0105ce sk\u0142adu"
     model: toolbar.button
-    pk: 85
+    pk: 96
 -   fields:
-        accesskey: w
-        group: [12, 17]
-        label: "wers mocno wci\u0119ty"
+        accesskey: ''
+        group: [28]
+        label: akapity
         link: ''
-        params: '{"tag": "wers_wciety", "attrs": {"typ": ""}}'
-        scriptlet: insert_tag
-        slug: wers-mocno-wciety
-        tooltip: "argumenty wersu wci\u0119tego: od 2 do 6"
+        params: '{"tag": "akap"}'
+        scriptlet: autotag
+        slug: akapity
+        tooltip: "autotagowanie akapit\xF3w"
     model: toolbar.button
-    pk: 84
+    pk: 97
 -   fields:
-        accesskey: q
-        group: [12, 17]
-        label: "wers wci\u0119ty"
+        accesskey: ''
+        group: [28]
+        label: strofy
         link: ''
-        params: '{"tag": "wers_wciety", "attrs": {"typ": "1"}}'
-        scriptlet: insert_tag
-        slug: wers-wciety
-        tooltip: "wstawia wers wci\u0119ty"
+        params: '{"tag": "strofa"}'
+        scriptlet: autotag
+        slug: strofy
+        tooltip: autotagowanie strof
     model: toolbar.button
-    pk: 91
+    pk: 99
 -   fields:
         accesskey: ''
         group: [28]
@@ -861,75 +837,120 @@
     model: toolbar.button
     pk: 100
 -   fields:
-        accesskey: ''
-        group: [15]
-        label: www
+        accesskey: g
+        group: [12]
+        label: kwestioakapit
         link: ''
-        params: '{"tag": "www"}'
-        scriptlet: insert_tag
-        slug: www
+        params: '[["insert_tag", {"tag": "akap"}], ["insert_tag", {"padding_top":
+            1, "padding_bottom": 1, "tag": "kwestia"}]]'
+        scriptlet: macro
+        slug: kwestioakapit
         tooltip: ''
     model: toolbar.button
-    pk: 48
+    pk: 101
 -   fields:
-        accesskey: f
-        group: [12, 15]
-        label: "wyr\xF3\u017Cnienie"
+        accesskey: ''
+        group: [12]
+        label: kwestiostrofa
         link: ''
-        params: '{"tag": "wyroznienie"}'
-        scriptlet: insert_tag
-        slug: wyroznienie
-        tooltip: "wyr\xF3\u017Cnienie autorskie"
+        params: '[["insert_stanza", {"tag": "strofa"}], ["insert_tag", {"padding_top":
+            1, "padding_bottom": 1, "tag": "kwestia"}]]'
+        scriptlet: macro
+        slug: kwestiostrofa
+        tooltip: ''
     model: toolbar.button
-    pk: 44
+    pk: 102
 -   fields:
         accesskey: ''
-        group: [11]
-        label: wywiad
+        group: [28]
+        label: "nag\u0142. dramatu"
         link: ''
-        params: '{"padding_top": 1, "padding_bottom": 4, "tag": "wywiad"}'
+        params: '{"exprs": [["^AKT(\\s\\w*)$", "<naglowek_akt>AKT$1</naglowek_akt>"],
+            ["^SCENA(\\s\\w*)$", "<naglowek_scena>SCENA$1</naglowek_scena>"], ["([A-Z\u0104\u0106\u0118\u0141\u0143\u00d3\u015a\u017b\u0179]{2}[A-Z\u0104\u0106\u0118\u0141\u0143\u00d3\u015a\u017b\u0179\\s]+)$",
+            "<naglowek_osoba>$1</naglowek_osoba>"]]}'
+        scriptlet: lineregexp
+        slug: nagl-dramatu
+        tooltip: "autotagowanie akt\xF3w, scen, nag\u0142\xF3wk\xF3w os\xF3b"
+    model: toolbar.button
+    pk: 103
+-   fields:
+        accesskey: x
+        group: [13]
+        label: nota red.
+        link: ''
+        params: '{"padding_top": 1, "padding_bottom": 3, "tag": "nota_red"}'
         scriptlet: insert_tag
-        slug: wywiad
-        tooltip: ''
+        slug: nota-red
+        tooltip: nota redakcyjna
     model: toolbar.button
-    pk: 25
+    pk: 104
 -   fields:
         accesskey: ''
-        group: [21]
-        label: "wywiad odpowied\u017A"
+        group: [2]
+        label: slug
         link: ''
-        params: '{"tag": "wywiad_odp"}'
-        scriptlet: insert_tag
-        slug: wywiad-odpowiedz
-        tooltip: ''
+        params: '[]'
+        scriptlet: slugify
+        slug: slug
+        tooltip: slugifikacja
     model: toolbar.button
-    pk: 73
+    pk: 105
 -   fields:
         accesskey: ''
-        group: [21]
-        label: wywiad pytanie
+        group: [11]
+        label: trim begin
         link: ''
-        params: '{"tag": "wywiad_pyt"}'
-        scriptlet: insert_tag
-        slug: wywiad-pytanie
-        tooltip: ''
+        params: '{"text": "\n<!-- TRIM_BEGIN -->\n"}'
+        scriptlet: insert_text
+        slug: trim-begin
+        tooltip: "Wstawia pocz\u0105tkowy znacznik ci\u0119cia cz\u0119\u015Bci"
     model: toolbar.button
-    pk: 72
+    pk: 106
 -   fields:
         accesskey: ''
-        group: [16]
-        label: "zast\u0119pnik wersu"
+        group: [11]
+        label: trim end
         link: ''
-        params: '{"tag": "zastepnik_wersu"}'
-        scriptlet: insert_tag
-        slug: zastepnik-wersu
-        tooltip: wykropkowanie wersu
+        params: '{"text": "\n<!-- TRIM_END -->\n"}'
+        scriptlet: insert_text
+        slug: trim-end
+        tooltip: "Wstawia ko\u0144cowy znacznik ci\u0119cia cz\u0119\u015Bci"
     model: toolbar.button
-    pk: 56
--   fields: {code: "$(params).each(function() {\n    $.log(this[0], this[1]);\n  \
-            \  editor.callScriptlet(this[0], panel, this[1]);\n\n});"}
+    pk: 107
+-   fields: {code: '-'}
     model: toolbar.scriptlet
-    pk: macro
+    pk: autotag
+-   fields: {code: "editor.showPopup('generic-info', 'Przetwarzanie zaznaczonego tekstu...',\
+            \ '', -1);\n$.log(editor, panel, params);\nvar cm = panel.texteditor;\n\
+            var exprs = $.map(params.exprs, function(expr) {\n    var opts = \"mg\"\
+            ;\n    if(expr.length > 2)\n        opts = expr[2];\n\n    return {rx:\
+            \ new RegExp(expr[0], opts), repl: expr[1]};\n});\n\nvar partial = true;\n\
+            var text = cm.selection();\n\nif(!text) {\n    var cpos = cm.cursorPosition();\n\
+            \    cpos.line = cm.lineNumber(cpos.line)\n    cm.selectLines(cm.firstLine(),\
+            \ 0, cm.lastLine(), 0);\n\n    text = cm.selection();\n    partial = false;\n\
+            }\n\nvar original = text;\n$(exprs).each(function() { \n    text = text.replace(this.rx,\
+            \ this.repl);\n});\n\nif( original != text) \n{    \n    cm.replaceSelection(text);\n\
+            \    panel.fireEvent('contentChanged');\n    editor.showPopup('generic-yes',\
+            \ 'Zmieniono tekst' );\n    editor.advancePopupQueue();\n}\nelse {\n \
+            \   editor.showPopup('generic-info', 'Brak zmian w tek\u015Bcie.');\n\
+            \    editor.advancePopupQueue();\n}\n\nif(!partial) {\n    cm.selectLines(\
+            \ cm.nthLine(cpos.line), cpos.character );\n}"}
+    model: toolbar.scriptlet
+    pk: fulltextregexp
+-   fields: {code: "var texteditor = panel.texteditor;\r\nvar text = texteditor.selection();\r\
+            \n\r\nif(text) {\r\n  var verses = text.split('\\n');\r\n  var text =\
+            \ ''; var buf = ''; var ebuf = '';\r\n  var first = true;\r\n\r\n  for(var\
+            \ i=0;  i < verses.length; i++) {\r\n    verse = verses[i].replace(/^\\\
+            s+/, \"\").replace(/\\s+$/, \"\");   \r\n    if(verse) {\r\n      text\
+            \ += (buf ? buf + '/\\n' : '') + ebuf;\r\n      buf = (first ? '<strofa>\\\
+            n' : '') + verses[i];\r\n      ebuf = '';\r\n      first = false;\r\n\
+            \    } else {    \r\n      ebuf += '\\n' + verses[i];\r\n    }\r\n  };\r\
+            \n  text = text + buf + '\\n</strofa>' + ebuf; \r\n  texteditor.replaceSelection(text);\r\
+            \n}\r\n\r\nif (!text) {\r\n    var pos = texteditor.cursorPosition();\r\
+            \n    texteditor.selectLines(pos.line, pos.character + 6 + 2);\r\n}\r\n\
+            \r\n\r\n\r\n\r\n\r\n\r\n\r\npanel.fireEvent('contentChanged');"}
+    model: toolbar.scriptlet
+    pk: insert_stanza
 -   fields: {code: "var texteditor = panel.texteditor;\nvar text = texteditor.selection();\n\
             var start_tag = '<'+params.tag;\nfor (var attr in params.attrs) {\n  \
             \  start_tag += ' '+attr+'=\"' + params.attrs[attr] + '\"';\n};\nstart_tag\
@@ -947,6 +968,9 @@
             \ + 2);\n}\n\npanel.fireEvent('contentChanged');"}
     model: toolbar.scriptlet
     pk: insert_tag
+-   fields: {code: '-'}
+    model: toolbar.scriptlet
+    pk: insert_text
 -   fields: {code: "editor.showPopup('generic-info', 'Przetwarzanie zaznaczonego tekstu...',\
             \ '', -1);\n\nvar cm = panel.texteditor;\nvar exprs = $.map(params.exprs,\
             \ function(expr) {\n\n    var opts = \"g\";\n\n    if(expr.length > 2)\n\
@@ -967,29 +991,6 @@
             \ cm.selectLines( cm.nthLine(cpos.line), cpos.character )"}
     model: toolbar.scriptlet
     pk: lineregexp
--   fields: {code: '-'}
-    model: toolbar.scriptlet
-    pk: autotag
--   fields: {code: "editor.showPopup('generic-info', 'Przetwarzanie zaznaczonego tekstu...',\
-            \ '', -1);\n$.log(editor, panel, params);\nvar cm = panel.texteditor;\n\
-            var exprs = $.map(params.exprs, function(expr) {\n    var opts = \"mg\"\
-            ;\n    if(expr.length > 2)\n        opts = expr[2];\n\n    return {rx:\
-            \ new RegExp(expr[0], opts), repl: expr[1]};\n});\n\nvar partial = true;\n\
-            var text = cm.selection();\n\nif(!text) {\n    var cpos = cm.cursorPosition();\n\
-            \    cpos.line = cm.lineNumber(cpos.line)\n    cm.selectLines(cm.firstLine(),\
-            \ 0, cm.lastLine(), 0);\n\n    text = cm.selection();\n    partial = false;\n\
-            }\n\nvar original = text;\n$(exprs).each(function() { \n    text = text.replace(this.rx,\
-            \ this.repl);\n});\n\nif( original != text) \n{    \n    cm.replaceSelection(text);\n\
-            \    panel.fireEvent('contentChanged');\n    editor.showPopup('generic-yes',\
-            \ 'Zmieniono tekst' );\n    editor.advancePopupQueue();\n}\nelse {\n \
-            \   editor.showPopup('generic-info', 'Brak zmian w tek\u015Bcie.');\n\
-            \    editor.advancePopupQueue();\n}\n\nif(!partial) {\n    cm.selectLines(\
-            \ cm.nthLine(cpos.line), cpos.character );\n}"}
-    model: toolbar.scriptlet
-    pk: fulltextregexp
--   fields: {code: '-'}
-    model: toolbar.scriptlet
-    pk: insert_text
 -   fields: {code: "var cm = panel.texteditor;\r\nvar text = cm.selection();\r\n\r\
             \nif(!text) return;\r\nvar repl = '';\r\nvar lcase = text.toLowerCase();\r\
             \nvar ucase = text.toUpperCase();\r\n\r\nif(lcase == text) repl = ucase;\
@@ -1002,20 +1003,10 @@
             \n};"}
     model: toolbar.scriptlet
     pk: lowercase
--   fields: {code: "var texteditor = panel.texteditor;\r\nvar text = texteditor.selection();\r\
-            \n\r\nif(text) {\r\n  var verses = text.split('\\n');\r\n  var text =\
-            \ ''; var buf = ''; var ebuf = '';\r\n  var first = true;\r\n\r\n  for(var\
-            \ i=0;  i < verses.length; i++) {\r\n    verse = verses[i].replace(/^\\\
-            s+/, \"\").replace(/\\s+$/, \"\");   \r\n    if(verse) {\r\n      text\
-            \ += (buf ? buf + '/\\n' : '') + ebuf;\r\n      buf = (first ? '<strofa>\\\
-            n' : '') + verses[i];\r\n      ebuf = '';\r\n      first = false;\r\n\
-            \    } else {    \r\n      ebuf += '\\n' + verses[i];\r\n    }\r\n  };\r\
-            \n  text = text + buf + '\\n</strofa>' + ebuf; \r\n  texteditor.replaceSelection(text);\r\
-            \n}\r\n\r\nif (!text) {\r\n    var pos = texteditor.cursorPosition();\r\
-            \n    texteditor.selectLines(pos.line, pos.character + 6 + 2);\r\n}\r\n\
-            \r\n\r\n\r\n\r\n\r\n\r\n\r\npanel.fireEvent('contentChanged');"}
+-   fields: {code: "$(params).each(function() {\n    $.log(this[0], this[1]);\n  \
+            \  editor.callScriptlet(this[0], panel, this[1]);\n\n});"}
     model: toolbar.scriptlet
-    pk: insert_stanza
+    pk: macro
 -   fields: {code: '-'}
     model: toolbar.scriptlet
     pk: slugify