Skip to content

Commit

Permalink
Large refactoring was introduced. All files related to the documentat…
Browse files Browse the repository at this point in the history
…ion builder were moved to `./full/` folder and corresponding packages was renamed to have `40ants-doc-full/` prefix.
  • Loading branch information
svetlyak40wt committed Nov 15, 2022
1 parent 0495f8a commit 75f2b94
Show file tree
Hide file tree
Showing 97 changed files with 980 additions and 958 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v2",
"with": {
"asdf-system": "40ants-doc/doc"
"asdf-system": "40ants-doc-full"
}
},
{
"name": "Build Docs",
"uses": "40ants/build-docs@v1",
"with": {
"asdf-system": "40ants-doc/doc",
"asdf-system": "40ants-doc-full",
"error-on-warnings": true
}
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"name": "Setup Common Lisp Environment",
"uses": "40ants/setup-lisp@v2",
"with": {
"asdf-system": "40ants-doc/full"
"asdf-system": "40ants-doc"
}
},
{
Expand All @@ -45,7 +45,7 @@
},
{
"name": "Run Linter",
"run": "qlot exec 40ants-linter --system \"40ants-doc/full, 40ants-doc-test\" --imports",
"run": "qlot exec 40ants-linter --system \"40ants-doc, 40ants-doc-full, 40ants-doc-test\" --imports",
"shell": "bash"
}
]
Expand Down
44 changes: 42 additions & 2 deletions 40ants-doc-full.asd
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,47 @@
:source-control (:git "https://github.com/40ants/doc.git")
:description "Documentation generator. You will need to load this system, to build documentation for a library which uses 40ANTS-DOC system."
:class :package-inferred-system
:pathname "src"
:depends-on ("40ants-doc/full")
:pathname "full"
:depends-on (;; "40ants-doc/full"
"40ants-doc-full/builder"
"40ants-doc-full/doc"

;; TODO: Все эти locatives надо сделать доступными в минимальном пакете
;; может быть не загружать сами модули, но сделать так, чтобы на них можно было ссылаться
"40ants-doc-full/commondoc/changelog"
"40ants-doc-full/commondoc/section"
"40ants-doc-full/github"

"40ants-doc-full/locatives/argument"
"40ants-doc-full/locatives/asdf-system"
"40ants-doc-full/locatives/class"
"40ants-doc-full/locatives/compiler-macro"
"40ants-doc-full/locatives/constant"
"40ants-doc-full/locatives/dislocated"
"40ants-doc-full/locatives/function"
"40ants-doc-full/locatives/generic-function"
"40ants-doc-full/locatives/glossary"
"40ants-doc-full/locatives/include"
"40ants-doc-full/locatives/locative"
"40ants-doc-full/locatives/macro"
"40ants-doc-full/locatives/method"
"40ants-doc-full/locatives/package"
"40ants-doc-full/locatives/restart"
"40ants-doc-full/locatives/section"
"40ants-doc-full/locatives/slots"
"40ants-doc-full/locatives/stdout-of"
"40ants-doc-full/locatives/structure-accessor"
"40ants-doc-full/locatives/symbol-macro"
"40ants-doc-full/locatives/type"
"40ants-doc-full/locatives/variable"

"40ants-doc-full/object-package-impl"
"40ants-doc-full/themes/dark"
"40ants-doc-full/themes/dark""40ants-doc-full/builder"
"40ants-doc-full/themes/default"
"40ants-doc-full/themes/light"
)
:in-order-to ((asdf:test-op (asdf:test-op "40ants-doc-test"))))


(asdf:register-system-packages "3bmd-ext-code-blocks" '("3BMD-CODE-BLOCKS"))
1 change: 1 addition & 0 deletions 40ants-doc.asd
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@
(asdf:register-system-packages "3bmd-ext-code-blocks" '("3BMD-CODE-BLOCKS"))

(asdf:register-system-packages "swank" '("SWANK-BACKEND"
"SWANK/BACKEND"
"SWANK-MOP"))
12 changes: 6 additions & 6 deletions elisp/transcribe.el
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
(defun 40ants-doc-transcribe-last-expression ()
"A bit like C-u C-x C-e (slime-eval-last-expression) that
inserts the output and values of the sexp before the point, this
does the same but with 40ANTS-DOC/TRANSCRIBE:TRANSCRIBE. Use a numeric prefix
does the same but with 40ANTS-DOC-FULL/TRANSCRIBE:TRANSCRIBE. Use a numeric prefix
argument as in index to select one of the Common Lisp
40ANTS-DOC/TRANSCRIBE:*SYNTAXES* as the SYNTAX argument to 40ANTS-DOC/TRANSCRIBE:TRANSCRIBE.
40ANTS-DOC-FULL/TRANSCRIBE:*SYNTAXES* as the SYNTAX argument to 40ANTS-DOC-FULL/TRANSCRIBE:TRANSCRIBE.
Without a prefix argument, the first syntax is used."
(interactive)
(insert
Expand All @@ -31,9 +31,9 @@ Without a prefix argument, the first syntax is used."

(defun 40ants-doc-retranscribe-region (start end)
"Updates the transcription in the current region (as in calling
40ANTS-DOC/TRANSCRIBE:TRANSCRIBE with :UPDATE-ONLY T). Use a numeric prefix
40ANTS-DOC-FULL/TRANSCRIBE:TRANSCRIBE with :UPDATE-ONLY T). Use a numeric prefix
argument as in index to select one of the Common Lisp
40ANTS-DOC/TRANSCRIBE:*SYNTAXES* as the SYNTAX argument to 40ANTS-DOC/TRANSCRIBE:TRANSCRIBE.
40ANTS-DOC-FULL/TRANSCRIBE:*SYNTAXES* as the SYNTAX argument to 40ANTS-DOC-FULL/TRANSCRIBE:TRANSCRIBE.
Without a prefix argument, the syntax of the input will not be
changed."
(interactive "r")
Expand Down Expand Up @@ -69,8 +69,8 @@ changed."
first-line-special-p)
(let ((transcription
(40ants-doc-lisp-eval
`(cl:if (cl:find-package :40ants-doc/transcribe)
(uiop:symbol-call :40ants-doc/transcribe :transcribe-for-emacs
`(cl:if (cl:find-package :40ants-doc-full/transcribe)
(uiop:symbol-call :40ants-doc-full/transcribe :transcribe-for-emacs
,(buffer-substring-no-properties start end)
',syntax ',update-only ',echo ',first-line-special-p)
t))))
Expand Down
4 changes: 2 additions & 2 deletions src/args.lisp → full/args.lisp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(defpackage #:40ants-doc/args
(uiop:define-package #:40ants-doc-full/args
(:use #:cl))
(in-package #:40ants-doc/args)
(in-package #:40ants-doc-full/args)


;;; Return the names of the function arguments in ARGLIST that's a
Expand Down
Loading

0 comments on commit 75f2b94

Please sign in to comment.