diff --git a/after/ftplugin/yuck.lua b/after/ftplugin/yuck.lua new file mode 100644 index 0000000..7c8fdcc --- /dev/null +++ b/after/ftplugin/yuck.lua @@ -0,0 +1,3 @@ +vim.opt_local.tabstop = 2 +vim.opt_local.shiftwidth = 2 +vim.opt_local.softtabstop = 2 diff --git a/after/plugin/cheatsheet.lua b/after/plugin/cheatsheet.lua new file mode 100644 index 0000000..f440306 --- /dev/null +++ b/after/plugin/cheatsheet.lua @@ -0,0 +1,35 @@ +if not pcall(require, "cheatsheet") then + return +end + +local ctactions = require("cheatsheet.telescope.actions") +require("cheatsheet").setup({ + -- Whether to show bundled cheatsheets + + -- For generic cheatsheets like default, unicode, nerd-fonts, etc + bundled_cheatsheets = { + enabled = { "default", "unicode", "regex", "markdown", "lua" }, + disabled = { "nerd-fonts" }, + }, + -- bundled_cheatsheets = true, + + -- For plugin specific cheatsheets + bundled_plugin_cheatsheets = { + enabled = {}, + disabled = {}, + }, + -- bundled_plugin_cheatsheets = true, + + -- For bundled plugin cheatsheets, do not show a sheet if you + -- don't have the plugin installed (searches runtimepath for + -- same directory name) + include_only_installed_plugins = true, + + -- Key mappings bound inside the telescope window + telescope_mappings = { + [""] = require("cheatsheet.telescope.actions").select_or_fill_commandline, + [""] = require("cheatsheet.telescope.actions").select_or_execute, + [""] = require("cheatsheet.telescope.actions").copy_cheat_value, + [""] = require("cheatsheet.telescope.actions").edit_user_cheatsheet, + }, +}) diff --git a/after/plugin/cmake-tools.lua b/after/plugin/cmake-tools.lua index 4ff8771..6537ca6 100644 --- a/after/plugin/cmake-tools.lua +++ b/after/plugin/cmake-tools.lua @@ -3,18 +3,66 @@ if not pcall(require, "cmake-tools") then end require("cmake-tools").setup({ - cmake_command = "cmake", - cmake_build_directory = "target/build/", - cmake_build_directory_prefix = "cmake_build_", -- when cmake_build_directory is "", this option will be activated - cmake_generate_options = { "-D", "CMAKE_EXPORT_COMPILE_COMMANDS=1" }, - cmake_soft_link_compile_commands = true, -- if softlink compile commands json file - cmake_build_options = {}, - cmake_console_size = 15, -- cmake output window height - cmake_console_position = "belowright", -- "belowright", "aboveleft", ... - cmake_show_console = "always", -- "always", "only_on_error" - cmake_dap_configuration = { name = "cpp", type = "codelldb", request = "launch" }, -- dap configuration, optional + cmake_command = "cmake", -- this is used to specify cmake command path + cmake_regenerate_on_save = true, -- auto generate when save CMakeLists.txt + cmake_generate_options = { "-DCMAKE_EXPORT_COMPILE_COMMANDS=1" }, -- this will be passed when invoke `CMakeGenerate` + cmake_build_options = {}, -- this will be passed when invoke `CMakeBuild` + cmake_build_directory = "target/build/", -- this is used to specify generate directory for cmake + cmake_build_directory_prefix = "cmake_build_", -- when cmake_build_directory is set to "", this option will be activated + cmake_soft_link_compile_commands = true, -- this will automatically make a soft link from compile commands file to project root dir + cmake_compile_commands_from_lsp = false, -- this will automatically set compile commands file location using lsp, to use it, please set `cmake_soft_link_compile_commands` to false + cmake_kits_path = nil, -- this is used to specify global cmake kits path, see CMakeKits for detailed usage cmake_variants_message = { - short = { show = true }, - long = { show = true, max_length = 40 }, + short = { show = true }, -- whether to show short message + long = { show = true, max_length = 40 }, -- whether to show long message + }, + cmake_dap_configuration = { -- debug settings for cmake + name = "cpp", + type = "codelldb", + request = "launch", + stopOnEntry = false, + runInTerminal = true, + console = "integratedTerminal", + }, + cmake_executor = { -- executor to use + name = "quickfix", -- name of the executor + opts = {}, -- the options the executor will get, possible values depend on the executor type. See `default_opts` for possible values. + default_opts = { -- a list of default and possible values for executors + quickfix = { + show = "only_on_error", -- "always", "only_on_error" + position = "belowright", -- "bottom", "top" + size = 15, + }, + overseer = { + new_task_opts = {}, -- options to pass into the `overseer.new_task` command + on_new_task = function(task) end, -- a function that gets overseer.Task when it is created, before calling `task:start` + }, + terminal = {}, -- terminal executor uses the values in cmake_terminal + }, + }, + cmake_terminal = { + name = "terminal", + opts = { + name = "Main Terminal", + prefix_name = "[CMakeTools]: ", -- This must be included and must be unique, otherwise the terminals will not work. Do not use a simple spacebar " ", or any generic name + split_direction = "vertical", -- "horizontal", "vertical" + split_size = 50, + + -- Window handling + single_terminal_per_instance = true, -- Single viewport, multiple windows + single_terminal_per_tab = true, -- Single viewport per tab + keep_terminal_static_location = true, -- Static location of the viewport if avialable + + -- Running Tasks + start_insert_in_launch_task = false, -- If you want to enter terminal with :startinsert upon using :CMakeRun + start_insert_in_other_tasks = false, -- If you want to enter terminal with :startinsert upon launching all other cmake tasks in the terminal. Generally set as false + focus_on_main_terminal = false, -- Focus on cmake terminal when cmake task is launched. Only used if executor is terminal. + focus_on_launch_terminal = false, -- Focus on cmake launch terminal when executable target in launched. + }, + }, + cmake_notifications = { + enabled = true, -- show cmake execution progress in nvim-notify + spinner = { "⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏" }, -- icons used for progress display + refresh_rate_ms = 100, -- how often to iterate icons }, }) diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index fbc4148..10d3900 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -37,8 +37,7 @@ lsp.on_attach(function(_, bufnr) nmap("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences") nmap("gI", vim.lsp.buf.implementation, "[G]oto [I]mplementation") nmap("K", vim.lsp.buf.hover, "Hover Documentation") - nmap("", vim.lsp.buf.signature_help, "Signature Documentation") - + nmap("", vim.lsp.buf.signature_help, "Signature Documentation") nmap("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration") end) @@ -119,6 +118,9 @@ lsp.configure("texlab", { }, }) +if not pcall(require, "neodev") then + return +end require("neodev").setup() require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls({ settings = { @@ -158,6 +160,9 @@ require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls({ lsp.setup() +if not pcall(require, "null-ls") then + return +end local null_ls = require("null-ls") -- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics local formatting = null_ls.builtins.formatting @@ -213,6 +218,7 @@ require("mason-null-ls").setup({ "usort", "yamlfmt", "rustywind", + "letexindent", }, automatic_installation = true, handlers = { diff --git a/after/plugin/luasnip.lua b/after/plugin/luasnip.lua index 4695a08..5db6f6a 100644 --- a/after/plugin/luasnip.lua +++ b/after/plugin/luasnip.lua @@ -73,126 +73,3 @@ ls.config.set_config({ }, }, }) - -local get_year = function() - return os.date("%Y") -end - -local get_date = function() - return os.date("%d.%m.%Y") -end - -local same = function(index) - return f(function(arg) - return arg[1] - end, { index }) -end - -ls.add_snippets(nil, { - all = {}, - rust = { - s( - "modtest", - fmt( - [[ - #[cfg(test)] - mod tests {{ - {} - {} - }} - ]], - { - c(1, { t(" use super::*;"), t("") }), - i(0), - } - ) - ), - }, - python = {}, - cpp = { - s( - "auth", - fmt( - [[ - // Copyright {} - // Author - Kristiāns Francis Cagulis, kc22015 - // {} - // Created: {} - ]], - { - get_year(), - i(1), - get_date(), - } - ) - ), - s( - "fn", - fmt( - [[ - // {}; - // Funkcija {}({}) - - // {} - {} {{ - }} - ]], - { - same(1), - f(function(function_name) - if not function_name[1][1] then - function_name[1][1] = "" - end - local words = {} - for word in function_name[1][1]:gmatch("%w+") do - table.insert(words, word) - end - return words[2] or "" - end, { 1 }), - i(2), - i(0), - i(1), - } - ) - ), - s( - "templ", - fmt( - [[ - template - {}({}){{ - {} - }} - ]], - { - c(1, { t("T"), t("T1, class T2") }), - i(2), - i(3), - i(0), - } - ) - ), - }, - norg = { - s( - "meta", - fmt( - [[ - @document.meta - title: {} - author: {} - categories: {} - @end - ]], - { - i(1), - c(2, { - t("Kristofers Solo"), - t("Kristiāns Francis Cagulis, kc22015"), - t("Kristiāns Francis Cagulis"), - }), - i(0), - } - ) - ), - }, -}) diff --git a/after/plugin/oil.lua b/after/plugin/oil.lua new file mode 100644 index 0000000..2357f6f --- /dev/null +++ b/after/plugin/oil.lua @@ -0,0 +1,135 @@ +if not pcall(require, "oil") then + return +end + +local nmap = require("solo.mappings").nmap +nmap("-", vim.cmd.Oil, "Open parent directory") + +require("oil").setup({ + -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`) + -- Set to false if you still want to use netrw. + default_file_explorer = true, + -- Id is automatically added at the beginning, and name at the end + -- See :help oil-columns + columns = { + "icon", + -- "permissions", + "size", + -- "mtime", + }, + -- Buffer-local options to use for oil buffers + buf_options = { + buflisted = false, + bufhidden = "hide", + }, + -- Window-local options to use for oil buffers + win_options = { + wrap = false, + signcolumn = "no", + cursorcolumn = false, + foldcolumn = "0", + spell = false, + list = false, + conceallevel = 3, + concealcursor = "n", + }, + -- Restore window options to previous values when leaving an oil buffer + restore_win_options = true, + -- Skip the confirmation popup for simple operations + skip_confirm_for_simple_edits = false, + -- Deleted files will be removed with the trash_command (below). + delete_to_trash = true, + -- Change this to customize the command used when deleting to trash + trash_command = "trash-put", + -- Selecting a new/moved/renamed file or directory will prompt you to save changes first + prompt_save_on_select_new_entry = true, + -- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap + -- options with a `callback` (e.g. { callback = function() ... end, desc = "", nowait = true }) + -- Additionally, if it is a string that matches "actions.", + -- it will use the mapping at require("oil.actions"). + -- Set to `false` to remove a keymap + -- See :help oil-actions for a list of all available actions + keymaps = { + ["g?"] = "actions.show_help", + [""] = "actions.select", + ["v"] = "actions.select_vsplit", + ["h"] = "actions.select_split", + ["t"] = "actions.select_tab", + ["p"] = "actions.preview", + [""] = "actions.close", + [""] = "actions.refresh", + ["Y"] = "actions.copy_entry_path", + ["-"] = "actions.parent", + ["_"] = "actions.open_cwd", + ["`"] = "actions.cd", + ["~"] = "actions.tcd", + ["."] = "actions.toggle_hidden", + }, + -- Set to false to disable all of the above keymaps + use_default_keymaps = false, + view_options = { + -- Show files and directories that start with "." + show_hidden = true, + -- This function defines what is considered a "hidden" file + is_hidden_file = function(name, bufnr) + return vim.startswith(name, ".") + end, + -- This function defines what will never be shown, even when `show_hidden` is set + is_always_hidden = function(name, bufnr) + return false + end, + }, + -- Configuration for the floating window in oil.open_float + float = { + -- Padding around the floating window + padding = 2, + max_width = 0, + max_height = 0, + border = "rounded", + win_options = { + winblend = 10, + }, + -- This is the config that will be passed to nvim_open_win. + -- Change values here to customize the layout + override = function(conf) + return conf + end, + }, + -- Configuration for the actions floating preview window + preview = { + -- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_width and max_width can be a single value or a list of mixed integer/float types. + -- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total" + max_width = 0.9, + -- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total" + min_width = { 40, 0.4 }, + -- optionally define an integer/float for the exact width of the preview window + width = nil, + -- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) + -- min_height and max_height can be a single value or a list of mixed integer/float types. + -- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total" + max_height = 0.9, + -- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total" + min_height = { 5, 0.1 }, + -- optionally define an integer/float for the exact height of the preview window + height = nil, + border = "rounded", + win_options = { + winblend = 0, + }, + }, + -- Configuration for the floating progress window + progress = { + max_width = 0.9, + min_width = { 40, 0.4 }, + width = nil, + max_height = { 10, 0.9 }, + min_height = { 5, 0.1 }, + height = nil, + border = "rounded", + minimized_border = "none", + win_options = { + winblend = 0, + }, + }, +}) diff --git a/after/plugin/project.lua b/after/plugin/project.lua deleted file mode 100644 index fea6206..0000000 --- a/after/plugin/project.lua +++ /dev/null @@ -1,12 +0,0 @@ -if not pcall(require, "project_nvim") then - return -end - -require("project_nvim").setup({ - detection_methods = { "lsp", "pattern" }, -- NOTE: lsp detection will get annoying with multiple langs in one project - -- detection_methods = { "pattern" }, - -- patterns used to detect root dir, when **"pattern"** is in detection_methods - patterns = { ".git", "package.json", ".venv", "Cargo.toml", "requirements.txt", "CMakeLists.txt" }, -}) -local telescope = require("telescope") -telescope.load_extension("projects") diff --git a/after/plugin/runner.lua b/after/plugin/runner.lua new file mode 100644 index 0000000..4dc587a --- /dev/null +++ b/after/plugin/runner.lua @@ -0,0 +1,50 @@ +if not pcall(require, "runner") then + return +end + +local runner = require("runner") +local choice = require("runner.handlers.helpers").choice +local helpers = require("runner.handlers.helpers") + +runner.setup({ + position = "right", -- position of the terminal window when using the shell_handler + -- can be: top, left, right, bottom + -- will be overwritten when using the telescope mapping to open horizontally or vertically + width = 50, -- width of window when position is left or right + height = 10, -- height of window when position is top or bottom +}) + +runner.set_handler( + "cpp", + choice({ + Cmake = function() + -- vim.cmd.CMakeBuild() + vim.cmd.CMakeRun() + end, + Makefile = helpers.shell_handler("make"), + ["g++"] = helpers.shell_handler( + "g++ " .. vim.fn.expand("%") .. " -o " .. vim.fn.expand("%:r") .. " && " .. vim.fn.expand("%:r") + ), + Custom = helpers.shell_handler("", true), + }) +) + +runner.set_handler( + "c", + choice({ + Cmake = vim.cmd.CMakeRun, + Makefile = helpers.shell_handler("make"), + ["gcc"] = helpers.shell_handler( + "gcc " .. vim.fn.expand("%") .. " -o " .. vim.fn.expand("%:r") .. " && " .. vim.fn.expand("%:r") + ), + Custom = helpers.shell_handler("", true), + }) +) + +-- runner.set_handler( +-- "python", +-- choice({ +-- Python = helpers.shell_handler("python " .. vim.fn.expand("%:t")), +-- Custom = helpers.shell_handler("", true), +-- }) +-- ) diff --git a/after/plugin/snips/cmake.lua b/after/plugin/snips/cmake.lua new file mode 100644 index 0000000..570e511 --- /dev/null +++ b/after/plugin/snips/cmake.lua @@ -0,0 +1,53 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local i = ls.insert_node +local fmt = require("luasnip.extras.fmt").fmt + +local shared = require("solo.snips") +local same = shared.same + +local cmake_version = function() + local version = "3.27.4" + -- vim.fn.jobstart("cmake --version | head -n 1 | rg -o '\\d+\\.\\d+\\.\\d+'", {}) + return version +end + +ls.add_snippets("cmake", { + s( + "lib", + fmt( + [[ + cmake_minimum_required(VERSION {}) + project({}) + add_library(${{PROJECT_NAME}} src/{}.cc) + ]], + { + cmake_version(), + i(1), + same(1), + } + ) + ), + s( + "bin", + fmt( + [[ + cmake_minimum_required(VERSION {}) + project({}) + add_executable(${{PROJECT_NAME}} src/main.cc) + target_link_directories(${{PROJECT_NAME}} PRIVATE ${{CMAKE_SOURCE_DIR}}/include/{}/target/build/) + target_link_libraries(${{PROJECT_NAME}} {}) + ]], + { + cmake_version(), + i(1), + i(2), + same(2), + } + ) + ), +}) diff --git a/after/plugin/snips/cpp.lua b/after/plugin/snips/cpp.lua new file mode 100644 index 0000000..b2f2541 --- /dev/null +++ b/after/plugin/snips/cpp.lua @@ -0,0 +1,61 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local i = ls.insert_node +local f = ls.function_node +local fmt = require("luasnip.extras.fmt").fmt + +local shared = require("solo.snips") +local same = shared.same +local year = shared.year +local date = shared.date + +ls.add_snippets("cpp", { + s( + "auth", + fmt( + [[ + // Copyright {} + // Author - Kristiāns Francis Cagulis, kc22015 + // {} + // Created: {} + ]], + { + year(), + i(1), + date(), + } + ) + ), + s( + "fn", + fmt( + [[ + // {}; + // Funkcija {}({}) - + // {} + {} {{ + }} + ]], + { + same(1), + f(function(function_name) + if not function_name[1][1] then + function_name[1][1] = "" + end + local words = {} + for word in function_name[1][1]:gmatch("%w+") do + table.insert(words, word) + end + return words[2] or "" + end, { 1 }), + i(2), + i(0), + i(1), + } + ) + ), +}) diff --git a/after/plugin/snips/lua.lua b/after/plugin/snips/lua.lua new file mode 100644 index 0000000..97540d4 --- /dev/null +++ b/after/plugin/snips/lua.lua @@ -0,0 +1,79 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") + +local s = ls.snippet +local sn = ls.sn +local i = ls.insert_node +local t = ls.text_node +local d = ls.dynamic_node +local c = ls.choice_node +local fmt = require("luasnip.extras.fmt").fmt + +local shared = require("solo.snips") + +local newline = function(text) + return t({ "", text }) +end + +local require_var = function(args, _) + local text = args[1][1] or "" + local split = vim.split(text, ".", { plain = true }) + + local options = {} + for len = 0, #split - 1 do + table.insert(options, t(table.concat(vim.list_slice(split, #split - len, #split), "_"))) + end + + return sn(nil, { + c(1, options), + }) +end + +ls.add_snippets("lua", { + s( + "lf", + fmt( + [[ + local {} = function({}) + {} + end + ]], + { + i(1), + i(2), + i(0), + } + ) + ), + s( + "f", + fmt( + [[ + function({}) + {} + end + ]], + { + i(1), + i(0), + } + ) + ), + s( + "req", + fmt([[ local {} = require("{}") ]], { + d(2, require_var, { 1 }), + i(1), + }) + ), + s( + "treq", + fmt([[ local {} = require("telescope.{}") ]], { + d(2, require_var, { 1 }), + i(1), + }) + ), +}) diff --git a/after/plugin/snips/markdown.lua b/after/plugin/snips/markdown.lua new file mode 100644 index 0000000..5bfc286 --- /dev/null +++ b/after/plugin/snips/markdown.lua @@ -0,0 +1,21 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") + +local s = ls.snippet +local i = ls.insert_node +local t = ls.text_node +local c = ls.choice_node +local fmt = require("luasnip.extras.fmt").fmt + +ls.add_snippets({ "markdown", "vimwiki" }, { + s( + "t", + fmt("- [{}] {}", { + c(2, { t(" "), t("-"), t("x") }), + i(1, "task"), + }) + ), +}) diff --git a/after/plugin/snips/norg.lua b/after/plugin/snips/norg.lua new file mode 100644 index 0000000..154c18e --- /dev/null +++ b/after/plugin/snips/norg.lua @@ -0,0 +1,34 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local t = ls.text_node +local i = ls.insert_node +local c = ls.choice_node +local fmt = require("luasnip.extras.fmt").fmt + +ls.add_snippets("norg", { + s( + "meta", + fmt( + [[ + @document.meta + title: {} + author: {} + categories: {} + @end + ]], + { + i(1), + c(2, { + t("Kristofers Solo"), + t("Kristiāns Francis Cagulis, kc22015"), + t("Kristiāns Francis Cagulis"), + }), + i(0), + } + ) + ), +}) diff --git a/after/plugin/snips/rust.lua b/after/plugin/snips/rust.lua new file mode 100644 index 0000000..cdca205 --- /dev/null +++ b/after/plugin/snips/rust.lua @@ -0,0 +1,51 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local isn = ls.indent_snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node +local r = ls.restore_node +local events = require("luasnip.util.events") +local ai = require("luasnip.nodes.absolute_indexer") +local extras = require("luasnip.extras") +local l = extras.lambda +local rep = extras.rep +local p = extras.partial +local m = extras.match +local n = extras.nonempty +local dl = extras.dynamic_lambda +local fmt = require("luasnip.extras.fmt").fmt +local fmta = require("luasnip.extras.fmt").fmta +local conds = require("luasnip.extras.expand_conditions") +local postfix = require("luasnip.extras.postfix").postfix +local types = require("luasnip.util.types") +local parse = require("luasnip.util.parser").parse_snippet +local ms = ls.multi_snippet + +local shared = require("solo.snips") + +ls.add_snippets("rust", { + s( + "modtest", + fmt( + [[ + #[cfg(test)] + mod tests {{ + {} + {} + }} + ]], + { + c(1, { t(" use super::*;"), t("") }), + i(0), + } + ) + ), +}) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua index 8a41c09..efa3bb8 100644 --- a/after/plugin/telescope.lua +++ b/after/plugin/telescope.lua @@ -2,12 +2,11 @@ if not pcall(require, "telescope") then return end -local builtin = require("telescope.builtin") - -vim.keymap.set("n", "", builtin.git_files, {}) +vim.keymap.set("n", "", require("telescope.builtin").git_files, {}) local telescope = require("telescope") local actions = require("telescope.actions") + telescope.setup({ defaults = { vimgrep_arguments = { @@ -23,13 +22,15 @@ telescope.setup({ prompt_prefix = " ", selection_caret = " ", path_display = { "smart" }, - file_ignore_patterns = { ".git/", "node_modules", ".venv/" }, + file_ignore_patterns = { ".git/", ".spl", "target/" }, mappings = { i = { [""] = actions.cycle_history_next, [""] = actions.cycle_history_prev, [""] = actions.move_selection_next, [""] = actions.move_selection_previous, + [""] = actions.delete_buffer + actions.move_to_top, + -- [""] = actions.remove_selection }, }, }, @@ -82,13 +83,95 @@ telescope.setup({ -- codeactions = false, -- } }, + lazy = { + -- Optional theme (the extension doesn't set a default theme) + theme = "dropdown", + previewer = false, + -- Whether or not to show the icon in the first column + show_icon = true, + -- Mappings for the actions + mappings = { + open_in_browser = "", + open_in_file_browser = "", + open_in_find_files = "", + open_in_live_grep = "", + open_plugins_picker = "", -- Works only after having called first another action + open_lazy_root_find_files = "f", + open_lazy_root_live_grep = "g", + }, + -- Other telescope configuration options + }, + http = { + -- How the mozilla url is opened. By default will be configured based on OS: + open_url = "xdg-open %s", -- UNIX + -- open_url = 'open %s' -- OSX + -- open_url = 'start %s' -- Windows + }, + heading = { + treesitter = true, + picker_opts = { + layout_config = { width = 0.8, preview_width = 0.5 }, + layout_strategy = "horizontal", + }, + }, + bibtex = { + -- Depth for the *.bib file + depth = 1, + -- Custom format for citation label + custom_formats = {}, + -- Format to use for citation label. + -- Try to match the filetype by default, or use 'plain' + format = "", + -- Path to global bibliographies (placed outside of the project) + global_files = {}, + -- Define the search keys to use in the picker + search_keys = { "author", "year", "title" }, + -- Template for the formatted citation + citation_format = "{{author}} ({{year}}), {{title}}.", + -- Only use initials for the authors first name + citation_trim_firstname = true, + -- Max number of authors to write in the formatted citation + -- following authors will be replaced by "et al." + citation_max_auth = 2, + -- Context awareness disabled by default + context = false, + -- Fallback to global/directory .bib files if context not found + -- This setting has no effect if context = false + context_fallback = true, + -- Wrapping in the preview window is disabled by default + wrap = false, + }, + undo = { + use_delta = true, + use_custom_command = nil, -- setting this implies `use_delta = false`. Accepted format is: { "bash", "-c", "echo '$DIFF' | delta" } + side_by_side = false, + diff_context_lines = vim.o.scrolloff, + entry_format = "state #$ID, $STAT, $TIME", + time_format = "", + mappings = { + i = { + -- IMPORTANT: Note that telescope-undo must be available when telescope is configured if + -- you want to replicate these defaults and use the following actions. This means + -- installing as a dependency of telescope in it's `requirements` and loading this + -- extension from there instead of having the separate plugin definition as outlined + -- above. + [""] = require("telescope-undo.actions").yank_additions, + [""] = require("telescope-undo.actions").yank_deletions, + [""] = require("telescope-undo.actions").restore, + }, + }, + }, }, }) + pcall(telescope.load_extension, "fzf") -pcall(telescope.load_extension, "media_files") -pcall(telescope.load_extension, "emoji") -pcall(telescope.load_extension, "ui-select") -pcall(telescope.load_extension, "color_names") -pcall(telescope.load_extension, "git_worktree") -pcall(telescope.load_extension, "lazygit") -pcall(telescope.load_extension, "dap") +pcall(telescope.load_extension, "media_files") -- Telescope media_files +pcall(telescope.load_extension, "git_worktree") -- Telescope git_worktree +pcall(telescope.load_extension, "lazy") -- Telescope lazy +pcall(telescope.load_extension, "software-licenses") -- Telescope software-licenses list +pcall(telescope.load_extension, "http") -- Telescope http list +pcall(telescope.load_extension, "heading") -- Telescope heading +pcall(telescope.load_extension, "luasnip") -- Telescope luasnip +pcall(telescope.load_extension, "git_diffs") -- Telescope git_diffs diff_commits +pcall(telescope.load_extension, "bibtex") -- Telescope bibtex +pcall(telescope.load_extension, "undo") -- Telescope undo diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua index 84ec73e..b45e0ac 100644 --- a/after/plugin/treesitter.lua +++ b/after/plugin/treesitter.lua @@ -1,14 +1,6 @@ if not pcall(require, "nvim-treesitter") then return end -vim.keymap.set("n", "[d", function() - vim.diagnostic.goto_next() - vim.cmd("norm zz") -end, { desc = "Goto next diagnostic" }) -vim.keymap.set("n", "]d", function() - vim.diagnostic.goto_prev() - vim.cmd("norm zz") -end, { desc = "Goto prev diagnostic" }) require("nvim-treesitter.configs").setup({ -- A list of parser names, or "all" (the five listed parsers should always be installed) @@ -46,24 +38,28 @@ require("nvim-treesitter.configs").setup({ }, autotag = { enable = true, + enable_rename = true, + enable_close = true, + enable_close_on_slash = true, filetypes = { - "html", - "htmldjango", - "javascript", - "typescript", - "javascriptreact", - "typescriptreact", - "svelte", - "vue", - "tsx", - "jsx", - "rescript", - "xml", - "php", - "markdown", + "astro", "glimmer", "handlebars", "hbs", + "html", + "htmldjango", + "javascript", + "javascriptreact", + "jsx", + "markdown", + "php", + "rescript", + "svelte", + "tsx", + "typescript", + "typescriptreact", + "vue", + "xml", }, }, -- incremenral_selection = { diff --git a/after/plugin/whichkey.lua b/after/plugin/whichkey.lua index cbbc02f..338511c 100644 --- a/after/plugin/whichkey.lua +++ b/after/plugin/whichkey.lua @@ -4,6 +4,7 @@ end local which_key = require("which-key") local builtin = require("telescope.builtin") +local extensions = require("telescope").extensions local setup = { plugins = { marks = true, -- shows a list of your marks on " and ` @@ -94,9 +95,8 @@ local mappings = { c = { vim.cmd.bdelete, "[C]lose Buffer" }, x = { "!chmod +x %", "chmod & run" }, mr = { "CellularAutomaton make_it_rain", "[M]ake it [R]ain" }, - u = { vim.cmd.UndotreeToggle, "Toggle [U]ndoTree" }, - b = { vim.cmd.TagbarToggle, "Toggle Tag[B]ar" }, - e = { vim.cmd.Ex, "Open [E]xplorer" }, + u = { vim.cmd.UndotreeToggle, "Toggle [U]ndotree" }, + T = { vim.cmd.TagbarToggle, "Toggle [T]agbar" }, ["/"] = { function() builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({ previewer = false })) @@ -104,54 +104,56 @@ local mappings = { "Current Buffer Fuzzy", }, f = { - name = "[F]ind", - f = { - function() - builtin.find_files(require("telescope.themes").get_dropdown({ previewer = false })) - end, - "[F]iles", - }, - t = { builtin.live_grep, "[T]ext" }, - b = { builtin.buffers, "[B]uffers" }, + function() + builtin.find_files(require("telescope.themes").get_dropdown({ previewer = false })) + end, + "Find [F]iles", }, - h = { - name = "[H]arpoon", - a = { require("harpoon.mark").add_file, "[A]dd File" }, - m = { require("harpoon.ui").toggle_quick_menu, "[M]enu" }, - }, - t = { - name = "[T]elescope", + F = { builtin.live_grep, "Live Grep" }, + b = { builtin.buffers, "Find [B]uffers" }, + ha = { require("harpoon.mark").add_file, "[H]arpoon [A]dd File" }, + hm = { require("harpoon.ui").toggle_quick_menu, "[H]arpoon [M]enu" }, + s = { + name = "Telescope [S]earch", + s = { builtin.grep_string, "[S]tring under the cursor" }, + e = { builtin.symbols, "[E]moji" }, d = { builtin.diagnostic, "[D]iagnostics" }, b = { builtin.git_branches, "Checkout [B]ranch" }, - h = { builtin.help_tags, "Find [H]elp" }, - H = { builtin.highlights, "Find [H]ighlight Groups" }, + h = { builtin.help_tags, "[H]elp" }, M = { builtin.man_pages, "[M]an Pages" }, r = { builtin.oldfiles, "Open [R]ecent Files" }, R = { builtin.registers, "[R]egisters" }, - g = { builtin.live_grep, "Live [G]rep" }, + g = { builtin.live_grep, "[G]rep" }, + G = { builtin.git_files, "[G]it Files" }, k = { builtin.keymaps, "[K]eymaps" }, C = { builtin.commands, "[C]ommands" }, t = { vim.cmd.TodoTelescope, "[T]odo" }, - m = { require("telescope").extensions.media_files.media_files, "[M]edia" }, + m = { extensions.media_files.media_files, "[M]edia" }, c = { function() builtin.colorscheme({ enable_preview = true }) end, "[C]olorscheme with Preview", }, - }, - g = { - name = "[G]it", - g = { vim.cmd.LazyGit, "Lazygit" }, - b = { - function() - vim.cmd.Gitsigns("blame_line") - end, - "[B]lame", + l = { extensions.lazy.lazy, "[L]azy" }, + L = { extensions.luasnip.luasnip, "[L]uasnip" }, + D = { + name = "[D]evelopment", + s = { "Telescope software-licenses find", "[S]oftware Licenses" }, + h = { extensions.http.list, "[H]TTP" }, }, - c = { require("telescope").extensions.git_worktree.git_worktrees, "[C]hange Worktree" }, - n = { require("telescope").extensions.git_worktree.create_git_worktree, "Create [N]ew Worktree" }, + H = { extensions.heading.heading, "[H]eading" }, }, + gg = { vim.cmd.LazyGit, "Lazygit" }, + gb = { + function() + vim.cmd.Gitsigns("blame_line") + end, + "[G]it [B]lame", + }, + gw = { require("telescope").extensions.git_worktree.git_worktrees, "[G]it Change [W]orktree" }, + gn = { require("telescope").extensions.git_worktree.create_git_worktree, "[G]it Create [N]ew Worktree" }, + gd = { require("telescope").extensions.git_diffs.diff_commits, "[G]it [D]iff" }, l = { name = "[L]SP", ca = { vim.lsp.buf.code_action, "[C]ode [A]ction" }, @@ -270,8 +272,8 @@ local mappings = { d = { vim.cmd.VimwikiDeleteFile, "Rename file" }, r = { vim.cmd.VimwikiRenameFile, "Delete file" }, }, - v = { - name = "[V]imTex", + t = { + name = "Vim[T]ex", b = { vim.cmd.VimtexCompile, "[B]uild" }, v = { vim.cmd.VimtexView, "[V]iew" }, w = { vim.cmd.VimtexCountWords, "[W]ord Count" }, @@ -279,40 +281,63 @@ local mappings = { c = { vim.cmd.VimtexClean, "[C]lean aux" }, e = { vim.cmd.VimtexErrors, "Report [E]rrors" }, i = { vim.cmd.VimtexInfo, "[I]nfo" }, + B = { builtin.bibtex, "Telescope [B]ibtex" }, }, - T = { - name = "[T]emplates", - p = { - "read ~/.config/nvim/templates/PhilPaper.tex", - "PhilPaper.tex", - }, + p = { + name = "Tem[p]lates", l = { - "read ~/.config/nvim/templates/Letter.tex", - "Letter.tex", + name = "[L]aTeX", + p = { + function() + vim.cmd.read("~/Templates/LaTeX/PhilPaper.tex") + end, + "PhilPaper.tex", + }, + l = { + function() + vim.cmd.read("~/Templates/LaTeX/Letter.tex") + end, + "Letter.tex", + }, + g = { + function() + vim.cmd.read("~/Templates/LaTeX/Glossary.tex") + end, + "Glossary.tex", + }, + h = { + function() + vim.cmd.read("~/Templates/LaTeX/HandOut.tex") + end, + "HandOut.tex", + }, + b = { + function() + vim.cmd.read("~/Templates/LaTeX/PhilBeamer.tex") + end, + "PhilBeamer.tex", + }, + s = { + function() + vim.cmd.read("~/Templates/LaTeX/SubFile.tex") + end, + "SubFile.tex", + }, + r = { + function() + vim.cmd.read("~/Templates/LaTeX/Root.tex") + end, + "Root.tex", + }, + m = { + function() + vim.cmd.read("~/Templates/LaTeX/MultipleAnswer.tex") + end, + "MultipleAnswer.tex", + }, }, - g = { - "read ~/.config/nvim/templates/Glossary.tex", - "Glossary.tex", - }, - h = { - "read ~/.config/nvim/templates/HandOut.tex", - "HandOut.tex", - }, - b = { - "read ~/.config/nvim/templates/PhilBeamer.tex", - "PhilBeamer.tex", - }, - s = { - "read ~/.config/nvim/templates/SubFile.tex", - "SubFile.tex", - }, - r = { - "read ~/.config/nvim/templates/Root.tex", - "Root.tex", - }, - m = { - "read ~/.config/nvim/templates/MultipleAnswer.tex", - "MultipleAnswer.tex", + c = { + name = "[C]make", }, }, } diff --git a/init.lua b/init.lua index dbc863e..54e1cec 100644 --- a/init.lua +++ b/init.lua @@ -1 +1 @@ -require("config") +require("solo") diff --git a/lazy-lock.json b/lazy-lock.json index 66e2692..7216eea 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,11 +1,12 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "c4d6298347f7707e9757351b2ee03d0c00da5c20" }, + "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" }, - "cellular-automaton.nvim": { "branch": "main", "commit": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f" }, + "cellular-automaton.nvim": { "branch": "main", "commit": "b7d056dab963b5d3f2c560d92937cb51db61cb5b" }, + "cheatsheet.nvim": { "branch": "master", "commit": "53325f0c7bef73f875d798f2a951362f4f3f50bc" }, "clangd_extensions.nvim": { "branch": "main", "commit": "323b00de2ee18cad1ac45eb95e680386c4ff4366" }, "cloak.nvim": { "branch": "main", "commit": "ff5e746e787de14675396beb642bf5010b8bc96d" }, - "cmake-tools.nvim": { "branch": "master", "commit": "d1600ed7a9a13bdbcb7be9d3745d0a59b589c65d" }, + "cmake-tools.nvim": { "branch": "master", "commit": "9ffcf4f4a31215b24fc776f0b85563ebdad5cf89" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -14,14 +15,14 @@ "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "diffview.nvim": { "branch": "main", "commit": "7e5a85c186027cab1e825d018f07c350177077fc" }, "distant.nvim": { "branch": "v0.3", "commit": "17bcd37f8d91dcb987456be456d8a95db1a772ba" }, - "friendly-snippets": { "branch": "main", "commit": "00e191fea2cfbbdd378243f35b5953296537a116" }, + "friendly-snippets": { "branch": "main", "commit": "ebf6d6e83494cdd88a54a429340256f4dbb6a052" }, "git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" }, - "gitsigns.nvim": { "branch": "main", "commit": "44adf808ace6cb65a3353bd61fa585a2d8fe0db3" }, + "gitsigns.nvim": { "branch": "main", "commit": "d927caa075df63bf301d92f874efb72fd22fd3b4" }, "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, - "lazygit.nvim": { "branch": "main", "commit": "22e51e03268fabe068a77e2bd316ac25ff2084f9" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "f084f4a6a716f55bf9c4026e73027bb24a0325a3" }, + "lazygit.nvim": { "branch": "main", "commit": "18060f9841e7443e8a22af14e67c0ba86c6188d3" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "5dc5788e0fadbbdb10570ff8df5da1a98d6e1877" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "dfdd771b792fbb4bad8e057d72558255695aa1a7" }, @@ -31,7 +32,7 @@ "neodev.nvim": { "branch": "main", "commit": "183f5a7357397260b631d6cccceccc3621b50f78" }, "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, - "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, + "nvim-autopairs": { "branch": "master", "commit": "a52fc6eeec116746110b703381777c46d89d9e27" }, "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "31e1ece773e10448dcb616d5144290946a6264b7" }, @@ -39,36 +40,49 @@ "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, "nvim-lspconfig": { "branch": "master", "commit": "a27356f1ef9c11e1f459cc96a3fcac5c265e72d6" }, - "nvim-treesitter": { "branch": "master", "commit": "9361484fa465529b0e646f947fe07bc7e80bfa62" }, + "nvim-surround": { "branch": "main", "commit": "1c2ef599abeeb98e40706830bcd27e90e259367a" }, + "nvim-treesitter": { "branch": "master", "commit": "17b943e7c5cc2b2db3ac7b5720fbd42e75a00d8d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9bff161dfece6ecf3459e6e46ca42e49f9ed939f" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, + "nvim-web-devicons": { "branch": "master", "commit": "bc11ee2498de2310de5776477dd9dce65d03b464" }, "obsidian.nvim": { "branch": "main", "commit": "6b17ee6cbd81f5f091712a59473b4257007ae336" }, + "oil.nvim": { "branch": "master", "commit": "ca2560cae8a680c424a338fbeca8f0ab84e9791d" }, "playground": { "branch": "master", "commit": "429f3e76cbb1c59fe000b690f7a5bea617b890c0" }, "plenary.nvim": { "branch": "master", "commit": "0dbe561ae023f02c2fb772b879e905055b939ce3" }, + "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "rainbow_csv": { "branch": "master", "commit": "7453a3f9679f0c753ec9d77f9ea8588778f35aeb" }, + "rainbow_csv": { "branch": "master", "commit": "2dbf302ed77d40bac6d1db3028c66c301606f087" }, + "runner.nvim": { "branch": "main", "commit": "237f7b72c10c34f60c55022d2d79a5f8e5a531a5" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" }, "tagbar": { "branch": "master", "commit": "402e3e117fc7b47e43dbb87c51064daae3bc3bf3" }, - "telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" }, - "telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" }, - "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "fbda5d91d6e787f5977787fa4a81da5c8e22160a" }, + "telescope-bibtex.nvim": { "branch": "master", "commit": "e4dcf64d351db23b14be3563190cf68d5cd49e90" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "telescope-git-diffs.nvim": { "branch": "main", "commit": "3cce2eb1079ebee65b322638bca47b1a2307456a" }, + "telescope-heading.nvim": { "branch": "main", "commit": "23ce2c9ef252aecbaa37300c1209b5ef2b51e6c5" }, + "telescope-http.nvim": { "branch": "main", "commit": "b44065749560b3adfdb94bfd751642f0e480af4f" }, + "telescope-lazy.nvim": { "branch": "main", "commit": "686cbcfc384f3874bc7f7e55f85ce9b7a08921a0" }, + "telescope-luasnip.nvim": { "branch": "master", "commit": "849c4ee1951f34041a26744d2a88284545564ff0" }, "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, - "telescope.nvim": { "branch": "master", "commit": "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748" }, + "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, + "telescope-software-licenses.nvim": { "branch": "master", "commit": "cf47d9be3cc75c52ccbc13d1c212c13bc850a51a" }, + "telescope-symbols.nvim": { "branch": "master", "commit": "f2060117d965df4a626f068a4ebbd8ee051aa076" }, + "telescope-undo.nvim": { "branch": "main", "commit": "3dec002ea3e7952071d26fbb5d01e2038a58a554" }, + "telescope.nvim": { "branch": "master", "commit": "3fae9c1e14910e6669bb8ecbb473aba6a9e13b33" }, "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, "tokyonight.nvim": { "branch": "main", "commit": "9a01eada39558dc3243278e6805d90e8dff45dc0" }, "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" }, "vim-be-good": { "branch": "master", "commit": "c290810728a4f75e334b07dc0f3a4cdea908d351" }, "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, + "vim-dadbod": { "branch": "master", "commit": "7d80bbd11c407a09e0f7b869c38f3dec3902805f" }, + "vim-dadbod-completion": { "branch": "master", "commit": "fc7321a17f4c55db11fae89a884ddf4724020bae" }, + "vim-dadbod-ui": { "branch": "master", "commit": "200aebf70e6fc4b0eb1d3ecf0d57028e198d8dc6" }, "vim-fugitive": { "branch": "master", "commit": "572c8510123cbde02e8a1dafcd376c98e1e13f43" }, "vim-illuminate": { "branch": "master", "commit": "76f28e858f1caae87bfa45fb4fd09e4b053fc45b" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "addb64a772cb4a3ae1f1363583012b2cada2cd66" }, "vimtex": { "branch": "master", "commit": "ad17583ce399b6830b4c2888ef2a12d52c5eb607" }, "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" }, - "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } + "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, + "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } } \ No newline at end of file diff --git a/lua/config/autosave.lua b/lua/config/autosave.lua deleted file mode 100644 index 9d51326..0000000 --- a/lua/config/autosave.lua +++ /dev/null @@ -1,43 +0,0 @@ -local attach_on_buffer = function(output_bufnr, pattern, command) - vim.api.nvim_create_autocmd("BufWritePost", { - group = vim.api.nvim_create_augroup("autosave", { clear = true }), - pattern = pattern, - callback = function() - local append_data = function(_, data) - if data then - vim.api.nvim_buf_set_lines(output_bufnr, -1, -1, false, data) - end - end - - local file_path = vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf()) - vim.api.nvim_buf_set_lines(output_bufnr, 0, -1, false, { file_path }) - vim.fn.jobstart(command, { - stdout_buffered = true, - on_stdout = append_data, - on_stderr = append_data, - }) - end, - }) -end - --- vim.api.nvim_create_user_command("AutoRun", function() --- print("AutoRun starts now...") --- local bufnr = vim.api.nvim_get_current_buf() --- local command = vim.fn.input("Command: ") --- local pattern = vim.split(vim.fn.input("Pattern: "), " ") --- attach_on_buffer(tonumber(bufnr), pattern, command) --- end, {}) --- --- vim.api.nvim_create_user_command("AutoStop", function() --- vim.api.nvim_create_augroup("autosave", { clear = true }) --- end, {}) - -vim.api.nvim_create_user_command("AutoRun", function() - local bufnr = vim.api.nvim_create_buf(true, true) - vim.api.nvim_buf_set_name(bufnr, "Test") - vim.cmd.vsplit(bufnr) - vim.api.nvim_win_set_width(0, 50) - -- local command = vim.fn.input("Command: ") - -- local pattern = vim.split(vim.fn.input("Pattern: "), " ") - -- attach_on_buffer(tonumber(bufnr), pattern, command) -end, {}) diff --git a/lua/config/init.lua b/lua/config/init.lua deleted file mode 100644 index 4e896a2..0000000 --- a/lua/config/init.lua +++ /dev/null @@ -1,7 +0,0 @@ -require("config.options") --- require("config.mappings") -require("config.keymaps") -require("config.vimwiki") -require("config.lazy") -require("config.autocmds") -require("config.autosave") diff --git a/lua/plugins.lua b/lua/plugins.lua index ce4bc7c..ec18380 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -1,16 +1,31 @@ return { -- core { "folke/lazy.nvim" }, - { "nvim-lua/plenary.nvim" }, -- Useful lua functions used by lots of plugins + { "nvim-lua/plenary.nvim" }, -- useful { "ThePrimeagen/harpoon" }, { "preservim/tagbar" }, { "alvan/vim-closetag" }, { "mbbill/undotree" }, + { + "doctorfree/cheatsheet.nvim", + event = "VeryLazy", + dependencies = { + { "nvim-telescope/telescope.nvim" }, + { "nvim-lua/popup.nvim" }, + { "nvim-lua/plenary.nvim" }, + }, + }, + + { + "kylechui/nvim-surround", + event = "VeryLazy", + opts = true, + }, { "christoomey/vim-tmux-navigator" }, { "folke/todo-comments.nvim", opts = true }, - { "ahmedkhalf/project.nvim" }, + { "stevearc/oil.nvim", dependencies = { "nvim-tree/nvim-web-devicons" } }, { "chipsenkbeil/distant.nvim", branch = "v0.3", @@ -21,6 +36,13 @@ return { { "laytan/cloak.nvim" }, { "numToStr/Comment.nvim" }, { "folke/which-key.nvim", lazy = true }, + { + "MarcHamamji/runner.nvim", + dependencies = { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + }, -- lsp { @@ -76,6 +98,7 @@ return { "rcarriga/nvim-dap-ui", }, }, + { "elkowar/yuck.vim", ft = "yuck" }, { "nanotee/sqls.nvim", lazy = true }, { "p00f/clangd_extensions.nvim", ft = { "cpp", "c" } }, { "Civitasv/cmake-tools.nvim", ft = { "cpp", "c", "cmake" }, dependencies = { "nvim-lua/plenary.nvim" } }, @@ -160,20 +183,28 @@ return { { "nvim-telescope/telescope.nvim", dependencies = { + { "nvim-tree/nvim-web-devicons" }, { "nvim-lua/plenary.nvim" }, { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, { "nvim-telescope/telescope-media-files.nvim" }, - { "xiyaowong/telescope-emoji.nvim" }, - { "nvim-telescope/telescope-frecency.nvim" }, - { "nvim-telescope/telescope-ui-select.nvim" }, - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - { "nat-418/telescope-color-names.nvim" }, - { "nvim-telescope/telescope-dap.nvim", dependencies = { - "nvim-dap", - } }, + { "nvim-telescope/telescope-symbols.nvim" }, + { "nvim-telescope/telescope-bibtex.nvim" }, + { "tsakirist/telescope-lazy.nvim" }, + { "chip/telescope-software-licenses.nvim" }, + { "barrett-ruth/telescope-http.nvim" }, + { "crispgm/telescope-heading.nvim" }, + { "benfowler/telescope-luasnip.nvim" }, + { "paopaol/telescope-git-diffs.nvim" }, + { "debugloop/telescope-undo.nvim" }, + { "nvim-telescope/telescope-project.nvim" }, }, }, + -- DB + { "tpope/vim-dadbod" }, + { "kristijanhusak/vim-dadbod-ui" }, + { "kristijanhusak/vim-dadbod-completion" }, + -- pretty { "uga-rosa/ccc.nvim" }, { "lukas-reineke/indent-blankline.nvim" }, @@ -205,6 +236,7 @@ return { vim.cmd.colorscheme("tokyonight") end, }, + { "nvim-tree/nvim-web-devicons" }, -- git { "kdheepak/lazygit.nvim" }, diff --git a/lua/config/autocmds.lua b/lua/solo/autocmds.lua similarity index 95% rename from lua/config/autocmds.lua rename to lua/solo/autocmds.lua index f3224e3..d7c9adb 100644 --- a/lua/config/autocmds.lua +++ b/lua/solo/autocmds.lua @@ -25,11 +25,7 @@ vim.api.nvim_create_autocmd({ "TextYankPost" }, { -- Format File on Save vim.api.nvim_create_autocmd({ "BufWritePre" }, { callback = function() - if vim.lsp.buf.format then - vim.lsp.buf.format({ async = true }) - else - vim.lsp.buf.format() - end + vim.lsp.buf.format() end, }) diff --git a/lua/solo/init.lua b/lua/solo/init.lua new file mode 100644 index 0000000..8b645bd --- /dev/null +++ b/lua/solo/init.lua @@ -0,0 +1,5 @@ +require("solo.options") +require("solo.keymaps") +require("solo.vimwiki") +require("solo.lazy") +require("solo.autocmds") diff --git a/lua/config/keymaps.lua b/lua/solo/keymaps.lua similarity index 63% rename from lua/config/keymaps.lua rename to lua/solo/keymaps.lua index 514504b..92faf2c 100644 --- a/lua/config/keymaps.lua +++ b/lua/solo/keymaps.lua @@ -1,7 +1,7 @@ -local nmap = require("config.mappings").nmap -local xmap = require("config.mappings").xmap -local tmap = require("config.mappings").tmap -local vmap = require("config.mappings").vmap +local nmap = require("solo.mappings").nmap +local xmap = require("solo.mappings").xmap +local vmap = require("solo.mappings").vmap +local tmap = require("solo.mappings").tmap vim.keymap.set("", "", "") nmap("Q", "") @@ -29,21 +29,30 @@ nmap("", "!tmux neww tmux-sessionizer", "Open tmux sessionizer") nmap("", "m .-2==", "Move line up") nmap("", "m .+1==", "Move line down") -nmap("", ":%s/\\<\\>//gI", "Substitute word") +nmap("", ":%s///gI", "[S]ubstitute word") -- nmap("", "w!!compiler '%:p'") -- nmap("", "w!!opout '%:p'") xmap("p", '"_dP') - -vim.keymap.set("c", "", 'pumvisible() ? "\\" : "\\"', { expr = true, noremap = true }) -vim.keymap.set("c", "", 'pumvisible() ? "\\" : "\\"', { expr = true, noremap = true }) +vim.keymap.set( + "c", + "", + 'pumvisible() ? "\\" : "\\"', + { expr = true, noremap = true, desc = "Prev command" } +) +vim.keymap.set( + "c", + "", + 'pumvisible() ? "\\" : "\\"', + { expr = true, noremap = true, desc = "Next command" } +) vmap(">", ">gv", "Right Indent") vmap("<", "", ":m '<-2gv=gv", "Move lines up") vmap("", ":m '>+1gv=gv", "Move lines down") --- tmap("", "h") --- tmap("", "j") --- tmap("", "k") --- tmap("", "l") +tmap("t", "", "h") +tmap("t", "", "j") +tmap("t", "", "k") +tmap("t", "", "l") diff --git a/lua/config/lazy.lua b/lua/solo/lazy.lua similarity index 100% rename from lua/config/lazy.lua rename to lua/solo/lazy.lua diff --git a/lua/config/mappings.lua b/lua/solo/mappings.lua similarity index 100% rename from lua/config/mappings.lua rename to lua/solo/mappings.lua diff --git a/lua/config/options.lua b/lua/solo/options.lua similarity index 100% rename from lua/config/options.lua rename to lua/solo/options.lua diff --git a/lua/solo/snips.lua b/lua/solo/snips.lua new file mode 100644 index 0000000..88babaa --- /dev/null +++ b/lua/solo/snips.lua @@ -0,0 +1,80 @@ +if not pcall(require, "luasnip") then + return +end + +local ls = require("luasnip") +local f = ls.function_node +local s = ls.snippet +local t = ls.text_node +local i = ls.insert_node + +--[[ +local ls = require("luasnip") +local s = ls.snippet +local sn = ls.snippet_node +local isn = ls.indent_snippet_node +local t = ls.text_node +local i = ls.insert_node +local f = ls.function_node +local c = ls.choice_node +local d = ls.dynamic_node +local r = ls.restore_node +local events = require("luasnip.util.events") +local ai = require("luasnip.nodes.absolute_indexer") +local extras = require("luasnip.extras") +local l = extras.lambda +local rep = extras.rep +local p = extras.partial +local m = extras.match +local n = extras.nonempty +local dl = extras.dynamic_lambda +local fmt = require("luasnip.extras.fmt").fmt +local fmta = require("luasnip.extras.fmt").fmta +local conds = require("luasnip.extras.expand_conditions") +local postfix = require("luasnip.extras.postfix").postfix +local types = require("luasnip.util.types") +local parse = require("luasnip.util.parser").parse_snippet +local ms = ls.multi_snippet +]] + +require("luasnip/loaders/from_vscode").lazy_load() + +local shortcut = function(val) + if type(val) == "string" then + return { t({ val }), i(0) } + end + if type(val) == "table" then + for k, v in ipairs(val) do + if type(v) == "string" then + val[k] = t({ v }) + end + end + end + return val +end + +local M = {} + +M.same = function(index) + return f(function(args) + return args[1] + end, { index }) +end + +M.year = function() + return os.date("%Y") +end + +M.date = function() + return os.date("%d.%m.%Y") +end + +M.make = function(tbl) + local result = {} + for k, v in pairs(tbl) do + table.insert(result, (s({ trig = k, desc = v.desc }, shortcut(v)))) + end + return result +end + +return M diff --git a/lua/config/vimwiki.lua b/lua/solo/vimwiki.lua similarity index 100% rename from lua/config/vimwiki.lua rename to lua/solo/vimwiki.lua diff --git a/templates/Glossary.tex b/templates/Glossary.tex deleted file mode 100644 index 86538fa..0000000 --- a/templates/Glossary.tex +++ /dev/null @@ -1,144 +0,0 @@ -%%% GLOSSARY %%% - -% Add to main file - -% \usepackage[automake,nogroupskip, -% postpunc={dot},% full stop after description -% nostyles,% don't load default style packages -% % load glossaries-extra-stylemods.sty and glossary-tree.sty: -% stylemods={tree} -% ]{glossaries-extra} -% % \usepackage{glossary-superragged} -% \loadglsentries{Glossary} -% \newcommand{\g}{\glssymbol*} -% \makeglossaries - -% \printglossary[style={index}] - -%%% ENTRIES %%% -\newglossaryentry{Q}{% settings: - name = {Operator}, - symbol = {\ensuremath{\mathcal{Q}}}, - description = {stands for any $n$-place sentential operator.} -} - -\newglossaryentry{L}{% settings: - name = {Language}, - symbol = {\ensuremath{\mathcal{L}}}, - description = {includes a set of sentence letters and operators} -} - -\newglossaryentry{part}{% settings: - name = {Proper parthood}, - symbol = {\ensuremath{\sqsubset}}, - description = {is defined in terms of improper parthood} -} - -\newglossaryentry{wfas}{% settings: - name = {Well-formed atomic sentences}, - symbol = {\ensuremath{\operatorname{\texttt{wfas}}}}, - description = {generated from a stock of sentence letters} -} - -\newglossaryentry{wfs}{% settings: - name = {Well-formed sentences}, - symbol = {\ensuremath{\operatorname{\texttt{wfs}}}}, - description = {generated from a stock of sentence letters} -} - -\newglossaryentry{ext}{% settings: - name = {Extensional sentences}, - symbol = {\ensuremath{\operatorname{\texttt{ext}}}}, - description = {generated from a stock of sentence letters} -} - -\newglossaryentry{id}{% settings: - name = {Identity sentences}, - symbol = {\ensuremath{\operatorname{\texttt{id}}}}, - description = {generated from a stock of sentence letters} -} - -\newglossaryentry{nid}{% settings: - name = {Non-identity sentences}, - symbol = {\ensuremath{\operatorname{\texttt{nid}}}}, - description = {generated from a stock of sentence letters} -} - -\newglossaryentry{eq}{% settings: - name = {Equivalence sentences}, - symbol = {\ensuremath{\operatorname{\texttt{eq}}}}, - description = {generated from a stock of sentence letters} -} - -\newglossaryentry{comp}{% settings: - name = {Complexity}, - symbol = {\ensuremath{\operatorname{\texttt{comp}}}}, - description = {of a sentence} -} - -\newglossaryentry{lit}{% settings: - name = {Sentence letters}, - symbol = {\ensuremath{\mathbb{L}}}, - description = {make up the atoms of the language} -} - -\newglossaryentry{glb}{% settings: - name = {Greatest lower bound}, - symbol = {\ensuremath{\operatorname{\texttt{glb}}}}, - description = {with respect to a given order} -} - -\newglossaryentry{lub}{% settings: - name = {Least upper bound}, - symbol = {\ensuremath{\operatorname{\texttt{lub}}}}, - description = {with respect to a given order} -} - -\newglossaryentry{s}{% settings: - name = {State space}, - symbol = {\ensuremath{\mathcal{S}}}, - description = {consisting of a set of states and partial order} -} - -\newglossaryentry{M}{% settings: - name = {Model}, - symbol = {\ensuremath{\mathcal{M}}}, - description = {of the language assigns sentence letters to propositions} -} - -\newglossaryentry{N}{% settings: - name = {Normal models}, - symbol = {\ensuremath{\mathcal{N}}}, - description = {is the class of all models in which sentence letter are assigned to normal propositions} -} - -\newglossaryentry{C}{% settings: - name = {Contents}, - symbol = {\ensuremath{\mathbb{C}}}, - description = {defined over a state space} -} - -\newglossaryentry{P}{% settings: - name = {Propositions}, - symbol = {\ensuremath{\mathbb{P}}}, - description = {defined over a state space} -} - -\newglossaryentry{B}{% settings: - name = {Bilattice}, - symbol = {\ensuremath{\mathcal{B}}}, - description = {of propositions defined over a state space} -} - -\newglossaryentry{R}{% settings: - name = {Regular models}, - symbol = {\ensuremath{\mathcal{R}}}, - description = {is the class of all models in which sentence letter are assigned to regular propositions} -} - -\newglossaryentry{parteq}{% settings: - name = {Improper parthood}, - symbol = {\ensuremath{\sqsubseteq}}, - description = {is a partial order over a space of states} -} - diff --git a/templates/HandOut.tex b/templates/HandOut.tex deleted file mode 100644 index 18030ca..0000000 --- a/templates/HandOut.tex +++ /dev/null @@ -1,81 +0,0 @@ - -\documentclass[a4paper, 11pt]{article} % Font size (can be 10pt, 11pt or 12pt) and paper size (remove a4paper for US letter paper) - -\usepackage[protrusion=true,expansion=true]{microtype} % Better typography -\usepackage{graphicx} % Required for including pictures -\usepackage{wrapfig} % Allows in-line images -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\usepackage{setspace} -\usepackage{amssymb, amsmath, mathrsfs} %%Math packages -\usepackage{stmaryrd} -\usepackage{mathtools} -\usepackage{mathpazo} % Use the Palatino font -\usepackage[T1]{fontenc} % Required for accented characters -\usepackage{array} -\usepackage{bibentry} -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} - -\linespread{1.05} % Change line spacing here, Palatino benefits from a slight increase by default - -\newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -\newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -\newcommand{\interpret}[1]{\llbracket#1\rrbracket} %%Double brackets -%\DeclarePairedDelimiter\ceil{\lceil}{\rceil} - -\makeatletter -\renewcommand\@biblabel[1]{\textbf{#1.}} % Change the square brackets for each bibliography item from '[1]' to '1.' -\renewcommand{\@listI}{\itemsep=0pt} % Reduce the space between items in the itemize and enumerate environments and the bibliography - -\renewcommand{\maketitle}{ % Customize the title - do not edit title and author name here, see the TITLE block below -\begin{flushright} % Right align -{\LARGE\@title} % Increase the font size of the title - -\vspace{10pt} % Some vertical space between the title and author name - -{\@author} % Author name -\\\@date % Date - -\vspace{30pt} % Some vertical space between the author block and abstract -\end{flushright} -} - -%---------------------------------------------------------------------------------------- -% TITLE -%---------------------------------------------------------------------------------------- - -\title{\textbf{Handout Title}} % Subtitle - -\author{\textsc{CLASS OR TOPIC}\\ \em Benjamin Brast-McKie} % Institution - -\date{\today} % Date - -%---------------------------------------------------------------------------------------- - -\begin{document} - -\maketitle % Print the title section - -\thispagestyle{empty} - -%---------------------------------------------------------------------------------------- - -\section*{First Section} - -\begin{enumerate}[leftmargin=1.2in,labelsep=.15in] %,label=(\arabic*)]%,label=\roman*] -\item[\bf Definition:] Begin definition\dots -\end{enumerate} - - - - - - -\vfill - -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -\bibliography{Zotero} %%bib database found in bib folder, in bibtex folder - - -\end{document} diff --git a/templates/Letter.tex b/templates/Letter.tex deleted file mode 100644 index 09e91d6..0000000 --- a/templates/Letter.tex +++ /dev/null @@ -1,65 +0,0 @@ - -\documentclass[a4paper, 11pt]{article} % Font size (can be 10pt, 11pt or 12pt) and paper size (remove a4paper for US letter paper) - -\usepackage[protrusion=true,expansion=true]{microtype} % Better typography -\usepackage{graphicx} % Required for including pictures -\usepackage{wrapfig} % Allows in-line images -\usepackage[top=1.25in, bottom=1in, left=1.65in, right=1.65in]{geometry} %%Margins -\usepackage{mathpazo} % Use the Palatino font -\usepackage[T1]{fontenc} % Required for accented characters -\linespread{1.05} % Change line spacing here, Palatino benefits from a slight increase by default - -\makeatletter -\renewcommand\@biblabel[1]{\textbf{#1.}} % Change the square brackets for each bibliography item from '[1]' to '1.' -\renewcommand{\@listI}{\itemsep=0pt} % Reduce the space between items in the itemize and enumerate environments and the bibliography - -\renewcommand{\maketitle}{ % Customize the title - do not edit title and author name here, see the TITLE block below -\begin{flushright} -{\large\@author} % Author name -\\\@date % Date -\end{flushright} - -\begin{flushleft} % Right align -{\Large\@title} % Increase the font size of the title -\end{flushleft} -} - -%---------------------------------------------------------------------------------------- -% TITLE -%---------------------------------------------------------------------------------------- - -\title{\textbf{Dear NAME,}} % Subtitle - -\author{DATE} % Author - -\date{} % Date - -%---------------------------------------------------------------------------------------- - -\begin{document} - -\maketitle % Print the title section - -%---------------------------------------------------------------------------------------- -% ABSTRACT AND KEYWORDS -%---------------------------------------------------------------------------------------- - -%\renewcommand{\abstractname}{Summary} % Uncomment to change the name of the abstract to something else - -\pagenumbering{gobble} -\vspace{0pt} % Some vertical space between the abstract and first section - -\noindent Begin document... - - - - - - - - - - - - -\end{document} \ No newline at end of file diff --git a/templates/MacPhilArticle.tex b/templates/MacPhilArticle.tex deleted file mode 100644 index cf1a709..0000000 --- a/templates/MacPhilArticle.tex +++ /dev/null @@ -1,169 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -%%% FORMATTING %%% -\documentclass[11pt]{article} %%Font size and document presets -\usepackage[top=1in, bottom=1in, left=1.25in, right=1.25in]{geometry} %%Margins -\usepackage[protrusion=true,expansion=true]{microtype} %% Makes subtle line spacing shifts -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\setenumerate{label=(\arabic*), wide=\parindent} %%Changes enumeration style: use \begin{enumerate} -\usepackage{setspace} %%Enables \doublespacing command for double linespacing -\expandafter\def\expandafter\quote\expandafter{\quote\onehalfspacing} %%Makes 1.5 quote spacing -%\usepackage{mdwlist} %% Compressed lists, use star: \begin{enumerate*} \end{'' *} -%\usepackage{indentfirst} %%Indents first line of first paragraph of each section -%\raggedbottom %% Lose the constraint on equalising page content -%\frenchspacing %%Makes the sentence spacing single spaced -%\usepackage{multicol} %% Use \begin{multicols}{3} for three columns and \end{multicols} after - - -%%% HEADER %%% -\usepackage{fancyhdr} %%Permits \pagestyle{fancy} -\pagestyle{fancy} %%Header style -\usepackage{titlesec} %%Header style -\titlespacing*{\subsection}{\parindent}{.25in}{\wordsep}% Reduces spacing after headings -\rhead{Benjamin Brast-McKie} %%Right header -\renewcommand{\sectionmark}[1]{\markright{$\S$\thesection\ #1}} %%Left header command -\lhead{\nouppercase{$\S$\rightmark}} %%Left header - - -%%% SECTIONS %%% -\usepackage{hyperref} -%\renewcommand\thesubsubsection{P\arabic{subsubsection}} -\usepackage{tocloft}%change alignment of subsubsection in toc -\cftsetindents{subsubsection}{0.228in}{0.346in} %change alignment of subsubsection in toc -\newcommand{\hypsection}[1]{\section[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsection}[1]{\subsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsubsection}[1]{\subsubsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc - - -%%% FOOTNOTES %%% -\usepackage{scrextend} %%Allows for changes to foodnotes -\deffootnote[1em]{0in}{1em}{\textsuperscript{\thefootnotemark \ }} %%Footnote style -\setlength{\footnotesep}{0.125in} %%Space between footnotes - - -%%% SYMBOLS %%% -\usepackage{amssymb, amsmath, mathrsfs} %%Math packages -\usepackage{stmaryrd} %%Use \llbracket and \rrbracket for double brackets -%\usepackage{cancel} %%\cancel strikes out text diagonally -%\usepackage{fitch} -%\usepackage{turnstile} -%\usepackage{linguex} -%\usepackage{schemata} - - -%%% GRAPHICS %%% -%\usepackage{graphicx} -%\DeclareGraphicsExtensions{.pdf,.jpeg,.jpg} -%\usepackage{fancybox} - %\begin{figure}[ht] - %\shadowbox{\includegraphics{figure-file}}} - %\end{figure} - - -%%% CITATIONS %%% -%\usepackage{bibentry} %%Replace \bibliography{} with \nobibliography{} for no bib -%\usepackage{epigraph} %%Use \epigraph{text}{citation} -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} -% \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 -\usepackage{etoolbox} %%For \citepos -\usepackage{xstring} %%For \citepos - -\makeatletter %definition of \citepos -%\patchcmd{\NAT@test}{\else \NAT@nm}{\else \NAT@nmfmt{\NAT@nm}}{}{} %turn on for numeric citations -\DeclareRobustCommand\citepos % define \citepos - {\begingroup - \let\NAT@nmfmt\NAT@posfmt% same as for citet except with a different name format - \NAT@swafalse\let\NAT@ctype\z@\NAT@partrue - \@ifstar{\NAT@fulltrue\NAT@citetp}{\NAT@fullfalse\NAT@citetp}} - -\let\NAT@orig@nmfmt\NAT@nmfmt %makes adapt to last names ending with an 's'. -\def\NAT@posfmt#1{% - \StrRemoveBraces{#1}[\NAT@temp]% - \IfEndWith{\NAT@temp}{s} - {\NAT@orig@nmfmt{#1'}} - {\NAT@orig@nmfmt{#1's}}} -\makeatother - - -%%% DEFINITIONS FOR LOGICAL SYMBOLS AND QUOTES %%% -%\newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -%\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -%\newcommand{\ttuple}[1]{$\langle$#1$\rangle$} %%Angle brackets -%\newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -%\newcommand{\interpret}[1]{\llbracket#1\rrbracket} %%Double brackets -%\newcommand{\sq}[1]{`#1'} %%Proper opened-closed single quotation marks -%\newcommand{\dq}[1]{``#1"} %%Proper opened-closed double quotation marks -%\newcommand{\qed}[0]{$\hfill\square$} %%Box at end of proofs -%\newcommand{\qed}[0]{$\hfill\Box$} %%Box at end of proofs -%\newcommand{\parteq}[0]{\sqsubseteq} -%\renewcommand{\part}[0]{\sqsubset} -%\newcommand{\ceil}[1]{\lceil#1\rceil} %%Corner quotes -%\newcommand{\lrceil}[1]{\llceil#1\rrceil} %%Corner quotes -%\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} %%For strictif -%\DeclareMathSymbol{\strictif}{\mathrel}{symbolsC}{74} %%For strictif -%\newcommand{\M}[0]{\mathcal{M}} -%\renewcommand{\L}[0]{\mathcal{L}} - - -%%% ENVIRONMENTS %%% -%\newenvironment{senum}[2][topsep=0in, itemsep=.05in]{\begin{enumerate}[#1,topsep=0in, itemsep=.05in]\begin{singlespace}#2}{\end{singlespace}\end{enumerate}\vspace{.175in}} - - -%%%%%%%%%%%%%%%%%%%%%%%%% TITLE %%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{document} -\title{TITLE} -\author{Benjamin Brast-McKie} -\date{\today} -\maketitle -\thispagestyle{empty} - -\begin{abstract} -\noindent BEGIN ABSTRACT -\end{abstract} - -\doublespacing - - -%%%%%%%%%%%%%%%%%%%%%%%% NOTES %%%%%%%%%%%%%%%%%%%%%%%%% - - - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - - -\section{Section Title} - - - - - - - - - - -%%%%%%%%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%% - - -\newpage -\begin{small} %%Makes bib small text size -\singlespacing %%Makes single spaced -\bibliographystyle{Analysis} %%bib style found in bst folder, in bibtex folder, in texmf folder. -%\setlength{\bibsep}{0.5pt} %%Changes spacing between bib entries -\bibliography{Zotero} %%bib database found in bib folder, in bibtex folder -\thispagestyle{empty} %%Removes page numbers -\end{small} %%End makes bib small text size - -\end{document} \ No newline at end of file diff --git a/templates/MultipleAnswer.tex b/templates/MultipleAnswer.tex deleted file mode 100644 index cb15ca1..0000000 --- a/templates/MultipleAnswer.tex +++ /dev/null @@ -1,147 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Short Sectioned Assignment -% LaTeX Template -% Version 1.0 (5/5/12) -% -% This template has been downloaded from: -% http://www.LaTeXTemplates.com -% -% Original author: -% Frits Wenneker (http://www.howtotex.com) -% -% License: -% CC BY-NC-SA 3.0 (http://creativecommons.org/licenses/by-nc-sa/3.0/) -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%---------------------------------------------------------------------------------------- -% PACKAGES AND OTHER DOCUMENT CONFIGURATIONS -%---------------------------------------------------------------------------------------- - -\documentclass[paper=a4, fontsize=11pt]{scrartcl} % A4 paper and 11pt font size - -\usepackage[T1]{fontenc} % Use 8-bit encoding that has 256 glyphs -\usepackage{fourier} % Use the Adobe Utopia font for the document - comment this line to return to the LaTeX default -\usepackage[english]{babel} % English language/hyphenation -\usepackage{amsmath,amsfonts,amsthm} % Math packages - -\usepackage{lipsum} % Used for inserting dummy 'Lorem ipsum' text into the template - -\usepackage{sectsty} % Allows customizing section commands -\allsectionsfont{\centering \normalfont\scshape} % Make all sections centered, the default font and small caps - -\usepackage{fancyhdr} % Custom headers and footers -\pagestyle{fancyplain} % Makes all pages in the document conform to the custom headers and footers -\fancyhead{} % No page header - if you want one, create it in the same way as the footers below -\fancyfoot[L]{} % Empty left footer -\fancyfoot[C]{} % Empty center footer -\fancyfoot[R]{\thepage} % Page numbering for right footer -\renewcommand{\headrulewidth}{0pt} % Remove header underlines -\renewcommand{\footrulewidth}{0pt} % Remove footer underlines -\setlength{\headheight}{13.6pt} % Customize the height of the header - -\numberwithin{equation}{section} % Number equations within sections (i.e. 1.1, 1.2, 2.1, 2.2 instead of 1, 2, 3, 4) -\numberwithin{figure}{section} % Number figures within sections (i.e. 1.1, 1.2, 2.1, 2.2 instead of 1, 2, 3, 4) -\numberwithin{table}{section} % Number tables within sections (i.e. 1.1, 1.2, 2.1, 2.2 instead of 1, 2, 3, 4) - -\setlength\parindent{0pt} % Removes all indentation from paragraphs - comment this line for an assignment with lots of text - -%---------------------------------------------------------------------------------------- -% TITLE SECTION -%---------------------------------------------------------------------------------------- - -\newcommand{\horrule}[1]{\rule{\linewidth}{#1}} % Create horizontal rule command with 1 argument of height - -\title{ -\normalfont \normalsize -\textsc{university, school or department name} \\ [25pt] % Your university, school and/or department name(s) -\horrule{0.5pt} \\[0.4cm] % Thin top horizontal rule -\huge Assignment Title \\ % The assignment title -\horrule{2pt} \\[0.5cm] % Thick bottom horizontal rule -} - -\author{John Smith} % Your name - -\date{\normalsize\today} % Today's date or a custom date - -\begin{document} - -\maketitle % Print the title - -%---------------------------------------------------------------------------------------- -% PROBLEM 1 -%---------------------------------------------------------------------------------------- - -\section{Problem title} - -\lipsum[2] % Dummy text - -\begin{align} -\begin{split} -(x+y)^3 &= (x+y)^2(x+y)\\ -&=(x^2+2xy+y^2)(x+y)\\ -&=(x^3+2x^2y+xy^2) + (x^2y+2xy^2+y^3)\\ -&=x^3+3x^2y+3xy^2+y^3 -\end{split} -\end{align} - -Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies - -%------------------------------------------------ - -\subsection{Heading on level 2 (subsection)} - -Lorem ipsum dolor sit amet, consectetuer adipiscing elit. -\begin{align} -A = -\begin{bmatrix} -A_{11} & A_{21} \\ -A_{21} & A_{22} -\end{bmatrix} -\end{align} -Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. - -%------------------------------------------------ - -\subsubsection{Heading on level 3 (subsubsection)} - -\lipsum[3] % Dummy text - -\paragraph{Heading on level 4 (paragraph)} - -\lipsum[6] % Dummy text - -%---------------------------------------------------------------------------------------- -% PROBLEM 2 -%---------------------------------------------------------------------------------------- - -\section{Lists} - -%------------------------------------------------ - -\subsection{Example of list (3*itemize)} -\begin{itemize} - \item First item in a list - \begin{itemize} - \item First item in a list - \begin{itemize} - \item First item in a list - \item Second item in a list - \end{itemize} - \item Second item in a list - \end{itemize} - \item Second item in a list -\end{itemize} - -%------------------------------------------------ - -\subsection{Example of list (enumerate)} -\begin{enumerate} -\item First item in a list -\item Second item in a list -\item Third item in a list -\end{enumerate} - -%---------------------------------------------------------------------------------------- - -\end{document} \ No newline at end of file diff --git a/templates/NiceArticle.tex b/templates/NiceArticle.tex deleted file mode 100644 index 536d7df..0000000 --- a/templates/NiceArticle.tex +++ /dev/null @@ -1,63 +0,0 @@ - -\documentclass[a4paper, 11pt]{article} % Font size (can be 10pt, 11pt or 12pt) and paper size (remove a4paper for US letter paper) - -\usepackage[protrusion=true,expansion=true]{microtype} % Better typography -\usepackage{graphicx} % Required for including pictures -\usepackage{wrapfig} % Allows in-line images - -\usepackage{mathpazo} % Use the Palatino font -\usepackage[T1]{fontenc} % Required for accented characters -\linespread{1.05} % Change line spacing here, Palatino benefits from a slight increase by default - -\makeatletter -\renewcommand\@biblabel[1]{\textbf{#1.}} % Change the square brackets for each bibliography item from '[1]' to '1.' -\renewcommand{\@listI}{\itemsep=0pt} % Reduce the space between items in the itemize and enumerate environments and the bibliography - -\renewcommand{\maketitle}{ % Customize the title - do not edit title and author name here, see the TITLE block below -\begin{flushright} % Right align -{\LARGE\@title} % Increase the font size of the title - -\vspace{50pt} % Some vertical space between the title and author name - -{\large\@author} % Author name -\\\@date % Date - -\vspace{40pt} % Some vertical space between the author block and abstract -\end{flushright} -} - -%---------------------------------------------------------------------------------------- -% TITLE -%---------------------------------------------------------------------------------------- - -\title{\textbf{Unnecessarily Long Essay Title}\\ % Title -Focused and Deliciously Witty Subtitle} % Subtitle - -\author{\textsc{Ford Prefect} % Author -\\{\textit{Interstellar University}}} % Institution - -\date{\today} % Date - -%---------------------------------------------------------------------------------------- - -\begin{document} - -\maketitle % Print the title section - -%---------------------------------------------------------------------------------------- -% ABSTRACT AND KEYWORDS -%---------------------------------------------------------------------------------------- - -%\renewcommand{\abstractname}{Summary} % Uncomment to change the name of the abstract to something else - -\begin{abstract} - -\end{abstract} - -\hspace*{3,6mm}\textit{Keywords:}% Keywords - -\vspace{30pt} % Some vertical space between the abstract and first section - - - -\end{document} \ No newline at end of file diff --git a/templates/PhilBeamer.tex b/templates/PhilBeamer.tex deleted file mode 100644 index 9c8c254..0000000 --- a/templates/PhilBeamer.tex +++ /dev/null @@ -1,168 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Beamer Presentation -% LaTeX Template -% Version 1.0 (10/11/12) -% -% This template has been downloaded from: -% http://www.LaTeXTemplates.com -% -% License: -% CC BY-NC-SA 3.0 (http://creativecommons.org/licenses/by-nc-sa/3.0/) -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%---------------------------------------------------------------------------------------- -% PACKAGES AND THEMES -%---------------------------------------------------------------------------------------- - -\documentclass{beamer} - -\mode { - -% The Beamer class comes with a number of default slide themes -% which change the colors and layouts of slides. Below this is a list -% of all the themes, uncomment each in turn to see what they look like. - -%\usetheme{default} -%\usetheme{AnnArbor} -%\usetheme{Antibes} -%\usetheme{Bergen} -%\usetheme{Berkeley} -%\usetheme{Berlin} -%\usetheme{Boadilla} -%\usetheme{CambridgeUS} -%\usetheme{Copenhagen} -%\usetheme{Darmstadt} %Nice -%\usetheme{Dresden} %Nice -\usetheme{Frankfurt} %Nice -%\usetheme{Goettingen} %Sidebar -%\usetheme{Hannover} -%\usetheme{Ilmenau} -%\usetheme{JuanLesPins} -%\usetheme{Luebeck} -%\usetheme{Madrid} -%\usetheme{Malmoe} -%\usetheme{Marburg} -%\usetheme{Montpellier} -%\usetheme{PaloAlto} -%\usetheme{Pittsburgh} -%\usetheme{Rochester} -%\usetheme{Singapore} -%\usetheme{Szeged} -%\usetheme{Warsaw} - -% As well as themes, the Beamer class has a number of color themes -% for any slide theme. Uncomment each of these in turn to see how it -% changes the colors of your current slide theme. - -%\usecolortheme{albatross} -%\usecolortheme{beaver} -%\usecolortheme{beetle} -%\usecolortheme{crane} -%\usecolortheme{dolphin} -%\usecolortheme{dove} -%\usecolortheme{fly} -%\usecolortheme{lily} -%\usecolortheme{orchid} -%\usecolortheme{rose} -%\usecolortheme{seagull} -%\usecolortheme{seahorse} -%\usecolortheme{whale} -%\usecolortheme{wolverine} - -%\setbeamertemplate{footline} % To remove the footer line in all slides uncomment this line -%\setbeamertemplate{footline}[page number] % To replace the footer line in all slides with a simple slide count uncomment this line - -%\setbeamertemplate{navigation symbols}{} % To remove the navigation symbols from the bottom of all slides uncomment this line -} - -%%% SYMBOLS AND STYLES %%% - -\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n} -\DeclareMathSymbol{\strictif}{\mathrel}{symbolsC}{74} -\usepackage{multicol} -\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -\setbeamercovered{transparent} -\usepackage{graphicx} - - -%%% CITATIONS %%% -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} -\newcommand\citeapl[2][]{\citeauthor{#2}'s#1} %%Use \citeapl is for possessive author name only. -\newcommand\citea[2][]{\citeauthor{#2}#1} %%Use \citea is for author name only, with optional page numbers. -\newcommand\citepl[2][]{\citeauthor{#2}'s (\citeyear[#1]{#2})}%%The command \citepl is for possessive citations. -\usepackage{bibentry} - -\usepackage{graphicx} % Allows including images -\usepackage{booktabs} % Allows the use of \toprule, \midrule and \bottomrule in tables - -%---------------------------------------------------------------------------------------- -% TITLE PAGE -%---------------------------------------------------------------------------------------- - -\title[Short title]{Early Interpretations of the Barcan Formula} % The short title appears at the bottom of every slide, the full title is only on the title page - -\author{Benjamin Brast-McKie} % Your name -\institute[Oxford] % Your institution as it will appear on the bottom of every slide, may be shorthand to save space -{ -University of Oxford \\ % Your institution for the title page -\medskip -\textit{benjamin.brast-mckie@philosophy.ox.ac.uk} % Your email address -} -\date{\today} % Date, can be changed to a custom date - -\begin{document} - -\begin{frame} -\titlepage % Print the title page as the first slide -\end{frame} - -\begin{frame} -\frametitle{Plan} - -\tableofcontents[hideallsubsections] - -\end{frame} - -%---------------------------------------------------------------------------------------- -% PRESENTATION SLIDES -%---------------------------------------------------------------------------------------- - -%%% NOTES %%% - -%Recall: \pause for - -%Recall: ITEMIZE - -%\begin{itemize} -%\item<1-> -%\end{itemize} - -%\onslide<1->{ SLIDE } - -%\begin{itemize}[<+(1)->] -%\begin{itemize}[<+->] - -%------------------------------------------------ -\section{FIRST} -%------------------------------------------------ - -\subsection{FIRST SUB} - -\begin{frame} -\frametitle{FRAME TITLE} - - - -\end{frame} - - - - - -%---------------------------------------------------------------------------------------- -\nobibliography{Zotero} -\bibliographystyle{Phil_Review} - -\end{document} diff --git a/templates/PhilPaper.tex b/templates/PhilPaper.tex deleted file mode 100644 index 25e8ab3..0000000 --- a/templates/PhilPaper.tex +++ /dev/null @@ -1,245 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -%%% FORMATTING %%% -\documentclass[11pt]{article} %%Font size and document presets -\usepackage[a4paper, margin=4cm]{geometry} %Annina style -\usepackage[protrusion=true,expansion=true]{microtype} %% Makes subtle line spacing shifts -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\setenumerate{label=(\arabic*), wide=\parindent} %%Changes enumeration style: use \begin{enumerate} -\usepackage{setspace} %%Enables \doublespacing command for double linespacing -% \usepackage{multicol} %% Use \begin{multicols}{3} for three columns and \end{multicols} after -% \usepackage{adjmulticol} -\usepackage{verbatim} %% Enables \begin{comment} ... \end{comment} -% \usepackage{rotating} %% Enables rotating symbols -% \usepackage{lplfitch} %% logic package -% \usepackage{bold-extra} %% bold+small caps -% \usepackage{bussproofs} - - -%%% HEADER %%% -\usepackage{fancyhdr} %%Permits \pagestyle{fancy} -\pagestyle{fancy} %%Header style -\usepackage{titlesec} %%Header style -\titlespacing*{\subsection}{\parindent}{.25in}{\wordsep}% Reduces spacing after headings -\rhead{Benjamin Brast-McKie} %%Right header -\renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}} %%Left header command -\lhead{\nouppercase{$\S$\rightmark}} %%Left header - - -%%% SECTIONS %%% -\usepackage{hyperref} -% \usepackage{tocloft}%change alignment of subsubsection in toc -% \cftsetindents{subsubsection}{0.228in}{0.346in} %change alignment of subsubsection in toc -\newcommand{\hypsection}[1]{\section[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsection}[1]{\subsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsubsection}[1]{\subsubsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc - - -%%% FOOTNOTES %%% -\usepackage{scrextend} %%Allows for changes to foodnotes -\deffootnote[1em]{0in}{1em}{\textsuperscript{\thefootnotemark \ }} %%Footnote style -\setlength{\footnotesep}{0.125in} %%Space between footnotes - - -%%% SYMBOLS %%% -\usepackage{amssymb,amsmath,mathrsfs,mathabx,colonequals} %%Math packages -\usepackage{tipa} -%%% GLOSSARY %%% -% \usepackage[automake,%builds index -% nogroupskip,% makes spacing of entries uniform -% postpunc={dot},% full stop after description -% nostyles,% don't load default style packages -% % load glossaries-extra-stylemods.sty and glossary-tree.sty: -% stylemods={tree} -% ]{glossaries-extra} -% \loadglsentries{Glossary}% sources file from local project folder -% \newcommand{\g}{\glssymbol*}% unstar to allow hyperlinks -% \makeglossaries - -% \printglossary[style={index}] %Add to end - - -%%% GRAPHICS %%% -% \usepackage{graphicx} -% \DeclareGraphicsExtensions{.pdf,.jpeg,.jpg} -% \usepackage{fancybox} - % \begin{figure}[ht] - % \shadowbox{\includegraphics{figure-file}}} - % \end{figure} - - -%%% CITATIONS %%% -% \usepackage{bibentry} %%Replace \bibliography{} with \nobibliography{} for no bib -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} - % \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 -\usepackage{etoolbox} %%For \citepos -\usepackage{xstring} %%For \citepos - -\makeatletter %definition of \citepos -% \patchcmd{\NAT@test}{\else \NAT@nm}{\else \NAT@nmfmt{\NAT@nm}}{}{} %turn on for numeric citations -\DeclareRobustCommand\citepos% define \citepos - {\begingroup - \let\NAT@nmfmt\NAT@posfmt% same as for citet except with a different name format - \NAT@swafalse\let\NAT@ctype\z@\NAT@partrue - \@ifstar{\NAT@fulltrue\NAT@citetp}{\NAT@fullfalse\NAT@citetp} - } - -\let\NAT@orig@nmfmt\NAT@nmfmt %makes adapt to last names ending with an 's'. -\def\NAT@posfmt#1{% - \StrRemoveBraces{#1}[\NAT@temp]% - \IfEndWith{\NAT@temp}{s} - {\NAT@orig@nmfmt{#1'}} - {\NAT@orig@nmfmt{#1's}}} -\makeatother - -%%% DEFINITIONS FOR LOGICAL SYMBOLS AND QUOTES %%% -% \newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -% \newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -% \newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -% \newcommand{\qedp}[0]{$\hfill\Diamond$} %%Box at end of proofs -% \newcommand{\ceil}[1]{\lceil#1\rceil} %%Corner quotes -% \newcommand{\floor}[1]{\lfloor#1\rfloor} %%Corner quotes - - -%%% ENVIRONMENTS %%% -\usepackage{amsthm} - -\newtheoremstyle{theorem} -{} % Space above -{} % Space below -{\normalfont} % Theorem body font % (default is "\upshape") -{} % Indent amount -{\bfseries} % Theorem head font % (default is \mdseries) -{} % Punctuation after theorem head % default: no punctuation -{.18in} % Space after theorem head -{} % Theorem head spec -\theoremstyle{theorem} -\newtheorem{theorem}{}% theorem counter resets every \subsection -\renewcommand{\thetheorem}{T\arabic{theorem}}% Remove subsection from theorem counter representation - - -\newtheoremstyle{Lthm} -{} % Space above -{} % Space below -{\normalfont} % Theorem body font % (default is "\upshape") -{} % Indent amount -{\bfseries} % Theorem head font % (default is \mdseries) -{} % Punctuation after theorem head % default: no punctuation -{.18in} % Space after theorem head -{} % Theorem head spec -\theoremstyle{Lthm} -\newtheorem{Lthm}{}[subsection]% theorem counter resets every \subsection -\renewcommand{\theLthm}{L\arabic{Lthm}}% Remove subsection from theorem counter representation - -\newtheoremstyle{Pthm} -{} % Space above -{} % Space below -{\normalfont} % Theorem body font % (default is "\upshape") -{} % Indent amount -{\bfseries} % Theorem head font % (default is \mdseries) -{} % Punctuation after theorem head % default: no punctuation -{.18in} % Space after theorem head -{} % Theorem head spec -\theoremstyle{Pthm} -\newtheorem{Pthm}{}[subsection]% theorem counter resets every \subsection -\renewcommand{\thePthm}{P\arabic{Pthm}}% Remove subsection from theorem counter representation - -\usepackage{calc} -\makeatletter -\newcommand{\labelalign@original@item}{} -\let\labelalign@original@item\item -\newcommand*{\labelalign@envir}{labelalign} -\newlength{\labelalign@totalleftmargin} -\newlength{\labelalign@linewidth} -\newcommand{\labelalign@makelabel}[1]{\llap{#1}}% -\newcommand{\labelalign@item}[1][]{% - \setlength{\@totalleftmargin}% - {\labelalign@totalleftmargin+\widthof{\textbf{#1 }}+.25in-\leftmargin}% - \setlength{\linewidth} - {\labelalign@linewidth-\widthof{\textbf{#1 }}-.25in+\leftmargin}% - \par\parshape \@ne \@totalleftmargin \linewidth - \labelalign@original@item[\textbf{#1}]% -} -\newenvironment{labelalign} - {\list{}{\setlength{\labelwidth}{0in}% - \let\makelabel\labelalign@makelabel}% - \setlength{\labelalign@totalleftmargin}{\@totalleftmargin}% - \setlength{\labelalign@linewidth}{\linewidth}% - \renewcommand{\item}{\ifx\@currenvir\labelalign@envir - \expandafter\labelalign@item - \else - \expandafter\labelalign@original@item - \fi}} - {\endlist} -\makeatother - -%%% CROSS REFERENCES %%% -\newcounter{acount} -\newcommand{\aitem}[1]{% - \item[\bf #1] \refstepcounter{acount}\label{#1} -} -\newcommand{\aref}[1]{\hyperref[#1]{#1}} - - -%%%%%%%%%%%%%%%%%%%%%%%%% TITLE %%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{document} -\title{\sc TITLE} %\thanks{} -\author{\it Benjamin Brast-McKie} -\date{\today} -\maketitle -\thispagestyle{empty} -% \vspace{.1in} - - -\begin{abstract} -\noindent -ABSTRACT -\end{abstract} - - - -%%%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%%%% - -\hypsection{Introduction}\label{Intro} - - - - - - - - - - - - - -%%%%%%%%%%%%%%%%%%%%%%%%% GLOSSARY %%%%%%%%%%%%%%%%%%%%%%%%% - -% \printglossary[style={index}] %Add to end - -%%%%%%%%%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%%% - - -\newpage -\begin{footnotesize} %%Makes bib footnotesize text size -\singlespacing %%Makes single spaced -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -\setlength{\bibsep}{5pt} %%Changes spacing between bib entries -\bibliography{Zotero} %%bib database found in bib folder, in bibtex folder -\thispagestyle{empty} %%Removes page numbers -\end{footnotesize} %%End makes bib small text size - -\end{document} diff --git a/templates/Root.tex b/templates/Root.tex deleted file mode 100644 index d56cb86..0000000 --- a/templates/Root.tex +++ /dev/null @@ -1,207 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -%%% FORMATTING %%% -\documentclass[11pt]{report} %%Font size and document presets -\usepackage[top=1in, bottom=1in, left=1.25in, right=1.25in]{geometry} %%Margins -\usepackage[protrusion=true,expansion=true]{microtype} %% Makes subtle line spacing shifts -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\setenumerate{label=(\arabic*), wide=\parindent} %%Changes enumeration style: use \begin{enumerate} -\usepackage{setspace} %%Enables \doublespacing command for double linespacing -\expandafter\def\expandafter\quote\expandafter{\quote\onehalfspacing} %%Makes 1.5 quote spacing -%\usepackage{mdwlist} %% Compressed lists, use star: \begin{enumerate*} \end{'' *} -%\usepackage{indentfirst} %%Indents first line of first paragraph of each section -%\raggedbottom %% Lose the constraint on equalising page content -%\frenchspacing %%Makes the sentence spacing single spaced -%\usepackage{multicol} %% Use \begin{multicols}{3} for three columns and \end{multicols} after - - -%%% MULTIPLE FILES %%% -\usepackage{subfiles} -\usepackage{hyperref} -\usepackage{bibentry} - - -%%% HYPER SECTIONS %%% -\usepackage{bold-extra} %% bold+small caps -\usepackage{titlesec} -\usepackage{tocloft} %% change alignment of subsubsection in toc -%\cftsetindents{subsubsubsection}{0.228in}{0.346in} %change alignment of subsubsection in toc -\newcommand{\hypsection}[1]{\section[\bfseries{\scshape{#1}}]{\hyperlink{toc}{\sc \textbf{#1}}}} %%use to jump back to toc -\newcommand{\schapter}[1]{\chapter[\bfseries{\scshape{#1}}]{\hyperlink{toc}{\LARGE#1}}} %%use to jump back to toc -\newcommand{\hypsubsection}[1]{\subsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsubsection}[1]{\subsubsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypasubsubsection}[1]{\subsubsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\Psubsection}[2][]{\subsubsubsection[\normalfont{#2}]{\hyperlink{#1}{\normalfont{#2}}}\label{#1}} %%use to jump back to toc -\newcommand{\Lsubsection}[2][]{\Lthm[\normalfont{#2}]{\hyperlink{#1}{\normalfont{#2}}}\label{#1}} %%use to jump back to toc -% \renewcommand{\href}[1]{\hypertarget{#1}{\ref{#1}}} %%use to jump back to toc - \makeatletter - \renewcommand{\href}[1]{\Hy@raisedlink{\hypertarget{#1}{}}\ref{#1}} - \makeatother - - -\titleclass{\subsubsubsection}{straight}[\subsection] -\newcounter{subsubsubsection}[subsubsection] -\renewcommand\thesubsubsubsection{\arabic{section}.\arabic{subsubsubsection}} -\renewcommand\theparagraph{\arabic{section}.\arabic{paragraph}} % optional; useful if paragraphs are to be numbered - -\titleformat{\subsubsubsection} - {\normalfont\normalsize\bfseries}{\thesubsubsubsection}{1em}{} - -\titlespacing*{\subsubsubsection} -{0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex} - -\titleformat{\paragraph} - {\normalfont\normalsize\bfseries}{\theparagraph}{1em}{} - -\titlespacing*{\paragraph} -{0pt}{3.25ex plus 1ex minus .2ex}{1.5ex plus .2ex} - -\makeatletter -\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% - {-2.5ex\@plus -1ex \@minus -.25ex}% - {1.25ex \@plus .25ex}% - {\normalfont\normalsize\bfseries}} -\def\toclevel@subsubsubsection{2} -\def\toclevel@paragraph{4} -\def\l@subsubsubsection{\@dottedtocline{2}{1.5em}{2.3em}} -\def\l@paragraph{\@dottedtocline{4}{10em}{5em}} -\makeatother - -\setcounter{secnumdepth}{2} -\setcounter{secnumdepth}{4} -\setcounter{tocdepth}{1} -%\renewcommand\thesection{\sc\LARGE Chapter \arabic{section}:} -%\renewcommand\thesubsection{\arabic{section}.\arabic{subsection}} -\renewcommand\thesubsubsubsection{P\arabic{subsubsubsection}} -\renewcommand\theparagraph{L\arabic{paragraph}} - - - -%%% HEADER %%% -\usepackage{fancyhdr} %%Permits \pagestyle{fancy} -\pagestyle{fancy} %%Header style -\usepackage{titlesec} %%Header style -\titlespacing*{\subsection}{\parindent}{.25in}{\wordsep}% Reduces spacing after headings -\rhead{Benjamin Brast-McKie} %%Right header -\renewcommand{\sectionmark}[1]{\markright{$\S$\thesection\ #1}} %%Left header command -\renewcommand{\chaptermark}[1]{\markright{#1}{}} -\lhead{\nouppercase{\rightmark}} %%Left header - - -%%% FOOTNOTES %%% -\usepackage{scrextend} %%Allows for changes to foodnotes -\deffootnote[1em]{0in}{1em}{\textsuperscript{\thefootnotemark \ }} %%Footnote style -\setlength{\footnotesep}{0.125in} %%Space between footnotes - -%%% SYMBOLS %%% -\usepackage{amssymb, amsmath, mathrsfs} %%Math packages -\usepackage{stmaryrd} %%Use \llbracket and \rrbracket for double brackets -%\usepackage{cancel} %%\cancel strikes out text diagonally -%\usepackage{fitch} -%\usepackage{turnstile} -%\usepackage{linguex} -%\usepackage{schemata} - -%%% GRAPHICS %%% -%\usepackage{graphicx} -%\DeclareGraphicsExtensions{.pdf,.jpeg,.jpg} -%\usepackage{fancybox} - %\begin{figure}[ht] - %\shadowbox{\includegraphics{figure-file}}} - %\end{figure} - -%%% CITATIONS %%% -%\usepackage{bibentry} %%Replace \bibliography{} with \nobibliography{} for no bib -%\usepackage{epigraph} %%Use \epigraph{text}{citation} -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} -\newcommand\citepl[2][]{\citeauthor{#2}'s (\citeyear[#1]{#2})} %%Use \citepl for possessive citation. -\newcommand\citea[2][]{\citeauthor{#2}#1} %%Use \citea is for author name only, with optional page numbers. -\newcommand\citeapl[2][]{\citeauthor{#2}'s#1} %%Use \citeapl is for possessive author name only. -% \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 - - -%%% DEFINITIONS FOR LOGICAL SYMBOLS AND QUOTES %%% -%\newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -%\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -%\newcommand{\ttuple}[1]{$\langle$#1$\rangle$} %%Angle brackets -%\newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -%\newcommand{\interpret}[1]{\llbracket#1\rrbracket} %%Double brackets -%\newcommand{\sq}[1]{`#1'} %%Proper opened-closed single quotation marks -%\newcommand{\dq}[1]{``#1"} %%Proper opened-closed double quotation marks -%\newcommand{\qed}[0]{$\hfill\square$} %%Box at end of proofs - - -%%% ENVIRONMENTS %%% -%\newenvironment{senum}[2][topsep=0in, itemsep=.05in]{\begin{enumerate}[#1,topsep=0in, itemsep=.05in]\begin{singlespace}#2}{\end{singlespace}\end{enumerate}\vspace{.175in}} - - - -%%%%%%%%%%%%%%%%%%%%%%%%% TITLE %%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{document} -\title{TITLE} -\author{Benjamin Brast-McKie} -\date{\today} -\maketitle -\thispagestyle{empty} - -\begin{abstract} -\noindent BEGIN ABSTRACT -\end{abstract} - -\setlength\cftaftertoctitleskip{10pt} -\addtocontents{toc}{\protect\hypertarget{toc}{}} -\renewcommand{\contentsname}{\LARGE\sc Table of Contents} - -\strut\vspace{-50pt} -\tableofcontents -\thispagestyle{empty} - -\pagebreak - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - -\doublespacing - -% \section*{Introduction} % Turn on to included introduction in TOC -% \addcontentsline{toc}{chapter}{\protect\numberline{}Introduction}% - -\subfile{Chapters/Ch1/Ch1} - -\subfile{Chapters/Ch2/Ch2} - -% \section*{Conclusion} -% \addcontentsline{toc}{chapter}{\protect\numberline{}Conclusion}% - - - - - - - - - -%%%%%%%%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%% - - -\newpage -\begin{small} %%Makes bib small text size -\singlespacing %%Makes single spaced -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -%\setlength{\bibsep}{0.5pt} %%Changes spacing between bib entries -\bibliography{Zotero} %%bib database found in bib folder, in bibtex folder -\thispagestyle{empty} %%Removes page numbers -\end{small} %%End makes bib small text size - -\end{document} diff --git a/templates/SubFile.tex b/templates/SubFile.tex deleted file mode 100644 index 1f0b740..0000000 --- a/templates/SubFile.tex +++ /dev/null @@ -1,43 +0,0 @@ -%NOTE: to be used with \usepackage{subfiles} in the main file. -%Subfiles go in folders which live with the main file. -%Bibliography and preamble go in the main file. - -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -\documentclass[../../Root.tex]{subfiles} %Each instance of `../' elevates one folder to find the main file - -\begin{document} - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - -% \tableofcontents % Can be useful to load a TOC while writing - -\doublespacing - -\schapter{TITLE} - -\hypsection{TITLE} - -\hypsubsection{TITLE} - - - - - - - - - - - - - - - - - - -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -\nobibliography{Zotero} %%bib database found in bib folder, in bibtex folder - -\end{document} diff --git a/templates/Subfiles/Chapters/Ch1/Ch1.tex b/templates/Subfiles/Chapters/Ch1/Ch1.tex deleted file mode 100644 index 50a848f..0000000 --- a/templates/Subfiles/Chapters/Ch1/Ch1.tex +++ /dev/null @@ -1,41 +0,0 @@ -%NOTE: to be used with \usepackage{subfiles} in the main file. -%Subfiles go in folders which live with the main file. -%Bibliography and preamble go in the main file. - -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -\documentclass[../../Root.tex]{subfiles} %Each instance of `../' elevates one folder to find the main file - -\begin{document} - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - -\tableofcontents - -\doublespacing - -\section{TITLE} - - - - - - - - - - - - - - - - - - - - -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -\nobibliography{Zotero} %%bib database found in bib folder, in bibtex folder - -\end{document} diff --git a/templates/Subfiles/Chapters/Ch2/Ch2.tex b/templates/Subfiles/Chapters/Ch2/Ch2.tex deleted file mode 100644 index 0f7f9aa..0000000 --- a/templates/Subfiles/Chapters/Ch2/Ch2.tex +++ /dev/null @@ -1,43 +0,0 @@ -%NOTE: to be used with \usepackage{subfiles} in the main file. -%Subfiles go in folders which live with the main file. -%Bibliography and preamble go in the main file. - -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -\documentclass[../../Root.tex]{subfiles} %Each instance of `../' elevates one folder to find the main file - -\begin{document} - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - -\tableofcontents - -\doublespacing - -\schapter{TITLE} - -\section{TITLE} - - - - - - - - - - - - - - - - - - - - -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -\nobibliography{Zotero} %%bib database found in bib folder, in bibtex folder - -\end{document} diff --git a/templates/Subfiles/Root.tex b/templates/Subfiles/Root.tex deleted file mode 100644 index 26d4185..0000000 --- a/templates/Subfiles/Root.tex +++ /dev/null @@ -1,155 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -%%% FORMATTING %%% -\documentclass[11pt]{report} %%Font size and document presets -\usepackage[top=1in, bottom=1in, left=1.25in, right=1.25in]{geometry} %%Margins -\usepackage[protrusion=true,expansion=true]{microtype} %% Makes subtle line spacing shifts -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\setenumerate{label=(\arabic*), wide=\parindent} %%Changes enumeration style: use \begin{enumerate} -\usepackage{setspace} %%Enables \doublespacing command for double linespacing -\expandafter\def\expandafter\quote\expandafter{\quote\onehalfspacing} %%Makes 1.5 quote spacing -%\usepackage{mdwlist} %% Compressed lists, use star: \begin{enumerate*} \end{'' *} -%\usepackage{indentfirst} %%Indents first line of first paragraph of each section -%\raggedbottom %% Lose the constraint on equalising page content -%\frenchspacing %%Makes the sentence spacing single spaced -%\usepackage{multicol} %% Use \begin{multicols}{3} for three columns and \end{multicols} after - - -%%% MULTIPLE FILES %%% -\usepackage{subfiles} -\usepackage{hyperref} -\usepackage{bibentry} - - -%%% HYPER SECTIONS %%% -\usepackage{bold-extra} %% bold+small caps -\usepackage{titlesec} -\usepackage{tocloft} %% change alignment of subsubsection in toc -%\cftsetindents{subsubsubsection}{0.228in}{0.346in} %change alignment of subsubsection in toc -\newcommand{\hypsection}[1]{\section[\bfseries{\scshape{#1}}]{\hyperlink{toc}{\sc \textbf{#1}}}} %%use to jump back to toc -\newcommand{\schapter}[1]{\chapter[\bfseries{\scshape{#1}}]{\hyperlink{toc}{\LARGE#1}}} %%use to jump back to toc -\newcommand{\hypsubsection}[1]{\subsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsubsection}[1]{\subsubsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc - - -%%% HEADER %%% -\usepackage{fancyhdr} %%Permits \pagestyle{fancy} -\pagestyle{fancy} %%Header style -\usepackage{titlesec} %%Header style -\titlespacing*{\subsection}{\parindent}{.25in}{\wordsep}% Reduces spacing after headings -\rhead{Benjamin Brast-McKie} %%Right header -\renewcommand{\sectionmark}[1]{\markright{$\S$\thesection\ #1}} %%Left header command -\lhead{\nouppercase{\rightmark}} %%Left header - -%%% FOOTNOTES %%% -\usepackage{scrextend} %%Allows for changes to foodnotes -\deffootnote[1em]{0in}{1em}{\textsuperscript{\thefootnotemark \ }} %%Footnote style -\setlength{\footnotesep}{0.125in} %%Space between footnotes - -%%% SYMBOLS %%% -\usepackage{amssymb, amsmath, mathrsfs} %%Math packages -\usepackage{stmaryrd} %%Use \llbracket and \rrbracket for double brackets -%\usepackage{cancel} %%\cancel strikes out text diagonally -%\usepackage{fitch} -%\usepackage{turnstile} -%\usepackage{linguex} -%\usepackage{schemata} - -%%% GRAPHICS %%% -%\usepackage{graphicx} -%\DeclareGraphicsExtensions{.pdf,.jpeg,.jpg} -%\usepackage{fancybox} - %\begin{figure}[ht] - %\shadowbox{\includegraphics{figure-file}}} - %\end{figure} - -%%% CITATIONS %%% -%\usepackage{bibentry} %%Replace \bibliography{} with \nobibliography{} for no bib -%\usepackage{epigraph} %%Use \epigraph{text}{citation} -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} -\newcommand\citepl[2][]{\citeauthor{#2}'s (\citeyear[#1]{#2})} %%Use \citepl for possessive citation. -\newcommand\citea[2][]{\citeauthor{#2}#1} %%Use \citea is for author name only, with optional page numbers. -\newcommand\citeapl[2][]{\citeauthor{#2}'s#1} %%Use \citeapl is for possessive author name only. -% \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 - - -%%% DEFINITIONS FOR LOGICAL SYMBOLS AND QUOTES %%% -%\newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -%\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -%\newcommand{\ttuple}[1]{$\langle$#1$\rangle$} %%Angle brackets -%\newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -%\newcommand{\interpret}[1]{\llbracket#1\rrbracket} %%Double brackets -%\newcommand{\sq}[1]{`#1'} %%Proper opened-closed single quotation marks -%\newcommand{\dq}[1]{``#1"} %%Proper opened-closed double quotation marks -%\newcommand{\qed}[0]{$\hfill\square$} %%Box at end of proofs - - -%%% ENVIRONMENTS %%% -%\newenvironment{senum}[2][topsep=0in, itemsep=.05in]{\begin{enumerate}[#1,topsep=0in, itemsep=.05in]\begin{singlespace}#2}{\end{singlespace}\end{enumerate}\vspace{.175in}} - - - -%%%%%%%%%%%%%%%%%%%%%%%%% TITLE %%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{document} -\title{TITLE} -\author{Benjamin Brast-McKie} -\date{\today} -\maketitle -\thispagestyle{empty} - -\begin{abstract} -\noindent BEGIN ABSTRACT -\end{abstract} - -\tableofcontents - -\pagebreak - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - -\doublespacing - -\section*{Introduction} -\addcontentsline{toc}{section}{\protect\numberline{}Introduction}% - - -\subfile{Chapters/Ch1/Ch1} - -\subfile{Chapters/Ch2/Ch2} - -\section*{Conclusion} -\addcontentsline{toc}{section}{\protect\numberline{}Conclusion}% - - - - - - - - - -%%%%%%%%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%% - - -\newpage -\begin{small} %%Makes bib small text size -\singlespacing %%Makes single spaced -\bibliographystyle{PhilReview} %%bib style found in bst folder, in bibtex folder, in texmf folder. -%\setlength{\bibsep}{0.5pt} %%Changes spacing between bib entries -\bibliography{Zotero} %%bib database found in bib folder, in bibtex folder -\thispagestyle{empty} %%Removes page numbers -\end{small} %%End makes bib small text size - -\end{document} \ No newline at end of file diff --git a/templates/Thesis.tex b/templates/Thesis.tex deleted file mode 100644 index 5298485..0000000 --- a/templates/Thesis.tex +++ /dev/null @@ -1,154 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -%%% FORMATTING %%% -\documentclass[11pt]{report} %%Font size and document presets -\usepackage[top=1in, bottom=1in, left=1.25in, right=1.25in]{geometry} %%Margins -\usepackage[protrusion=true,expansion=true]{microtype} %% Makes subtle line spacing shifts -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\setenumerate{label=(\arabic*), wide=\parindent} %%Changes enumeration style: use \begin{enumerate} -\usepackage{setspace} %%Enables \doublespacing command for double linespacing -\expandafter\def\expandafter\quote\expandafter{\quote\onehalfspacing} %%Makes 1.5 quote spacing -%\usepackage{mdwlist} %% Compressed lists, use star: \begin{enumerate*} \end{'' *} -%\usepackage{indentfirst} %%Indents first line of first paragraph of each section -%\raggedbottom %% Lose the constraint on equalising page content -%\frenchspacing %%Makes the sentence spacing single spaced -%\usepackage{multicol} %% Use \begin{multicols}{3} for three columns and \end{multicols} after - - -%%% MULTIPLE FILES %%% -\usepackage{subfiles} -\usepackage{hyperref} -\usepackage{bibentry} - - -%%% HYPER SECTIONS %%% -\usepackage{bold-extra} %% bold+small caps -\usepackage{titlesec} -\usepackage{tocloft} %% change alignment of subsubsection in toc -%\cftsetindents{subsubsubsection}{0.228in}{0.346in} %change alignment of subsubsection in toc -\newcommand{\hypsection}[1]{\section[\bfseries{\scshape{#1}}]{\hyperlink{toc}{\sc \textbf{#1}}}} %%use to jump back to toc -\newcommand{\hypsubsection}[1]{\subsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc -\newcommand{\hypsubsubsection}[1]{\subsubsection[#1]{\hyperlink{toc}{#1}}} %%use to jump back to toc - - -%%% HEADER %%% -\usepackage{fancyhdr} %%Permits \pagestyle{fancy} -\pagestyle{fancy} %%Header style -\usepackage{titlesec} %%Header style -\titlespacing*{\subsection}{\parindent}{.25in}{\wordsep}% Reduces spacing after headings -\rhead{Benjamin Brast-McKie} %%Right header -\renewcommand{\sectionmark}[1]{\markright{$\S$\thesection\ #1}} %%Left header command -\lhead{\nouppercase{\rightmark}} %%Left header - -%%% FOOTNOTES %%% -\usepackage{scrextend} %%Allows for changes to foodnotes -\deffootnote[1em]{0in}{1em}{\textsuperscript{\thefootnotemark \ }} %%Footnote style -\setlength{\footnotesep}{0.125in} %%Space between footnotes - -%%% SYMBOLS %%% -\usepackage{amssymb, amsmath, mathrsfs} %%Math packages -\usepackage{stmaryrd} %%Use \llbracket and \rrbracket for double brackets -%\usepackage{cancel} %%\cancel strikes out text diagonally -%\usepackage{fitch} -%\usepackage{turnstile} -%\usepackage{linguex} -%\usepackage{schemata} - -%%% GRAPHICS %%% -%\usepackage{graphicx} -%\DeclareGraphicsExtensions{.pdf,.jpeg,.jpg} -%\usepackage{fancybox} - %\begin{figure}[ht] - %\shadowbox{\includegraphics{figure-file}}} - %\end{figure} - -%%% CITATIONS %%% -%\usepackage{bibentry} %%Replace \bibliography{} with \nobibliography{} for no bib -%\usepackage{epigraph} %%Use \epigraph{text}{citation} -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} -\newcommand\citepl[2][]{\citeauthor{#2}'s (\citeyear[#1]{#2})} %%Use \citepl for possessive citation. -\newcommand\citea[2][]{\citeauthor{#2}#1} %%Use \citea is for author name only, with optional page numbers. -\newcommand\citeapl[2][]{\citeauthor{#2}'s#1} %%Use \citeapl is for possessive author name only. -% \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 - - -%%% DEFINITIONS FOR LOGICAL SYMBOLS AND QUOTES %%% -%\newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -%\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -%\newcommand{\ttuple}[1]{$\langle$#1$\rangle$} %%Angle brackets -%\newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -%\newcommand{\interpret}[1]{\llbracket#1\rrbracket} %%Double brackets -%\newcommand{\sq}[1]{`#1'} %%Proper opened-closed single quotation marks -%\newcommand{\dq}[1]{``#1"} %%Proper opened-closed double quotation marks -%\newcommand{\qed}[0]{$\hfill\square$} %%Box at end of proofs - - -%%% ENVIRONMENTS %%% -%\newenvironment{senum}[2][topsep=0in, itemsep=.05in]{\begin{enumerate}[#1,topsep=0in, itemsep=.05in]\begin{singlespace}#2}{\end{singlespace}\end{enumerate}\vspace{.175in}} - - - -%%%%%%%%%%%%%%%%%%%%%%%%% TITLE %%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{document} -\title{TITLE} -\author{Benjamin Brast-McKie} -\date{\today} -\maketitle -\thispagestyle{empty} - -\begin{abstract} -\noindent BEGIN ABSTRACT -\end{abstract} - -\tableofcontents - -\pagebreak - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - -\doublespacing - -\section*{Introduction} -\addcontentsline{toc}{section}{\protect\numberline{}Introduction}% - - -\subfile{Chapters/Ch1/FirstFile} - -\subfile{Chapters/Ch2/SecondFile} - -\section*{Conclusion} -\addcontentsline{toc}{section}{\protect\numberline{}Conclusion}% - - - - - - - - - -%%%%%%%%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%% - - -\newpage -\begin{small} %%Makes bib small text size -\singlespacing %%Makes single spaced -\bibliographystyle{Phil_Review} %%bib style found in bst folder, in bibtex folder, in texmf folder. -%\setlength{\bibsep}{0.5pt} %%Changes spacing between bib entries -\bibliography{Zotero} %%bib database found in bib folder, in bibtex folder -\thispagestyle{empty} %%Removes page numbers -\end{small} %%End makes bib small text size - -\end{document} diff --git a/templates/TikZArc.tex b/templates/TikZArc.tex deleted file mode 100644 index 452e298..0000000 --- a/templates/TikZArc.tex +++ /dev/null @@ -1,243 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%% TikZ Example %%%%%%%%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\documentclass[11pt]{article} - -%################################################ -%######## Packages ######## -%################################################ - -\usepackage{tikz} % Diagrams -\usetikzlibrary{positioning,arrows,shadows,shapes,patterns,decorations.pathmorphing} % Some TikZ libraries - -%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -%>>>>>> Setup >>>>>> -%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - -\tikzset{ -modal/.style={ - >=stealth', - shorten >=1pt, - shorten <=1pt, - auto, - node distance=2cm, - semithick -}, -state/.style={ - circle, - draw, - minimum size=0.5cm, - fill=gray!15 -}, -point/.style={ - circle, - draw, - inner sep=0.5mm, - fill=black -}, -sees/.style={ - -> -}, -seen/.style={ - <- -}, -seens/.style={ - <-> -}, -rfl/.style={ - ->, - in=120, - out=60, - loop, - looseness=5 -}} - -\newcommand{\stack}[1]{{\def\arraystretch{0.6}\begin{array}{c} #1 \end{array}}} - -%:::::::::::::::::::::::::::::::::::::::::::::::: -%:::::: Front Matter :::::: -%:::::::::::::::::::::::::::::::::::::::::::::::: - -\begin{document} - -\textbf{Example 1:} - -\begin{center} -\begin{tikzpicture}[modal, node distance=1cm] -\node[point] (p1) [label=above:$p_1$] {}; -\node[point] (p2) [right of=p1, label=above:$\stack{p_1 \\ p_2}$] {}; -\node[point] (p3) [right of=p2, label=above:$\stack{p_1 \\ p_2 \\ p_3}$] {}; -\node[point] (r) [below of=p2, label=below:$t_\mathsf{root}$] {}; -\node (con) [right of=p3] {$\cdots$}; -\node[point] (pw) [right of=con, label=above:$\stack{p_1 \\ p_2 \\ p_3 \\ \vdots}$, label=right:``$t_\omega$''] {}; -\node (T') [below of=r] {$\mathcal{T}$}; - -\path (r) edge[sees] (p1); -\path (r) edge[sees] (p2); -\path (r) edge[sees] (p3); -\path (r) edge[sees,dashed, bend right=25] (pw); -\end{tikzpicture} -\end{center} - -\textbf{Example 2:} - -\begin{center} -\begin{tikzpicture}[modal, node distance=1.5cm] -\node[point] (0) [label=above:$p_1$, label=below:$0$] {}; -\node[point] (1) [right of=0, label=above:$p_2$, label=below:$1$] {}; -\node[point] (2) [right of=1, label=above:$p_1$, label=below:$2$] {}; -\node[point] (3) [right of=2, label=above:$p_2$, label=below:$3$] {}; -\node (r) [right of=3] {$\cdots$}; -\node[point] (-1) [left of=0, label=above:$p_2$, label=below:$-1$] {}; -\node[point] (-2) [left of=-1, label=above:$p_1$, label=below:$-2$] {}; -\node[point] (-3) [left of=-2, label=above:$p_2$, label=below:$-3$] {}; -\node (l) [left of=-3] {$\cdots$}; - -\path (l) edge[sees] (-3); -\path (-3) edge[sees] (-2); -\path (-2) edge[sees] (-1); -\path (-1) edge[sees] (0); -\path (0) edge[sees] (1); -\path (1) edge[sees] (2); -\path (2) edge[sees] (3); -\path (3) edge[sees] (r); -\end{tikzpicture} -\end{center} - -\textbf{Example 3:} - -\begin{center} -\begin{tikzpicture}[modal, node distance=1.5cm] -\node[point] (e) [label=above:$p_1$, label=below:$e$] {}; -\node[point] (m) [right of=e, label=below:$m$] {}; -\node[point] (o) [right of=m, label=above:$p_2$, label=below:$o$] {}; - -\path (e) edge[sees, bend left=25] (m); -\path (m) edge[sees, bend left=25] (e); -\path (o) edge[sees, bend left=25] (m); -\path (m) edge[sees, bend left=25] (o); -\path (m) edge[rfl, in=60, out=120, looseness=30] (m); -\end{tikzpicture} -\end{center} - -\textbf{Example 4:} - -\begin{center} -\begin{tikzpicture}[modal] -\node (r) {$t_\mathsf{root}$}; -\node (1p1) [above left=5mm of r] {$p_1$}; -\node (1p2) [above left=5mm of 1p1] {$p_2$}; -\node (1p3) [above left=5mm of 1p2] {$p_3$}; -\node (1pd) [above left=-2mm of 1p3] {\rotatebox[origin=c]{-10}{$\ddots$}}; - -\node (2p1) [above=5mm of r] {$p_1$}; -\node (2p2) [above=5mm of 2p1] {$p_1$}; -\node (2p3) [above=5mm of 2p2] {$p_2$}; -\node (2p4) [above=5mm of 2p3] {$p_3$}; -\node (2pd) [above=1mm of 2p4] {$\vdots$}; - -\node (3p1) [above right=5mm of r] {$p_1$}; -\node (3p2) [above right=5mm of 3p1] {$p_1$}; -\node (3p3) [above right=5mm of 3p2] {$p_1$}; -\node (3p4) [above right=5mm of 3p3] {$p_2$}; -\node (3p5) [above right=5mm of 3p4] {$p_3$}; -\node (3pd) [above right=-2mm of 3p5] {\rotatebox[origin=c]{80}{$\ddots$}}; - -\node (con) [below right=1mm of 3p3] {$\ddots$}; -\node (cont) [below right=1mm of con] {$\vdots$}; - -\node (wp1) [right=5mm of r] {$p_1$}; -\node (wp2) [right=5mm of wp1] {$p_1$}; -\node (wp3) [right=5mm of wp2] {$p_1$}; -\node (wp4) [right=5mm of wp3] {$p_1$}; -\node (wpd) [right=0mm of wp4] {$\dots$}; - - -\path (r) edge[sees] (1p1); -\path (r) edge[sees] (2p1); -\path (r) edge[sees] (3p1); -\path (r) edge[sees] (wp1); - -\path (1p1) edge[sees] (1p2); -\path (1p2) edge[sees] (1p3); - -\path (2p1) edge[sees] (2p2); -\path (2p2) edge[sees] (2p3); -\path (2p3) edge[sees] (2p4); - -\path (3p1) edge[sees] (3p2); -\path (3p2) edge[sees] (3p3); -\path (3p3) edge[sees] (3p4); -\path (3p4) edge[sees] (3p5); - -\path (wp1) edge[sees] (wp2); -\path (wp2) edge[sees] (wp3); -\path (wp3) edge[sees] (wp4); -\end{tikzpicture} -\end{center} - -\pagebreak -\textbf{Example 5:} - -\begin{center} -\begin{tikzpicture}[modal] -\node[state] (h1) {H}; -\node[state] (h2) [right of = h1] {H}; -\node[state] (h3) [right of = h2] {H}; -\node[state] (t1) [above right of = h1] {T}; -\node[state] (t2) [above right of = h2] {T}; -\node[state] (t3) [above right of = h3] {T}; -\node (e) [right of = h3] {\dots}; - -\path (h1) edge[rfl, in=150, out=210] (h1); -\path (t1) edge[rfl] (t1); - -\path (h1) edge[sees] (h2); -\path (h2) edge[sees] (h3); -\path (h3) edge[sees] (e); - -\path (h1) edge[sees,dashed] (t1); -\path (h2) edge[sees,dashed] (t2); -\path (h3) edge[sees,dashed] (t3); -\end{tikzpicture} -\end{center} - -\textbf{Example 6:} - -\begin{center} -\begin{tikzpicture}[node distance=1ex] -\node (A->B) {$A \rightarrow B$}; -\node (A&-B) [below=of A->B] {$A \wedge \neg B$}; -\node (-A) [below left=7mm of A&-B] {$\neg A$}; -\node (A) [below=of -A] {$A$}; -\node (x-A) [below=of A] {$\times$}; -\node (B) [below right=7mm of A&-B] {$B$}; -\node (A2) at (x-A -| B) [yshift=-7mm] {$A$}; -\node (-B) [below=of A2] {$\neg B$}; -\node (x-B) [below=of -B] {$\times$}; - -\path (A&-B) edge[-] (-A); -\path (A&-B) edge[-] (B); -\path (B) edge[-] (A2); - -\node (1) [left=2cm of A->B] {1.}; -\node (2) at (1 |- A&-B) {2.}; -\node (3) at (1 |- -A) {3.}; -\node (4) at (1 |- A) {4.}; -\node (5) at (1 |- A2) {5.}; -\node (6) at (1 |- -B) {6.}; - -\path (5) edge[-,dashed] (A2); -\path (6) edge[-,dotted] (-B); - -\node (r1) [right=2cm of A->B] {P}; -\node (r2) at (r1 |- A&-B) {P}; -\node (r3) at (r1 |- -A) {($\rightarrow$), 1}; -\node (r4) at (r1 |- A) {($\wedge$), 2}; -\node (r5) at (r1 |- A2) {($\wedge$), 2}; -\node (r6) at (r1 |- -B) {($\wedge$), 2}; -\end{tikzpicture} -\end{center} - - -\end{document} \ No newline at end of file diff --git a/templates/TuftsSample.tex b/templates/TuftsSample.tex deleted file mode 100644 index 0b5786d..0000000 --- a/templates/TuftsSample.tex +++ /dev/null @@ -1,300 +0,0 @@ -\documentclass{tufte-handout} - -%\geometry{showframe}% for debugging purposes -- displays the margins - -\usepackage{amsmath} - -% Set up the images/graphics package -\usepackage{graphicx} -\setkeys{Gin}{width=\linewidth,totalheight=\textheight,keepaspectratio} -\graphicspath{{graphics/}} - -\title{An Example of the Usage of the Tufte-Handout Style\thanks{Inspired by Edward~R. Tufte!}} -\author[The Tufte-LaTeX Developers]{The Tufte-\LaTeX\ Developers} -\date{24 January 2009} % if the \date{} command is left out, the current date will be used - -% The following package makes prettier tables. We're all about the bling! -\usepackage{booktabs} - -% The units package provides nice, non-stacked fractions and better spacing -% for units. -\usepackage{units} - -% The fancyvrb package lets us customize the formatting of verbatim -% environments. We use a slightly smaller font. -\usepackage{fancyvrb} -\fvset{fontsize=\normalsize} - -% Small sections of multiple columns -\usepackage{multicol} - -% Provides paragraphs of dummy text -\usepackage{lipsum} - -% These commands are used to pretty-print LaTeX commands -\newcommand{\doccmd}[1]{\texttt{\textbackslash#1}}% command name -- adds backslash automatically -\newcommand{\docopt}[1]{\ensuremath{\langle}\textrm{\textit{#1}}\ensuremath{\rangle}}% optional command argument -\newcommand{\docarg}[1]{\textrm{\textit{#1}}}% (required) command argument -\newenvironment{docspec}{\begin{quote}\noindent}{\end{quote}}% command specification environment -\newcommand{\docenv}[1]{\textsf{#1}}% environment name -\newcommand{\docpkg}[1]{\texttt{#1}}% package name -\newcommand{\doccls}[1]{\texttt{#1}}% document class name -\newcommand{\docclsopt}[1]{\texttt{#1}}% document class option name - -\begin{document} - -\maketitle% this prints the handout title, author, and date - -\begin{abstract} -\noindent This document describes the Tufte handout \LaTeX\ document style. -It also provides examples and comments on the style's use. Only a brief -overview is presented here; for a complete reference, see the sample book. -\end{abstract} - -%\printclassoptions - -The Tufte-\LaTeX\ document classes define a style similar to the -style Edward Tufte uses in his books and handouts. Tufte's style is known -for its extensive use of sidenotes, tight integration of graphics with -text, and well-set typography. This document aims to be at once a -demonstration of the features of the Tufte-\LaTeX\ document classes -and a style guide to their use. - -\section{Page Layout}\label{sec:page-layout} -\subsection{Headings}\label{sec:headings} -This style provides \textsc{a}- and \textsc{b}-heads (that is, -\Verb|\section| and \Verb|\subsection|), demonstrated above. - -The Tufte-\LaTeX\ classes will emit an error if you try to use -\linebreak\Verb|\subsubsection| and smaller headings. - -% let's start a new thought -- a new section -\newthought{In his later books},\cite{Tufte2006} Tufte -starts each section with a bit of vertical space, a non-indented paragraph, -and sets the first few words of the sentence in \textsc{small caps}. To -accomplish this using this style, use the \Verb|\newthought| command: -\begin{docspec} - \doccmd{newthought\{In his later books\}, Tufte starts\ldots} -\end{docspec} - -\subsection{Sidenotes}\label{sec:sidenotes} -One of the most prominent and distinctive features of this style is the -extensive use of sidenotes. There is a wide margin to provide ample room -for sidenotes and small figures. Any \Verb|\footnote|s will automatically -be converted to sidenotes.\footnote{This is a sidenote that was entered -using the \texttt{\textbackslash footnote} command.} If you'd like to place ancillary -information in the margin without the sidenote mark (the superscript -number), you can use the \Verb|\marginnote| command.\marginnote{This is a -margin note. Notice that there isn't a number preceding the note, and -there is no number in the main text where this note was written.} - -The specification of the \Verb|\sidenote| command is: -\begin{docspec} - \doccmd{sidenote[\docopt{number}][\docopt{offset}]\{\docarg{Sidenote text.}\}} -\end{docspec} - -Both the \docopt{number} and \docopt{offset} arguments are optional. If you -provide a \docopt{number} argument, then that number will be used as the -sidenote number. It will change of the number of the current sidenote only and -will not affect the numbering sequence of subsequent sidenotes. - -Sometimes a sidenote may run over the top of other text or graphics in the -margin space. If this happens, you can adjust the vertical position of the -sidenote by providing a dimension in the \docopt{offset} argument. Some -examples of valid dimensions are: -\begin{docspec} - \ttfamily 1.0in \qquad 2.54cm \qquad 254mm \qquad 6\Verb|\baselineskip| -\end{docspec} -If the dimension is positive it will push the sidenote down the page; if the -dimension is negative, it will move the sidenote up the page. - -While both the \docopt{number} and \docopt{offset} arguments are optional, they -must be provided in order. To adjust the vertical position of the sidenote -while leaving the sidenote number alone, use the following syntax: -\begin{docspec} - \doccmd{sidenote[][\docopt{offset}]\{\docarg{Sidenote text.}\}} -\end{docspec} -The empty brackets tell the \Verb|\sidenote| command to use the default -sidenote number. - -If you \emph{only} want to change the sidenote number, however, you may -completely omit the \docopt{offset} argument: -\begin{docspec} - \doccmd{sidenote[\docopt{number}]\{\docarg{Sidenote text.}\}} -\end{docspec} - -The \Verb|\marginnote| command has a similar \docarg{offset} argument: -\begin{docspec} - \doccmd{marginnote[\docopt{offset}]\{\docarg{Margin note text.}\}} -\end{docspec} - -\subsection{References} -References are placed alongside their citations as sidenotes, -as well. This can be accomplished using the normal \Verb|\cite| -command.\sidenote{The first paragraph of this document includes a citation.} - -The complete list of references may also be printed automatically by using -the \Verb|\bibliography| command. (See the end of this document for an -example.) If you do not want to print a bibliography at the end of your -document, use the \Verb|\nobibliography| command in its place. - -To enter multiple citations at one location,\cite{Tufte2006,Tufte1990} you can -provide a list of keys separated by commas and the same optional vertical -offset argument: \Verb|\cite{Tufte2006,Tufte1990}|. -\begin{docspec} - \doccmd{cite[\docopt{offset}]\{\docarg{bibkey1,bibkey2,\ldots}\}} -\end{docspec} - -\section{Figures and Tables}\label{sec:figures-and-tables} -Images and graphics play an integral role in Tufte's work. -In addition to the standard \docenv{figure} and \docenv{tabular} environments, -this style provides special figure and table environments for full-width -floats. - -Full page--width figures and tables may be placed in \docenv{figure*} or -\docenv{table*} environments. To place figures or tables in the margin, -use the \docenv{marginfigure} or \docenv{margintable} environments as follows -(see figure~\ref{fig:marginfig}): - -\begin{marginfigure}% - %\includegraphics[width=\linewidth]{helix} - \caption{This is a margin figure. The helix is defined by - $x = \cos(2\pi z)$, $y = \sin(2\pi z)$, and $z = [0, 2.7]$. The figure was - drawn using Asymptote (\url{http://asymptote.sf.net/}).} - \label{fig:marginfig} -\end{marginfigure} -\begin{Verbatim} -\begin{marginfigure} - \includegraphics{helix} - \caption{This is a margin figure.} -\end{marginfigure} -\end{Verbatim} - -The \docenv{marginfigure} and \docenv{margintable} environments accept an optional parameter \docopt{offset} that adjusts the vertical position of the figure or table. See the ``\nameref{sec:sidenotes}'' section above for examples. The specifications are: -\begin{docspec} - \doccmd{begin\{marginfigure\}[\docopt{offset}]}\\ - \qquad\ldots\\ - \doccmd{end\{marginfigure\}}\\ - \mbox{}\\ - \doccmd{begin\{margintable\}[\docopt{offset}]}\\ - \qquad\ldots\\ - \doccmd{end\{margintable\}}\\ -\end{docspec} - -Figure~\ref{fig:fullfig} is an example of the \Verb|figure*| -environment and figure~\ref{fig:textfig} is an example of the normal -\Verb|figure| environment. - -\begin{figure*}[h] - % \includegraphics[width=\linewidth]{sine.pdf}% - \caption{This graph shows $y = \sin x$ from about $x = [-10, 10]$. - \emph{Notice that this figure takes up the full page width.}}% - \label{fig:fullfig}% -\end{figure*} - -\begin{figure} -% \includegraphics{hilbertcurves.pdf} -% \checkparity This is an \pageparity\ page.% - \caption{Hilbert curves of various degrees $n$. - \emph{Notice that this figure only takes up the main textblock width.}} - \label{fig:textfig} - %\zsavepos{pos:textfig} - \setfloatalignment{b} -\end{figure} - -Table~\ref{tab:normaltab} shows table created with the \docpkg{booktabs} -package. Notice the lack of vertical rules---they serve only to clutter -the table's data. - -\begin{table}[ht] - \centering - \fontfamily{ppl}\selectfont - \begin{tabular}{ll} - \toprule - Margin & Length \\ - \midrule - Paper width & \unit[8\nicefrac{1}{2}]{inches} \\ - Paper height & \unit[11]{inches} \\ - Textblock width & \unit[6\nicefrac{1}{2}]{inches} \\ - Textblock/sidenote gutter & \unit[\nicefrac{3}{8}]{inches} \\ - Sidenote width & \unit[2]{inches} \\ - \bottomrule - \end{tabular} - \caption{Here are the dimensions of the various margins used in the Tufte-handout class.} - \label{tab:normaltab} - %\zsavepos{pos:normaltab} -\end{table} - -\section{Full-width text blocks} - -In addition to the new float types, there is a \docenv{fullwidth} -environment that stretches across the main text block and the sidenotes -area. - -\begin{Verbatim} -\begin{fullwidth} -Lorem ipsum dolor sit amet... -\end{fullwidth} -\end{Verbatim} - -\begin{fullwidth} -\small\itshape\lipsum[1] -\end{fullwidth} - -\section{Typography}\label{sec:typography} - -\subsection{Typefaces}\label{sec:typefaces} -If the Palatino, \textsf{Helvetica}, and \texttt{Bera Mono} typefaces are installed, this style -will use them automatically. Otherwise, we'll fall back on the Computer Modern -typefaces. - -\subsection{Letterspacing}\label{sec:letterspacing} -This document class includes two new commands and some improvements on -existing commands for letterspacing. - -When setting strings of \allcaps{ALL CAPS} or \smallcaps{small caps}, the -letter\-spacing---that is, the spacing between the letters---should be -increased slightly.\cite{Bringhurst2005} The \Verb|\allcaps| command has proper letterspacing for -strings of \allcaps{FULL CAPITAL LETTERS}, and the \Verb|\smallcaps| command -has letterspacing for \smallcaps{small capital letters}. These commands -will also automatically convert the case of the text to upper- or -lowercase, respectively. - -The \Verb|\textsc| command has also been redefined to include -letterspacing. The case of the \Verb|\textsc| argument is left as is, -however. This allows one to use both uppercase and lowercase letters: -\textsc{The Initial Letters Of The Words In This Sentence Are Capitalized.} - - - -\section{Installation}\label{sec:installation} -To install the Tufte-\LaTeX\ classes, simply drop the -following files into the same directory as your \texttt{.tex} -file: -\begin{quote} - \ttfamily - tufte-common.def\\ - tufte-handout.cls\\ - tufte-book.cls -\end{quote} - -% TODO add instructions for installing it globally - - - -\section{More Documentation}\label{sec:more-doc} -For more documentation on the Tufte-\LaTeX{} document classes (including commands not -mentioned in this handout), please see the sample book. - -\section{Support}\label{sec:support} - -The website for the Tufte-\LaTeX\ packages is located at -\url{http://code.google.com/p/tufte-latex/}. On our website, you'll find -links to our \smallcaps{svn} repository, mailing lists, bug tracker, and documentation. - -\bibliography{sample-handout} -\bibliographystyle{plainnat} - - - -\end{document} diff --git a/templates/WinPhilArticle.tex b/templates/WinPhilArticle.tex deleted file mode 100644 index 2ceab90..0000000 --- a/templates/WinPhilArticle.tex +++ /dev/null @@ -1,131 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%% PREAMBLE %%%%%%%%%%%%%%%%%%%%%%%% - -%%% FORMATTING %%% -\documentclass[11pt]{article} %%Font size and document presets -\usepackage[top=1in, bottom=1in, left=1.25in, right=1.25in]{geometry} %%Margins -\usepackage[protrusion=true,expansion=true]{microtype} %% Makes subtle line spacing shifts -\usepackage{enumitem} %%Enables control over enumerate and itemize environments -\setenumerate{label=(\arabic*), wide=\parindent} %%Changes enumeration style: use \begin{enumerate} -\usepackage{setspace} %%Enables \doublespacing command for double linespacing -\expandafter\def\expandafter\quote\expandafter{\quote\onehalfspacing} %%Makes 1.5 quote spacing -%\usepackage{mdwlist} %% Compressed lists, use star: \begin{enumerate*} \end{'' *} -%\usepackage{indentfirst} %%Indents first line of first paragraph of each section -%\raggedbottom %% Lose the constraint on equalising page content -%\frenchspacing %%Makes the sentence spacing single spaced -%\usepackage{multicol} %% Use \begin{multicols}{3} for three columns and \end{multicols} after - - - -%%% HEADER %%% -\usepackage{fancyhdr} %%Permits \pagestyle{fancy} -\pagestyle{fancy} %%Header style -\usepackage{titlesec} %%Header style -\titlespacing*{\subsection}{\parindent}{.25in}{\wordsep}% Reduces spacing after headings -\rhead{Benjamin Brast-McKie} %%Right header -\renewcommand{\sectionmark}[1]{\markright{$\S$\thesection\ #1}} %%Left header command -\lhead{\nouppercase{\rightmark}} %%Left header - -%%% FOOTNOTES %%% -\usepackage{scrextend} %%Allows for changes to foodnotes -\deffootnote[1em]{0in}{1em}{\textsuperscript{\thefootnotemark \ }} %%Footnote style -\setlength{\footnotesep}{0.125in} %%Space between footnotes - -%%% SYMBOLS %%% -\usepackage{amssymb, amsmath, mathrsfs} %%Math packages -\usepackage{stmaryrd} %%Use \llbracket and \rrbracket for double brackets -%\usepackage{cancel} %%\cancel strikes out text diagonally -%\usepackage{fitch} -%\usepackage{turnstile} -%\usepackage{linguex} -%\usepackage{schemata} - -%%% GRAPHICS %%% -\usepackage{graphicx} -%\DeclareGraphicsExtensions{.pdf,.jpeg,.jpg} -%\usepackage{fancybox} - %\begin{figure}[ht] - %\shadowbox{\includegraphics{figure-file}}} - %\end{figure} - -%%% CITATIONS %%% -%\usepackage{bibentry} %%Replace \bibliography{} with \nobibliography{} for no bib -%\usepackage{epigraph} %%Use \epigraph{text}{citation} -\usepackage[round]{natbib} %%Or change 'round' to 'square' for square backers -\setcitestyle{aysep={}} -\newcommand\citepl[2][]{\citeauthor{#2}'s (\citeyear[#1]{#2})} %%Use \citepl for possessive citation. -\newcommand\citea[2][]{\citeauthor{#2}#1} %%Use \citea is for author name only, with optional page numbers. -\newcommand\citeapl[2][]{\citeauthor{#2}'s#1} %%Use \citeapl is for possessive author name only. -% \citet{key} ==>> Jones et al. (1990) - % \citet*{key} ==>> Jones, Baker, and Smith (1990) - % \citep{key} ==>> (Jones et al., 1990) - % \citep*{key} ==>> (Jones, Baker, and Smith, 1990) - % \citep[chap. 2]{key} ==>> (Jones et al., 1990, chap. 2) - % \citep[e.g.][]{key} ==>> (e.g. Jones et al., 1990) - % \citep[e.g.][p. 32]{key} ==>> (e.g. Jones et al., p. 32) - % \citeauthor{key} ==>> Jones et al. - % \citeauthor*{key} ==>> Jones, Baker, and Smith - % \citeyear{key} ==>> 1990 - - -%%% DEFINITIONS FOR LOGICAL SYMBOLS AND QUOTES %%% -%\newcommand{\corner}[1]{\ulcorner#1\urcorner} %%Corner quotes -%\newcommand{\tuple}[1]{\langle#1\rangle} %%Angle brackets -%\newcommand{\ttuple}[1]{$\langle$#1$\rangle$} %%Angle brackets -%\newcommand{\set}[1]{\lbrace#1\rbrace} %%Set brackets -%\newcommand{\interpret}[1]{\llbracket#1\rrbracket} %%Double brackets -%\newcommand{\sq}[1]{`#1'} %%Proper opened-closed single quotation marks -%\newcommand{\dq}[1]{``#1"} %%Proper opened-closed double quotation marks -%\newcommand{\qed}[0]{$\hfill\square$} %%Box at end of proofs - - -%%% ENVIRONMENTS %%% -%\newenvironment{senum}[2][topsep=0in, itemsep=.05in]{\begin{enumerate}[#1,topsep=0in, itemsep=.05in]\begin{singlespace}#2}{\end{singlespace}\end{enumerate}\vspace{.175in}} - - - -%%%%%%%%%%%%%%%%%%%%%%%%% TITLE %%%%%%%%%%%%%%%%%%%%%%%%% - - -\begin{document} -\title{TITLE} -\author{Benjamin Brast-McKie} -\date{\today} -\maketitle -\thispagestyle{empty} - -\begin{abstract} -\noindent BEGIN ABSTRACT -\end{abstract} - -\doublespacing - - -%%%%%%%%%%%%%%%%%%%%%%% DOCUMENT %%%%%%%%%%%%%%%%%%%%%%% - - -\section{Section Title} - - - - - - - - - - - - -%%%%%%%%%%%%%%%%%%%%%% BIBLIOGRAPHY %%%%%%%%%%%%%%%%%%%%%% - - -\newpage -\begin{small} %%Makes bib small text size -\singlespacing %%Makes single spaced -\bibliographystyle{C:/texmf/bibtex/bst/Analysis} %%bib style found in bst folder, in bibtex folder, in texmf folder. -%\setlength{\bibsep}{0.5pt} %%Changes spacing between bib entries -\bibliography{C:/texmf/bibtex/bib/Zotero} %%bib database found in bib folder, in bibtex folder -\thispagestyle{empty} %%Removes page numbers -\end{small} %%End makes bib small text size - -\end{document} \ No newline at end of file