Skip to content

Commit 53c45a9

Browse files
jdknightjdknight
authored
Merge pull request #1025 from sphinx-contrib/update-supported-code-styles-2024-08-08
std: update supported code styles
2 parents 2c6e30a + 210f2c3 commit 53c45a9

File tree

1 file changed

+59
-98
lines changed

1 file changed

+59
-98
lines changed

‎sphinxcontrib/confluencebuilder/std/confluence.py‎

Lines changed: 59 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -74,58 +74,31 @@
7474
# [3]: https://confluence.atlassian.com/confcloud/code-block-macro-724765175.html
7575
# [4]: http://pygments.org/docs/lexers/
7676
# [5]: http://www.sphinx-doc.org/en/stable/markup/code.html
77-
LITERAL2LANG_MAP_V1 = {
77+
LITERAL2LANG_MAP_COMMON = {
78+
# (none)
79+
'none': 'none',
80+
'raw': 'none',
81+
'text': 'none',
7882
# ActionScript
7983
'actionscript3': 'actionscript3',
8084
'as3': 'actionscript3',
8185
# AppleScript (Confluence >=6.0)
8286
'applescript': 'applescript',
83-
# Bash
84-
'bash': 'bash',
85-
'ksh': 'bash',
86-
'sh': 'bash',
87-
'shell': 'bash',
88-
'zsh': 'bash',
89-
# C#
90-
'c#': 'csharp',
91-
'csharp': 'csharp',
9287
# C++
93-
'c': 'cpp',
9488
'c++': 'cpp',
9589
'cpp': 'cpp',
9690
# ColdFusion
9791
'cfc': 'coldfusion',
9892
'coldfusion': 'coldfusion',
99-
# CSS
100-
'css': 'css',
101-
# Delphi
102-
'delphi': 'delphi',
103-
'pas': 'delphi',
104-
'pascal': 'delphi',
105-
'objectpascal': 'delphi',
10693
# Diff
10794
'diff': 'diff',
10895
'udiff': 'diff',
109-
# Erlang
110-
'erlang': 'erlang',
11196
# Groovy
11297
'groovy': 'groovy',
113-
# HTML and XML
114-
'html': 'html/xml',
115-
'html/xml': 'html/xml',
116-
'xml': 'html/xml',
117-
'xslt': 'html/xml',
11898
# Java
11999
'java': 'java',
120100
# Java FX
121101
'javafx': 'javafx',
122-
# JavaScript
123-
'javascript': 'javascript',
124-
'js': 'javascript',
125-
# Plain Text
126-
'none': 'none',
127-
'raw': 'none',
128-
'text': 'none',
129102
# Perl (Confluence <=5.10)
130103
'perl': 'perl',
131104
'pl': 'perl',
@@ -139,12 +112,15 @@
139112
'powershell': 'powershell',
140113
'ps1': 'powershell',
141114
'psm1': 'powershell',
115+
'pwsh': 'powershell',
142116
# Python
117+
'bazel': 'python',
143118
'py': 'python',
144119
'py3': 'python',
145120
'python': 'python',
146121
'python3': 'python',
147122
'sage': 'python',
123+
'starlark': 'python',
148124
# Ruby
149125
'duby': 'ruby',
150126
'rb': 'ruby',
@@ -153,13 +129,47 @@
153129
'sass': 'sass',
154130
# Scala
155131
'scala': 'scala',
132+
# Shell
133+
'bash': 'bash',
134+
'ksh': 'bash',
135+
'openrc': 'bash',
136+
'sh': 'bash',
137+
'shell': 'bash',
138+
'zsh': 'bash',
156139
# SQL
157140
'sql': 'sql',
158141
# Visual Basic
159142
'vb': 'vb',
160143
'vbscript': 'vb',
144+
'visualbasic': 'vb',
161145
# YAML (Confluence Server >=6.7)
162146
'yaml': 'yaml',
147+
}
148+
149+
LITERAL2LANG_MAP_V1 = {
150+
**LITERAL2LANG_MAP_COMMON,
151+
# C#
152+
'c#': 'csharp',
153+
'csharp': 'csharp',
154+
# C
155+
'c': 'cpp',
156+
# CSS
157+
'css': 'css',
158+
# Delphi
159+
'delphi': 'delphi',
160+
'pas': 'delphi',
161+
'pascal': 'delphi',
162+
'objectpascal': 'delphi',
163+
# Erlang
164+
'erlang': 'erlang',
165+
# HTML and XML
166+
'html': 'html/xml',
167+
'html/xml': 'html/xml',
168+
'xml': 'html/xml',
169+
'xslt': 'html/xml',
170+
# JavaScript
171+
'javascript': 'javascript',
172+
'js': 'javascript',
163173
# (special)
164174
# Sphinx's default highlight language is based off a superset of 'python'.
165175
# To follow Sphinx's method of highlighting, use Confluence's 'python'
@@ -170,29 +180,19 @@
170180
}
171181

172182
LITERAL2LANG_MAP_V2 = {
173-
# (none)
174-
'none': 'none',
175-
'raw': 'none',
183+
**LITERAL2LANG_MAP_COMMON,
176184
# ABAP
177185
'abap': 'abap',
178-
# ActionScript
179-
'actionscript3': 'actionscript3',
180-
'as3': 'actionscript3',
181186
# Ada
182187
'ada': 'ada',
183188
'ada2005': 'ada',
184189
'ada95': 'ada',
185-
# AppleScript
186-
'applescript': 'applescript',
187190
# Arduino
188191
'arduino': 'arduino',
189192
# Autoit
190193
'autoit': 'autoit',
191194
# C
192195
'c': 'c',
193-
# C++
194-
'c++': 'cpp',
195-
'cpp': 'cpp',
196196
# C#
197197
'c#': 'c#',
198198
'csharp': 'c#',
@@ -203,9 +203,6 @@
203203
'coffee': 'coffeescript',
204204
'coffee-script': 'coffeescript',
205205
'coffeescript': 'coffeescript',
206-
# ColdFusion
207-
'cfc': 'coldfusion',
208-
'coldfusion': 'coldfusion',
209206
# CSS
210207
'css': 'css',
211208
# CUDA
@@ -215,9 +212,9 @@
215212
'd': 'd',
216213
# Dart
217214
'dart': 'dart',
218-
# Diff
219-
'diff': 'diff',
220-
'udiff': 'diff',
215+
# Dockerfile
216+
'docker': 'docker',
217+
'dockerfile': 'docker',
221218
# Elixir
222219
'elixir': 'elixir',
223220
'ex': 'elixir',
@@ -237,21 +234,19 @@
237234
'golang': 'go',
238235
# GraphQL
239236
'graphql': 'graphql',
240-
# Groovy
241-
'groovy': 'groovy',
242237
# Haskell
243238
'haskell': 'haskell',
244239
'hs': 'haskell',
245240
# Haxe
246241
'haxe': 'haxe',
247242
'hx': 'haxe',
248243
'hxsl': 'haxe',
244+
# HCL
245+
'hcl': 'hcl',
246+
'terraform': 'hcl',
247+
'tf': 'hcl',
249248
# HTML and XML
250249
'html': 'html',
251-
# Java
252-
'java': 'java',
253-
# Java FX
254-
'javafx': 'javafx',
255250
# JavaScript
256251
'javascript': 'js',
257252
'js': 'js',
@@ -276,6 +271,8 @@
276271
'nb': 'mathematica',
277272
# MATLAB
278273
'matlab': 'matlab',
274+
# NGINX
275+
'nginx': 'nginx',
279276
# Objective-C
280277
'obj-c': 'objective-c',
281278
'objc': 'objective-c',
@@ -295,31 +292,13 @@
295292
'pas': 'pas',
296293
'pascal': 'pas',
297294
'objectpascal': 'pas',
298-
# Perl
299-
'perl': 'perl',
300-
'pl': 'perl',
301-
# PHP
302-
'php': 'php',
303-
'php3': 'php',
304-
'php4': 'php',
305-
'php5': 'php',
306-
# Plain Text
307-
'text': 'text',
308-
# PowerShell
309-
'posh': 'powershell',
310-
'powershell': 'powershell',
311-
'ps1': 'powershell',
312-
'psm1': 'powershell',
313295
# Prolog
314296
'prolog': 'prolog',
297+
# Protocol Buffers
298+
'proto': 'protobuf',
299+
'protobuf': 'protobuf',
315300
# Puppet
316301
'puppet': 'puppet',
317-
# Python
318-
'py': 'py',
319-
'py3': 'py',
320-
'python': 'py',
321-
'python3': 'py',
322-
'sage': 'py',
323302
# QML
324303
'qbs': 'qbs',
325304
'qml': 'qbs',
@@ -332,35 +311,19 @@
332311
'rest': 'restructuredtext',
333312
'restructuredtext': 'restructuredtext',
334313
'rst': 'restructuredtext',
335-
# Ruby
336-
'duby': 'ruby',
337-
'rb': 'ruby',
338-
'ruby': 'ruby',
339314
# Rust
340315
'rs': 'rust',
341316
'rust': 'rust',
342-
# Sass
343-
'sass': 'sass',
344-
# Scala
345-
'scala': 'scala',
346317
# Scheme
347318
'scm': 'scheme',
348319
'scheme': 'scheme',
349-
# Shell
350-
'bash': 'bash',
351-
'ksh': 'bash',
352-
'sh': 'bash',
353-
'shell': 'bash',
354-
'zsh': 'bash',
355320
# Smalltalk
356321
'smalltalk': 'smalltalk',
357322
'squeak': 'smalltalk',
358323
'st': 'smalltalk',
359324
# SplunkSPL
360325
'spl': 'splunk-spl',
361326
'splunkspl': 'splunk-spl',
362-
# SQL
363-
'sql': 'sql',
364327
# StandardML
365328
'sml': 'standardml',
366329
'standardml': 'standardml',
@@ -390,10 +353,6 @@
390353
'verilog': 'verilog',
391354
# VHDL
392355
'vhdl': 'vhdl',
393-
# Visual Basic
394-
'vb': 'vb',
395-
'vbscript': 'vb',
396-
'visualbasic': 'vb',
397356
# XML
398357
'xml': 'xml',
399358
'xslt': 'xml',
@@ -403,8 +362,6 @@
403362
'xqm': 'xquery',
404363
'xquery': 'xquery',
405364
'xqy': 'xquery',
406-
# YAML
407-
'yaml': 'yaml',
408365
# (special)
409366
# Sphinx's default highlight language is based off a superset of 'python'.
410367
# To follow Sphinx's method of highlighting, use Confluence's 'python'
@@ -442,6 +399,10 @@
442399
'swig': 'cpp',
443400
'vala': 'cpp',
444401
'vapi': 'cpp',
402+
# YAML-like languages
403+
'salt': 'yaml',
404+
'sls': 'yaml',
405+
'yaml+jinja': 'yaml',
445406
}
446407

447408
LITERAL2LANG_FBMAP_V1 = {

0 commit comments

Comments
 (0)