From 9fc37b36eb139a645f399631f06cdbf21ab9f695 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Mon, 29 Aug 2022 16:55:12 +0800 Subject: [PATCH] :sparkles: Feat(highlight): add full support for Chroma highlighting languages in the [list](https://gohugo.io/content-management/syntax-highlighting/#list-of-chroma-highlighting-languages) tool: https://github.com/hugo-fixit/.tools/blob/main/tampermonkey/code-type-map-fetcher.user.js --- CHANGELOG.md | 3 +- assets/css/_maps/_code-type.scss | 371 +++++++++++++++++++++++++++++++ assets/css/_maps/_index.scss | 1 + assets/css/_variables.scss | 53 +---- docs | 2 +- 5 files changed, 376 insertions(+), 54 deletions(-) create mode 100644 assets/css/_maps/_code-type.scss create mode 100644 assets/css/_maps/_index.scss diff --git a/CHANGELOG.md b/CHANGELOG.md index 433be5b6..4afef034 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. - :sparkles: Feat(menu): add params: `icon`, `type` for menu items - :sparkles: Feat: add custom aside template in post page ([#172](https://github.com/hugo-fixit/FixIt/issues/172)) - :sparkles: Feat(math): add more block delimiter support for math +- :sparkles: Feat(highlight): add full support for Chroma highlighting languages in the [list](https://gohugo.io/content-management/syntax-highlighting/#list-of-chroma-highlighting-languages) - :wheelchair: Feat(accessibility): use `aria-hidden=true` on icons that AT should ignore - :bug: Fix: add function doc2unix to unify new lines symbol between Windows and Unix/Mac OS - :bug: Fix: author display error in post and markdown file @@ -105,7 +106,7 @@ All notable changes to this project will be documented in this file. - :memo: Docs: revise theme documentations - :zap: Perf: remove third-party library clipboard.js ([#84](https://github.com/hugo-fixit/FixIt/issues/84)) - :pencil2: Docs: fix highlight url typo in `theme-documentation-built-in-shortcodes` (@d-baer[#85](https://github.com/hugo-fixit/FixIt/pull/85)) -- :wrench: Chore(i18n): improve translations for supported languages ([#119](https://github.com/hugo-fixit/FixIt/issues/119)) +- :wrench: Chore(i18n): improve translations for the supported languages ([#119](https://github.com/hugo-fixit/FixIt/issues/119)) - :wrench: Chore(i18n): add i18n support for console messages - :wrench: Chore: add deprecated parameter detection in cli - :arrow_up: Chore: update some third-party libraries diff --git a/assets/css/_maps/_code-type.scss b/assets/css/_maps/_code-type.scss new file mode 100644 index 00000000..0a22348c --- /dev/null +++ b/assets/css/_maps/_code-type.scss @@ -0,0 +1,371 @@ +/** + * Code type map + * @generator https://github.com/hugo-fixit/.tools/blob/main/tampermonkey/code-type-map-fetcher.user.js + */ +$code-type-map: ( + "language-abap": "ABAP", + "language-abnf": "ABNF", + "language-as": "ActionScript", + "language-actionscript": "ActionScript", + "language-as3": "ActionScript 3", + "language-actionscript3": "ActionScript 3", + "language-ada": "Ada", + "language-ada95": "Ada", + "language-ada2005": "Ada", + "language-al": "AL", + "language-ng2": "Angular2", + "language-antlr": "ANTLR", + "language-apacheconf": "ApacheConf", + "language-aconf": "ApacheConf", + "language-apache": "ApacheConf", + "language-apl": "APL", + "language-applescript": "AppleScript", + "language-arduino": "Arduino", + "language-armasm": "ArmAsm", + "language-awk": "Awk", + "language-gawk": "Awk", + "language-mawk": "Awk", + "language-nawk": "Awk", + "language-ballerina": "Ballerina", + "language-make": "Base Makefile", + "language-makefile": "Base Makefile", + "language-mf": "Base Makefile", + "language-bsdmake": "Base Makefile", + "language-bash": "Bash", + "language-sh": "Bash", + "language-ksh": "Bash", + "language-zsh": "Bash", + "language-shell": "Bash", + "language-bash-session": "BashSession", + "language-console": "BashSession", + "language-shell-session": "BashSession", + "language-bat": "Batchfile", + "language-batch": "Batchfile", + "language-dosbatch": "Batchfile", + "language-winbatch": "Batchfile", + "language-bib": "BibTeX", + "language-bibtex": "BibTeX", + "language-bicep": "Bicep", + "language-blitzbasic": "BlitzBasic", + "language-b3d": "BlitzBasic", + "language-bplus": "BlitzBasic", + "language-bnf": "BNF", + "language-brainfuck": "Brainfuck", + "language-bf": "Brainfuck", + "language-c": "C", + "language-csharp": "C#", + "language-c\\#": "C#", + "language-cpp": "C++", + "language-c\\+\\+": "C++", + "language-caddyfile": "Caddyfile", + "language-caddy": "Caddyfile", + "language-caddyfile-directives": "Caddyfile Directives", + "language-caddyfile-d": "Caddyfile Directives", + "language-caddy-d": "Caddyfile Directives", + "language-capnp": "Cap'n Proto", + "language-cassandra": "Cassandra CQL", + "language-cql": "Cassandra CQL", + "language-ceylon": "Ceylon", + "language-cfengine3": "CFEngine3", + "language-cf3": "CFEngine3", + "language-cfs": "cfstatement", + "language-chai": "ChaiScript", + "language-chaiscript": "ChaiScript", + "language-cheetah": "Cheetah", + "language-spitfire": "Cheetah", + "language-clojure": "Clojure", + "language-clj": "Clojure", + "language-cmake": "CMake", + "language-cobol": "COBOL", + "language-coffee-script": "CoffeeScript", + "language-coffeescript": "CoffeeScript", + "language-coffee": "CoffeeScript", + "language-common-lisp": "Common Lisp", + "language-cl": "Common Lisp", + "language-lisp": "Common Lisp", + "language-coq": "Coq", + "language-cr": "Crystal", + "language-crystal": "Crystal", + "language-css": "CSS", + "language-cython": "Cython", + "language-pyx": "Cython", + "language-pyrex": "Cython", + "language-d": "D", + "language-dart": "Dart", + "language-diff": "Diff", + "language-udiff": "Diff", + "language-django": "Django/Jinja", + "language-jinja": "Django/Jinja", + "language-docker": "Docker", + "language-dockerfile": "Docker", + "language-dtd": "DTD", + "language-dylan": "Dylan", + "language-ebnf": "EBNF", + "language-elixir": "Elixir", + "language-ex": "Elixir", + "language-exs": "Elixir", + "language-elm": "Elm", + "language-emacs": "EmacsLisp", + "language-elisp": "EmacsLisp", + "language-emacs-lisp": "EmacsLisp", + "language-erlang": "Erlang", + "language-factor": "Factor", + "language-fennel": "Fennel", + "language-fnl": "Fennel", + "language-fish": "Fish", + "language-fishshell": "Fish", + "language-forth": "Forth", + "language-fortran": "Fortran", + "language-fortranfixed": "FortranFixed", + "language-fsharp": "FSharp", + "language-gas": "GAS", + "language-asm": "GAS", + "language-gdscript": "GDScript", + "language-gd": "GDScript", + "language-genshi": "Genshi", + "language-kid": "Genshi", + "language-xml\\+genshi": "Genshi", + "language-xml\\+kid": "Genshi", + "language-html\\+genshi": "Genshi HTML", + "language-html\\+kid": "Genshi HTML", + "language-genshitext": "Genshi Text", + "language-cucumber": "Gherkin", + "language-Cucumber": "Gherkin", + "language-gherkin": "Gherkin", + "language-Gherkin": "Gherkin", + "language-glsl": "GLSL", + "language-gnuplot": "Gnuplot", + "language-go": "Go", + "language-golang": "Go", + "language-go-html-template": "Go HTML Template", + "language-go-text-template": "Go Text Template", + "language-graphql": "GraphQL", + "language-graphqls": "GraphQL", + "language-gql": "GraphQL", + "language-groff": "Groff", + "language-nroff": "Groff", + "language-man": "Groff", + "language-groovy": "Groovy", + "language-handlebars": "Handlebars", + "language-hbs": "Handlebars", + "language-haskell": "Haskell", + "language-hs": "Haskell", + "language-hx": "Haxe", + "language-haxe": "Haxe", + "language-hxsl": "Haxe", + "language-hcl": "HCL", + "language-hexdump": "Hexdump", + "language-hlb": "HLB", + "language-html": "HTML", + "language-http": "HTTP", + "language-hylang": "Hy", + "language-idris": "Idris", + "language-idr": "Idris", + "language-igor": "Igor", + "language-igorpro": "Igor", + "language-ini": "INI", + "language-cfg": "INI", + "language-dosini": "INI", + "language-io": "Io", + "language-j": "J", + "language-java": "Java", + "language-js": "JavaScript", + "language-javascript": "JavaScript", + "language-json": "JSON", + "language-julia": "Julia", + "language-jl": "Julia", + "language-jungle": "Jungle", + "language-kotlin": "Kotlin", + "language-lighty": "Lighttpd configuration file", + "language-lighttpd": "Lighttpd configuration file", + "language-llvm": "LLVM", + "language-lua": "Lua", + "language-mako": "Mako", + "language-md": "markdown", + "language-mkd": "markdown", + "language-mason": "Mason", + "language-mathematica": "Mathematica", + "language-mma": "Mathematica", + "language-nb": "Mathematica", + "language-matlab": "Matlab", + "language-mcfunction": "mcfunction", + "language-meson": "Meson", + "language-meson\\.build": "Meson", + "language-metal": "Metal", + "language-minizinc": "MiniZinc", + "language-MZN": "MiniZinc", + "language-mzn": "MiniZinc", + "language-mlir": "MLIR", + "language-modula2": "Modula-2", + "language-m2": "Modula-2", + "language-monkeyc": "MonkeyC", + "language-morrowind": "MorrowindScript", + "language-mwscript": "MorrowindScript", + "language-myghty": "Myghty", + "language-mysql": "MySQL", + "language-mariadb": "MySQL", + "language-nasm": "NASM", + "language-newspeak": "Newspeak", + "language-nginx": "Nginx configuration file", + "language-nim": "Nim", + "language-nimrod": "Nim", + "language-nixos": "Nix", + "language-nix": "Nix", + "language-objective-c": "Objective-C", + "language-objectivec": "Objective-C", + "language-obj-c": "Objective-C", + "language-objc": "Objective-C", + "language-ocaml": "OCaml", + "language-octave": "Octave", + "language-ones": "OnesEnterprise", + "language-onesenterprise": "OnesEnterprise", + "language-1S": "OnesEnterprise", + "language-1S:Enterprise": "OnesEnterprise", + "language-openedge": "OpenEdge ABL", + "language-abl": "OpenEdge ABL", + "language-progress": "OpenEdge ABL", + "language-openedgeabl": "OpenEdge ABL", + "language-openscad": "OpenSCAD", + "language-org": "Org Mode", + "language-orgmode": "Org Mode", + "language-pacmanconf": "PacmanConf", + "language-perl": "Perl", + "language-pl": "Perl", + "language-php": "PHP", + "language-php3": "PHP", + "language-php4": "PHP", + "language-php5": "PHP", + "language-phtml": "PHTML", + "language-pig": "Pig", + "language-pkgconfig": "PkgConfig", + "language-plpgsql": "PL/pgSQL", + "language-text": "plaintext", + "language-plain": "plaintext", + "language-no-highlight": "plaintext", + "language-plutus-core": "Plutus Core", + "language-plc": "Plutus Core", + "language-pony": "Pony", + "language-postgresql": "PostgreSQL SQL dialect", + "language-postgres": "PostgreSQL SQL dialect", + "language-postscript": "PostScript", + "language-postscr": "PostScript", + "language-pov": "POVRay", + "language-powerquery": "PowerQuery", + "language-pq": "PowerQuery", + "language-powershell": "PowerShell", + "language-posh": "PowerShell", + "language-ps1": "PowerShell", + "language-psm1": "PowerShell", + "language-psd1": "PowerShell", + "language-prolog": "Prolog", + "language-promql": "PromQL", + "language-protobuf": "Protocol Buffer", + "language-proto": "Protocol Buffer", + "language-puppet": "Puppet", + "language-python": "Python", + "language-py": "Python", + "language-sage": "Python", + "language-python3": "Python", + "language-py3": "Python", + "language-python2": "Python 2", + "language-py2": "Python 2", + "language-qbasic": "QBasic", + "language-basic": "QBasic", + "language-qml": "QML", + "language-qbs": "QML", + "language-splus": "R", + "language-s": "R", + "language-r": "R", + "language-racket": "Racket", + "language-rkt": "Racket", + "language-ragel": "Ragel", + "language-perl6": "Raku", + "language-pl6": "Raku", + "language-raku": "Raku", + "language-jsx": "react", + "language-react": "react", + "language-reason": "ReasonML", + "language-reasonml": "ReasonML", + "language-registry": "reg", + "language-rst": "reStructuredText", + "language-rest": "reStructuredText", + "language-restructuredtext": "reStructuredText", + "language-rexx": "Rexx", + "language-arexx": "Rexx", + "language-rb": "Ruby", + "language-ruby": "Ruby", + "language-duby": "Ruby", + "language-rust": "Rust", + "language-rs": "Rust", + "language-sas": "SAS", + "language-sass": "Sass", + "language-scala": "Scala", + "language-scheme": "Scheme", + "language-scm": "Scheme", + "language-scilab": "Scilab", + "language-scss": "SCSS", + "language-sieve": "Sieve", + "language-smalltalk": "Smalltalk", + "language-squeak": "Smalltalk", + "language-st": "Smalltalk", + "language-smarty": "Smarty", + "language-snobol": "Snobol", + "language-sol": "Solidity", + "language-solidity": "Solidity", + "language-sparql": "SPARQL", + "language-sql": "SQL", + "language-squidconf": "SquidConf", + "language-squid\\.conf": "SquidConf", + "language-squid": "SquidConf", + "language-sml": "Standard ML", + "language-stylus": "Stylus", + "language-svelte": "Svelte", + "language-swift": "Swift", + "language-systemd": "SYSTEMD", + "language-systemverilog": "systemverilog", + "language-sv": "systemverilog", + "language-tablegen": "TableGen", + "language-tasm": "TASM", + "language-tcl": "Tcl", + "language-tcsh": "Tcsh", + "language-csh": "Tcsh", + "language-termcap": "Termcap", + "language-terminfo": "Terminfo", + "language-terraform": "Terraform", + "language-tf": "Terraform", + "language-tex": "TeX", + "language-latex": "TeX", + "language-thrift": "Thrift", + "language-toml": "TOML", + "language-tradingview": "TradingView", + "language-tv": "TradingView", + "language-tsql": "Transact-SQL", + "language-t-sql": "Transact-SQL", + "language-turing": "Turing", + "language-turtle": "Turtle", + "language-twig": "Twig", + "language-ts": "TypeScript", + "language-tsx": "TypeScript", + "language-typescript": "TypeScript", + "language-typoscript": "TypoScript", + "language-typoscriptcssdata": "TypoScriptCssData", + "language-typoscripthtmldata": "TypoScriptHtmlData", + "language-v": "verilog", + "language-vlang": "V", + "language-vsh": "V shell", + "language-vshell": "V shell", + "language-vb\\.net": "VB.net", + "language-vbnet": "VB.net", + "language-verilog": "verilog", + "language-vhdl": "VHDL", + "language-vim": "VimL", + "language-vue": "vue", + "language-vuejs": "vue", + "language-whiley": "Whiley", + "language-xml": "XML", + "language-xorg\\.conf": "Xorg", + "language-yaml": "YAML", + "language-yang": "YANG", + "language-zed": "Zed", + "language-zig": "Zig" +) !default; diff --git a/assets/css/_maps/_index.scss b/assets/css/_maps/_index.scss new file mode 100644 index 00000000..48ae12c4 --- /dev/null +++ b/assets/css/_maps/_index.scss @@ -0,0 +1 @@ +@import "_code-type"; \ No newline at end of file diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 1cc4f8bb..0d5defbe 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -154,58 +154,7 @@ $code-font-size: 0.875rem !default; // Font family of the code $code-font-family: Source Code Pro, Menlo, Consolas, Monaco, monospace, $global-font-family !default; -// Code type map -$code-type-map: ( - // Custom code type - language-bash: 'Bash', - language-c: 'C', - language-cs: 'C#', - language-cpp: 'C++', - language-clojure: 'Clojure', - language-coffeescript: 'CoffeeScript', - language-css: 'CSS', - language-dart: 'Dart', - language-diff: 'Diff', - language-erlang: 'Erlang', - language-go: 'Go', - language-go-html-template: 'Go HTML Template', - language-groovy: 'Groovy', - language-haskell: 'Haskell', - language-html: 'HTML', - language-http: 'HTTP', - language-xml: 'XML', - language-java: 'Java', - language-js: 'JavaScript', - language-javascript: 'JavaScript', - language-json: 'JSON', - language-kotlin: 'Kotlin', - language-latex: 'LaTeX', - language-less: 'Less', - language-lisp: 'Lisp', - language-lua: 'Lua', - language-makefile: 'Makefile', - language-markdown: 'Markdown', - language-matlab: 'Matlab', - language-objectivec: 'Objective-C', - language-php: 'PHP', - language-perl: 'Perl', - language-python: 'Python', - language-r: 'R', - language-ruby: 'Ruby', - language-rust: 'Rust', - language-scala: 'Scala', - language-scss: 'Scss', - language-shell: 'Shell', - language-sql: 'SQL', - language-swift: 'Swift', - language-tex: 'TeX', - language-toml: 'TOML', - language-ts: 'TypeScript', - language-typescript: 'TypeScript', - language-vue: 'Vue', - language-yml: 'YAML', - language-yaml: 'YAML' -) !default; +@import "_maps/index"; // Color map of the code highlight $code-highlight-color-map: ( diff --git a/docs b/docs index 63ab7cdc..e0a7c702 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit 63ab7cdc3165c354dd622d20866102364edca788 +Subproject commit e0a7c7022fe71cbf89f66fc76798548e2df31441