md2ms

diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
new file mode 100644 (file)
index 0000000..b32befc
--- /dev/null
+++ b/ftplugin/awk.vim
@@ -0,0 +1,2 @@
+set tabstop=2
+set shiftwidth=2

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 72cf807c8ef7c3c606fca991fbf535d69f8f95bd..259907fa7b98be23d5da70a659d2a25346fee973 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,3 +1,6 @@
+set tabstop=2
+set shiftwidth=2
+

 " splits
 map <leader>T :80<space>vsp<space>$TODO<CR>
 map <leader>C :vsp<space>$CALENDAR<CR>
 " splits
 map <leader>T :80<space>vsp<space>$TODO<CR>
 map <leader>C :vsp<space>$CALENDAR<CR>


@@ -9,11 +12,9 @@ nmap <C-D> :.s/\-<space>\[<space>\]/\-<space>\[x\]/<enter>
 nmap <C-S> :.s/\-<space>\[<space>\]/\-<space>\[\-\]/<enter>
 nmap <C-C> :.s/\-<space>\[.*\]/\-<space>\[<space>\]/<enter>
 
 nmap <C-S> :.s/\-<space>\[<space>\]/\-<space>\[\-\]/<enter>
 nmap <C-C> :.s/\-<space>\[.*\]/\-<space>\[<space>\]/<enter>
 

-set tabstop=2
-set shiftwidth=2
-

 xnoremap <silent> <leader>sc :<C-u>lua require('setclass').analyze_selection()<CR>
 
 lua << EOF
 require("plugins.render-markdown")
 xnoremap <silent> <leader>sc :<C-u>lua require('setclass').analyze_selection()<CR>
 
 lua << EOF
 require("plugins.render-markdown")

+vim.g.markdown_recommended_style = 0

 EOF
 EOF

diff --git a/init.vim b/init.vim
index d92cb51baaff600f174903f02144cc955a25c155..c55731c80a14f29bac43136189d46f851d7b1605 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -32,8 +32,9 @@ set noruler
 set nowrap
 set laststatus=0
 set noshowcmd
 set nowrap
 set laststatus=0
 set noshowcmd

-set tabstop=4
-set shiftwidth=4
+set tabstop=2
+set shiftwidth=2
+set softtabstop=2

 set expandtab
 set mouse=
 
 set expandtab
 set mouse=
 

