Overview
Comment: | Add version control links to notes [678cc6aeca1d9d31] |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
56b50a383e02c687efd3ee6cecb9ee85 |
User & Date: | joel on 2020-03-14 21:32:58 |
Other Links: | manifest | tags |
Context
2020-03-14
| ||
22:13 | Debugging whoopsie check-in: ed07797d user: joel tags: trunk | |
21:32 | Add version control links to notes [678cc6aeca1d9d31] check-in: 56b50a38 user: joel tags: trunk | |
20:48 | Add quote from Thomas Macaulay check-in: 7047176b user: joel tags: trunk, content | |
Changes
Modified crystalize.rkt from [ffde9e3c] to [121eb65c].
︙ | ︙ | |||
180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | disposition-attr)) (define-values (disp-mark disp-verb) (disposition-values disposition-attr)) (let* ([note-id (build-note-id note-tx)] [title-tx (make-note-title pagenode parent-title-plain)] [title-html (->html title-tx #:splice? #t)] [author (maybe-attr 'author attrs default-authorname)] [author-url (maybe-attr 'author-url attrs)] [content-html (html$-note-contents disp-mark disp-verb elems)] [listing-full (html$-note-listing-full pagenode note-id title-html note-date content-html author author-url)]) (insert-one! (cache-conn) (make-cache:note #:page pagenode #:html-anchor note-id | > > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | disposition-attr)) (define-values (disp-mark disp-verb) (disposition-values disposition-attr)) (let* ([note-id (build-note-id note-tx)] [title-tx (make-note-title pagenode parent-title-plain)] [title-html (->html title-tx #:splice? #t)] [author (maybe-attr 'author attrs default-authorname)] [author-url (maybe-attr 'author-url attrs)] [note-srcline (maybe-attr 'srcline attrs)] [content-html (html$-note-contents disp-mark disp-verb elems)] [listing-full (html$-note-listing-full pagenode note-id title-html note-date note-srcline content-html author author-url)]) (insert-one! (cache-conn) (make-cache:note #:page pagenode #:html-anchor note-id |
︙ | ︙ |
Modified dust.rkt from [eb603279] to [43068c7c].
|
| | | 1 2 3 4 5 6 7 8 | #lang debug racket/base ; SPDX-License-Identifier: BlueOak-1.0.0 ; This file is licensed under the Blue Oak Model License 1.0.0. (require pollen/core pollen/pagetree pollen/setup |
︙ | ︙ | |||
127 128 129 130 131 132 133 | (when (file-exists? series-file) (case (system-type 'os) [(windows) (system (format "type nul >> ~a" series-file))] [else (system (format "touch ~a" series-file))])))) ;; Determine if the current article has been checked into Fossil repo (define (checked-in?) | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | (when (file-exists? series-file) (case (system-type 'os) [(windows) (system (format "type nul >> ~a" series-file))] [else (system (format "touch ~a" series-file))])))) ;; Determine if the current article has been checked into Fossil repo (define (checked-in?) (cond [#R (current-metas) (define articles-path (build-path (current-project-root) articles-folder)) (define checked-in (with-output-to-string (lambda () (system (format "/usr/local/bin/fossil ls ~a" articles-path))))) (string-contains? checked-in (path->string (here-source-path)))] [else #f])) |
︙ | ︙ |
Modified pollen.rkt from [d1969801] to [ecc1875a].
︙ | ︙ | |||
110 111 112 113 114 115 116 | (poly-branch-tag link) (poly-branch-tag url) (poly-branch-tag xref) (poly-branch-tag fn) (poly-branch-tag fndef) | | > > > > > > | 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | (poly-branch-tag link) (poly-branch-tag url) (poly-branch-tag xref) (poly-branch-tag fn) (poly-branch-tag fndef) (poly-branch-kwargs-tag note-with-srcline) (poly-branch-tag block) ;; Not yet implemented ; (poly-branch-tag table) ; #:columns "" ; (poly-branch-tag inline-math) ; (poly-branch-tag margin-note) ; (poly-branch-tag noun) ; (poly-branch-func index-entry entry) ; (poly-branch-tag spot-illustration) ; #:src "img--sans-path.png" [#:has-print-version? "yes"] (define-syntax (note stx) (syntax-parse stx [(_ args ...) (with-syntax ([srcline (number->string (syntax-line stx))]) #'(note-with-srcline #:srcline srcline args ...))])) ;; My pet shortcut for for/splice. Greatly cuts down on parentheses for the ;; most common use case (looping through a single list). (define-syntax (for/s stx) (syntax-case stx () [(_ thing listofthings result-expr ...) #'(for/splice ([thing (in-list listofthings)]) result-expr ...)])) |
Modified snippets-html.rkt from [b8d08650] to [79ce1a10].
1 2 3 4 5 6 7 | #lang pollen/mode racket/base ; SPDX-License-Identifier: BlueOak-1.0.0 ; This file is licensed under the Blue Oak Model License 1.0.0. ;; Provides functions for displaying content in HTML templates. (require pollen/template | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | #lang pollen/mode racket/base ; SPDX-License-Identifier: BlueOak-1.0.0 ; This file is licensed under the Blue Oak Model License 1.0.0. ;; Provides functions for displaying content in HTML templates. (require pollen/template pollen/decode pollen/private/version racket/string racket/function racket/list txexpr "cache.rkt" |
︙ | ︙ | |||
43 44 45 46 47 48 49 | (define body-class (if (non-empty-string? class) (format " class=\"~a\"" class) "")) ◊string-append{<body◊|body-class|><main> <a href="/index.html"><header> <img src="/web-extra/mark.svg" alt="The Local Yarn" height="103" class="logo"> <h1>The Local Yarn</h1> </header></a>}) | | > | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | (define body-class (if (non-empty-string? class) (format " class=\"~a\"" class) "")) ◊string-append{<body◊|body-class|><main> <a href="/index.html"><header> <img src="/web-extra/mark.svg" alt="The Local Yarn" height="103" class="logo"> <h1>The Local Yarn</h1> </header></a>}) (define (html$-repo-links [line #f]) (define here (path->string (here-source-path))) (define line-param (if line (format "?ln=~a" line) "")) (cond [(checked-in?) ◊string-append{<div class="scm-links"> <a title="source" href="/code/file/◊|here|◊line-param">§</a> <a title="changes" href="/code/finfo?name=◊here">¢</a> </div>}] [else (format "<!-- ~a -->" here) ])) (define (html$-article-open pagenode title? title-tx published) (cond [title? |
︙ | ︙ | |||
131 132 133 134 135 136 137 | [(and (block-txexpr? (car elems)) (non-empty-string? disposition-mark)) (define-values (first-tag first-attrs first-elems) (txexpr->values (car elems))) (cons (txexpr first-tag first-attrs (cons disposition first-elems)) (cdr elems))] [else (cons disposition elems)])) (string-append* (map ->html body-elems))) | | > > | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | [(and (block-txexpr? (car elems)) (non-empty-string? disposition-mark)) (define-values (first-tag first-attrs first-elems) (txexpr->values (car elems))) (cons (txexpr first-tag first-attrs (cons disposition first-elems)) (cdr elems))] [else (cons disposition elems)])) (string-append* (map ->html body-elems))) (define (html$-note-listing-full pagenode note-id title-html-flow date srcline contents [author default-authorname] [author-url ""]) (define author-part (cond [(non-empty-string? author-url) ◊string-append{ <div class="note-meta"> —<a class="u-author h-card" href="◊|author-url|"><i>◊|author|</i></a> </div>}] [else ◊string-append{ <div class="note-meta"> —<span class="h-card"><i>◊|author|</i></span> </div>}])) (define maybe-author-class (cond [(string=? author default-authorname) "by-proprietor"] [else ""])) ◊string-append{ <article class="with-title ◊maybe-author-class hentry"> <h1 class="entry-title note-full">◊|title-html-flow|</h1> <p class="time"><a href="/◊(symbol->string pagenode)#◊note-id" class="rel-bookmark note-permlink"> <time datetime="◊date">◊ymd->english[date]</time> </a></p> ◊(html$-repo-links srcline) <section class="entry-content"> <div class="p-content p-name">◊|contents|</div> ◊author-part </section> </article>}) (define (html$-note-in-article id date contents author author-url) |
︙ | ︙ |
Modified tags-html.rkt from [6b6aeed1] to [d6b064c2].
︙ | ︙ | |||
76 77 78 79 80 81 82 | html-verse html-attrib html-link html-xref html-url html-fn html-fndef | | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | html-verse html-attrib html-link html-xref html-url html-fn html-fndef html-note-with-srcline) (define html-item (default-tag-function 'li)) (define html-section (default-tag-function 'h2)) (define html-subsection (default-tag-function 'h3)) (define html-newthought (default-tag-function 'span #:class "newthought")) (define html-caps (default-tag-function 'span #:class "caps")) (define html-center (default-tag-function 'div #:style "text-align: center")) |
︙ | ︙ | |||
259 260 261 262 263 264 265 | `(a [[href ,(string-append "#" (fn-id fn-name) (format "~a" (+ 1 fnref-num)))]] "↩"))]) `(li [[id ,(fndef-id fn-name)]] ,@definition-text ,@backrefs)))) (cond [(null? note-items) ""] [else `(section ((class "footnotes")) (hr) (ol ,@note-items))])) | | | 259 260 261 262 263 264 265 266 267 | `(a [[href ,(string-append "#" (fn-id fn-name) (format "~a" (+ 1 fnref-num)))]] "↩"))]) `(li [[id ,(fndef-id fn-name)]] ,@definition-text ,@backrefs)))) (cond [(null? note-items) ""] [else `(section ((class "footnotes")) (hr) (ol ,@note-items))])) (define (html-note-with-srcline attrs elems) (txexpr 'note attrs (decode-hardwrapped-paragraphs elems))) |
Modified web-extra/martin.css.pp from [49239008] to [883c8985].
︙ | ︙ | |||
889 890 891 892 893 894 895 896 897 898 899 900 | } .scm-links { float: none; grid-area: rightmargin; height: 100%; } .scm-links a:hover { color: #2176ff; background: none; } | > > > > < | 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 | } .scm-links { float: none; grid-area: rightmargin; height: 100%; } article.with-title .scm-links { grid-area: title; } .scm-links a:hover { color: #2176ff; background: none; } section.entry-content { grid-area: main; /* Prevent content from overriding grid column sizing */ /* See https://css-tricks.com/preventing-a-grid-blowout/ */ min-width: 0; } |
︙ | ︙ |