diff --git a/lua/plugins/render-markdown.lua b/lua/plugins/render-markdown.lua
index 5fa22abe766a5857f06781976e0c693955da80e6..aa6e0fd83df865263411df26e04ba550a06fd5ae 100644 (file)
--- a/lua/plugins/render-markdown.lua
+++ b/lua/plugins/render-markdown.lua
@@ -26,7 +26,7 @@ require('render-markdown').setup({
         position = 'overlay',
         -- Added to the sign column if enabled.
         -- Output is evaluated by `cycle(value, context.level)`.
         position = 'overlay',
         -- Added to the sign column if enabled.
         -- Output is evaluated by `cycle(value, context.level)`.

-        signs = { '' },
+        signs = { '#' },

         -- Width of the heading background.
         -- | block | width of the heading text |
         -- | full  | full width of the window  |
         -- Width of the heading background.
         -- | block | width of the heading text |
         -- | full  | full width of the window  |


@@ -131,12 +131,6 @@ require('render-markdown').setup({
         -- | highlight | optional highlight for 'icon', uses fallback highlight if empty |
         custom = {
             web = { pattern = '^http', icon = '🌐 ' },
         -- | highlight | optional highlight for 'icon', uses fallback highlight if empty |
         custom = {
             web = { pattern = '^http', icon = '🌐 ' },

-            github = { pattern = 'github%.com', icon = ' ' },
-            gitlab = { pattern = 'gitlab%.com', icon = ' ' },
-            stackoverflow = { pattern = 'stackoverflow%.com', icon = ' ' },
-            wikipedia = { pattern = 'wikipedia%.org', icon = ' ' },
-            youtube = { pattern = 'youtube%.com', icon = ' ' },
-            youtub = { pattern = 'youtu%.be', icon = ' ' },

         },
     },
     callout = {
         },
     },
     callout = {


@@ -150,31 +144,31 @@ require('render-markdown').setup({
 
         note      = { raw = '[!NOTE]',      rendered = '❕ Note',      highlight = 'RenderMarkdownInfo'},
         tip       = { raw = '[!TIP]',       rendered = '💡 Tip',       highlight = 'RenderMarkdownSuccess'},
 
         note      = { raw = '[!NOTE]',      rendered = '❕ Note',      highlight = 'RenderMarkdownInfo'},
         tip       = { raw = '[!TIP]',       rendered = '💡 Tip',       highlight = 'RenderMarkdownSuccess'},

-        important = { raw = '[!IMPORTANT]', rendered = 'â\80¼ï¸\8f Important', highlight = 'RenderMarkdownHint'},
+        important = { raw = '[!IMPORTANT]', rendered = 'â\9d\95 Important', highlight = 'RenderMarkdownHint'},

         warning   = { raw = '[!WARNING]',   rendered = '⚠️ Warning',   highlight = 'RenderMarkdownWarn'},
         caution   = { raw = '[!CAUTION]',   rendered = '🛑 Caution',   highlight = 'RenderMarkdownError'},
         warning   = { raw = '[!WARNING]',   rendered = '⚠️ Warning',   highlight = 'RenderMarkdownWarn'},
         caution   = { raw = '[!CAUTION]',   rendered = '🛑 Caution',   highlight = 'RenderMarkdownError'},

-        abstract  = { raw = '[!ABSTRACT]',  rendered = ' Abstract',  highlight = 'RenderMarkdownInfo'},
+        abstract  = { raw = '[!ABSTRACT]',  rendered = '📃 Abstract',  highlight = 'RenderMarkdownInfo'},

         summary   = { raw = '[!SUMMARY]',   rendered = '📃 Summary',   highlight = 'RenderMarkdownInfo'},
         summary   = { raw = '[!SUMMARY]',   rendered = '📃 Summary',   highlight = 'RenderMarkdownInfo'},

-        tldr      = { raw = '[!TLDR]',      rendered = ' Tldr',      highlight = 'RenderMarkdownInfo'},
+        tldr      = { raw = '[!TLDR]',      rendered = '📃 Tldr',      highlight = 'RenderMarkdownInfo'},

         info      = { raw = '[!INFO]',      rendered = '🔎 Info',      highlight = 'RenderMarkdownInfo'},
         todo      = { raw = '[!TODO]',      rendered = '☑️ Todo',      highlight = 'RenderMarkdownInfo'},
         info      = { raw = '[!INFO]',      rendered = '🔎 Info',      highlight = 'RenderMarkdownInfo'},
         todo      = { raw = '[!TODO]',      rendered = '☑️ Todo',      highlight = 'RenderMarkdownInfo'},

-        hint      = { raw = '[!HINT]',      rendered = ' Hint',      highlight = 'RenderMarkdownSuccess'},
+        hint      = { raw = '[!HINT]',      rendered = '💡 Hint',      highlight = 'RenderMarkdownSuccess'},

         success   = { raw = '[!SUCCESS]',   rendered = '🎯 Success',   highlight = 'RenderMarkdownSuccess'},
         check     = { raw = '[!CHECK]',     rendered = '✔️ Check',     highlight = 'RenderMarkdownSuccess'},
         success   = { raw = '[!SUCCESS]',   rendered = '🎯 Success',   highlight = 'RenderMarkdownSuccess'},
         check     = { raw = '[!CHECK]',     rendered = '✔️ Check',     highlight = 'RenderMarkdownSuccess'},

-        done      = { raw = '[!DONE]',      rendered = ' Done',      highlight = 'RenderMarkdownSuccess'},
+        done      = { raw = '[!DONE]',      rendered = '✔️ Done',      highlight = 'RenderMarkdownSuccess'},

         question  = { raw = '[!QUESTION]',  rendered = '❔ Question',  highlight = 'RenderMarkdownWarn'},
         question  = { raw = '[!QUESTION]',  rendered = '❔ Question',  highlight = 'RenderMarkdownWarn'},

-        help      = { raw = '[!HELP]',      rendered = ' Help',      highlight = 'RenderMarkdownWarn'},
+        help      = { raw = '[!HELP]',      rendered = '❔ Help',      highlight = 'RenderMarkdownWarn'},

         faq       = { raw = '[!FAQ]',       rendered = '❔ Faq',       highlight = 'RenderMarkdownWarn'},
         faq       = { raw = '[!FAQ]',       rendered = '❔ Faq',       highlight = 'RenderMarkdownWarn'},

-        attention = { raw = '[!ATTENTION]', rendered = ' Attention', highlight = 'RenderMarkdownWarn'},
-        failure   = { raw = '[!FAILURE]',   rendered = ' Failure',   highlight = 'RenderMarkdownError'},
-        fail      = { raw = '[!FAIL]',      rendered = ' Fail',      highlight = 'RenderMarkdownError'},
-        missing   = { raw = '[!MISSING]',   rendered = ' Missing',   highlight = 'RenderMarkdownError'},
-        danger    = { raw = '[!DANGER]',    rendered = ' Danger',    highlight = 'RenderMarkdownError'},
-        error     = { raw = '[!ERROR]',     rendered = ' Error',     highlight = 'RenderMarkdownError'},
-        bug       = { raw = '[!BUG]',       rendered = ' Bug',       highlight = 'RenderMarkdownError'},
-        example   = { raw = '[!EXAMPLE]',   rendered = ' Example',   highlight = 'RenderMarkdownHint' },
-        quote     = { raw = '[!QUOTE]',     rendered = ' Quote',     highlight = 'RenderMarkdownQuote'},
-        cite      = { raw = '[!CITE]',      rendered = ' Cite',      highlight = 'RenderMarkdownQuote'},
+        attention = { raw = '[!ATTENTION]', rendered = '⚠️ Attention', highlight = 'RenderMarkdownWarn'},
+        failure   = { raw = '[!FAILURE]',   rendered = '❗ Failure',   highlight = 'RenderMarkdownError'},
+        fail      = { raw = '[!FAIL]',      rendered = '❗ Fail',      highlight = 'RenderMarkdownError'},
+        missing   = { raw = '[!MISSING]',   rendered = '🪹 Missing',   highlight = 'RenderMarkdownError'},
+        danger    = { raw = '[!DANGER]',    rendered = '❗ Danger',    highlight = 'RenderMarkdownError'},
+        error     = { raw = '[!ERROR]',     rendered = '❓ Error',     highlight = 'RenderMarkdownError'},
+        bug       = { raw = '[!BUG]',       rendered = '🐛 Bug',       highlight = 'RenderMarkdownError'},
+        example   = { raw = '[!EXAMPLE]',   rendered = '❕ Example',   highlight = 'RenderMarkdownHint' },
+        quote     = { raw = '[!QUOTE]',     rendered = '🖋️ Quote',     highlight = 'RenderMarkdownQuote'},
+        cite      = { raw = '[!CITE]',      rendered = '📚 Cite',      highlight = 'RenderMarkdownQuote'},

         bibliography  = { raw = '[!BIB]',      rendered = '📚 Bibliography',      highlight = 'RenderMarkdownQuote'},
     },
     checkbox = {
         bibliography  = { raw = '[!BIB]',      rendered = '📚 Bibliography',      highlight = 'RenderMarkdownQuote'},
     },
     checkbox = {


@@ -183,17 +177,17 @@ require('render-markdown').setup({
         bullet = false,
         right_pad = 1,
         unchecked = {
         bullet = false,
         right_pad = 1,
         unchecked = {

-            icon = ' ',
+            icon = '⚪',

             highlight = 'RenderMarkdownUnchecked',
             scope_highlight = nil,
         },
         checked = {
             highlight = 'RenderMarkdownUnchecked',
             scope_highlight = nil,
         },
         checked = {

-            icon = ' ',
+            icon = '🟢',

             highlight = 'RenderMarkdownChecked',
             scope_highlight = nil,
         },
         custom = {
             highlight = 'RenderMarkdownChecked',
             scope_highlight = nil,
         },
         custom = {

-            todo = { raw = '[-]', rendered = ' ', highlight = 'RenderMarkdownTodo', scope_highlight = nil },
+            todo = { raw = '[-]', rendered = '🔴', highlight = 'RenderMarkdownTodo', scope_highlight = nil },

         },
     },
     bullet = {
         },
     },
     bullet = {

diff --git a/scripts/compiler b/scripts/compiler
index 932d2f45967d33cbc83623925d38ee512eae9dea..17add0bf018bbf0d68a87eddb29512cbcf7e2a19 100755 (executable)
--- a/scripts/compiler
+++ b/scripts/compiler
@@ -27,9 +27,9 @@ case "$ext" in
     java) javac -d classes "${file}" && java -cp classes "${base}" ;;
     m) octave "${file}" ;;
     md)
     java) javac -d classes "${file}" && java -cp classes "${base}" ;;
     m) octave "${file}" ;;
     md)

-        mstarget="$(getcomproot "${file}" || echo "${file}")"
-        cd "${mstarget%/*}"
-        preconv "${mstarget}" | soelim | refer -PS -e -p "$HOME/.local/share/groff/library.txt" | groff -U -ms -kept -dpaper=letter -T pdf > "${mstarget%.*}".pdf ;;
+        mdtarget="$(getcomproot "${file}" || echo "${file}")"
+        cd "${mdtarget%/*}"
+        md2ms "${mdtarget}" | preconv | soelim | refer -PS -e -p "$HOME/.local/share/groff/library.txt" | groff -U -ms -kept -dpaper=letter -T pdf > "${mdtarget%.*}".pdf ;;

     org) emacs "${file}" --batch -u "${USER}" -f org-latex-export-to-pdf ;;
     py) python "${file}" ;;
     [rR]md) Rscript -e "rmarkdown::render('${file}', quiet=TRUE)" ;;
     org) emacs "${file}" --batch -u "${USER}" -f org-latex-export-to-pdf ;;
     py) python "${file}" ;;
     [rR]md) Rscript -e "rmarkdown::render('${file}', quiet=TRUE)" ;;