Overview
| Comment: | enable basic ID interpolation |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
8b33bc074d7accbfb1fffcf23e96cadb |
| User & Date: | lexi on 2022-09-09 19:04:37 |
| Other Links: | manifest | tags |
Context
|
2022-09-09
| ||
| 21:08 | macro & doc improvements check-in: 52f88f818d user: lexi tags: trunk | |
| 19:04 | enable basic ID interpolation check-in: 8b33bc074d user: lexi tags: trunk | |
| 01:39 | update docs check-in: 7b6c406de4 user: lexi tags: trunk | |
Changes
Modified cortav.ct from [718eb3ed50] to [1a665df7bf].
14 14 15 15 this manual describes cortav exhaustively, but if you just want a quick reference on how markdown translates to cortav, look no further. 16 16 17 17 * [*headings]: cortav uses almost the same syntax for headings that markdown does, except it only allows the "ATX style" headings, with one or more hash characters at the start of the line. the only differences from markdown are: 18 18 ** you can use the unicode section character [`§] instead of [`#] if you're feeling snobby 19 19 ** you must put a space between the control sequence (the sequence of hashes or section symbols, in this case) and the title text. [`# title] creates a section with the heading text "title", but [`#title] creates a new section with no heading at all; instead, it gives the anonymous section the ID [`title]. and of course, you can combine the two: [`#ttl title] creates a section with the heading text "title" and the ID [`ttl]. what are IDs for? we'll get to that in a little bit 20 20 * [*paragraphs] are mostly the same as in markdown, except that a paragraph break occurs after every newline character, not every blank line. paragraphs can be indented by however many spaces you like; such indentation will be ignored. (tabs have a special meaning, however). in cortav, you can also explicitly mark a line of text as a paragraph by preceding it with a period character ([`.]), which is useful if you want to start a paragraph with text that would otherwise be interpreted specially. 21 -* [*italic text] -- or rather, [!emphasized] text -- is written as [`\[!my spiffy italic text\]]. in cortav, these spans can be nested within other spans (or titles, or table cells, or…), and the starting and ending point is unambiguous. 22 -* [*bold text] -- or rather, [*strong] text -- is written as [`\[*my commanding bold text\]]. 23 -* [*bold-italic text] -- or rather, [![*emphasized strong text]] -- has no specific notation. rather, you create it by nesting one span within the other, for instance: [`\[*[!my ostentatious bold-italic text\]]]. 24 -* [*links] are quite different from their markdown equivalents. cortav does not have inline links, as it is intended to be easily readable in both formatted and plain-text format, and long URLs rather disrupt the flow of reading. rather, a link tag is written with the notation [`\[>nifty-link my nifty link\]], where the word [`nifty-link] immediately following the arrow is an [!identifier] indicating the destination of the link. (instead of a greater-than sign, you can also use the unicode arrow symbol [`→].) if the identifier is the same as one you've assigned to a document object, such as a section, cortav produces a link within the document to that object. otherwise, it will look for a [!reference] (or failing that, a [>rsrc resource]) to tell it the URI for the link. if nothing in the document matches the ID, an error will result and compilation will be aborted. (a reference is a key-value pair created by adding a line like [`nifty-link: https://zombo.com] [!indented by exactly one tab]. you can place this reference anywhere you like so long as it's in the same section; if you want to name a reference in another section, you have to prefix it with that section's ID, e.g. [`\[>spiffy-section.nifty-link my nifty link declared in a spiffy section\]].) 21 +* [*italic text] -- or rather, [!emphasized] text -- is written as ["[!my spiffy italic text]]. in cortav, these spans can be nested within other spans (or titles, or table cells, or…), and the starting and ending point is unambiguous. 22 +* [*bold text] -- or rather, [*strong] text -- is written as ["[*my commanding bold text]]. 23 +* [*bold-italic text] -- or rather, [![*overemphasized text]] -- has no specific notation. rather, you create it by nesting one span within the other, for instance: ["[*[!my ostentatious bold-italic text]]]. 24 +* [*links] are quite different from their markdown equivalents. cortav does not have inline links, as it is intended to be easily readable in both formatted and plain-text format, and long URLs rather disrupt the flow of reading. rather, a link tag is written with the notation ["[>nifty-link my nifty link]], where the word [`nifty-link] immediately following the arrow is an [!identifier] indicating the destination of the link. (instead of a greater-than sign, you can also use the unicode arrow symbol [`→].) if the identifier is the same as one you've assigned to a document object, such as a section, cortav produces a link within the document to that object. otherwise, it will look for a [!reference] (or failing that, a [>rsrc resource]) to tell it the URI for the link. if nothing in the document matches the ID, an error will result and compilation will be aborted. (a reference is a key-value pair created by adding a line like [`nifty-link: https://zombo.com] [!indented by exactly one tab]. you can place this reference anywhere you like so long as it's in the same section; if you want to name a reference in another section, you have to prefix it with that section's ID, e.g. ["[>spiffy-section.nifty-link my nifty link declared in a spiffy section]].) 25 25 * [*lists] use a different syntax from markdown. you can start a line with a [`*] to create an unordered list, or [`:] to create an ordered list; indentation doesn't matter. if you want to nest list items, instead of putting two spaces before the child item, you just add another star or colon. and of course, you can nest lists of different kinds within one another. 26 -* [*horizontal rules] use roughly the same syntax: three or more hyphens on a line of their own ([`\---]). underlines also work ([`___], [`-_-], [`__-__-__] etc), as do horizontal unicode box drawing characters ([`─ ━ ┈] etc). 26 +* [*horizontal rules] use roughly the same syntax: three or more hyphens on a line of their own (["---]). underlines also work ([`___], [`-_-], [`__-__-__] etc), as do horizontal unicode box drawing characters ([`─ ━ ┈] etc). 27 27 * some markdown implementations support [*tables]. cortav does too, using a very simple notation similar to the usual notation used in markdown. a key difference, however, is that cortav table cells can contain any formatting a paragraph can. 28 -* [*underlines] are supported by some markdown implementations. in cortav, you can apply them with the notation [`\[_my underlined text\]] -- please just use them sparingly when you render to HTML! 29 -* [*strikethrough] is supported by some extended versions of markdown. cortav uses the notation [`\[~my deleted text\]], with the intended semantics of text that is being removed by some revision of a document. (you can also denote text that is being [!added] by using a plus sign instead of a tilde) 28 +* [*underlines] are supported by some markdown implementations. in cortav, you can apply them with the notation ["[_my underlined text]] -- please just use them sparingly when you render to HTML! 29 +* [*strikethrough] is supported by some extended versions of markdown. cortav uses the notation ["[~my deleted text]], with the intended semantics of text that is being removed by some revision of a document. (you can also denote text that is being [!added] by using a plus sign instead of a tilde) 30 30 * [*images] are a bit more complicated, but much more versatile. see the section on [>rsrc resources] for an explanation. 31 -* [*smart quotes] and [*em dashes] are inserted automatically, just as in markdown, provided you have the [>tsmog transmogrify] extension available. (it is part of the reference implementation and defined by the spec, but not required.) in fact, you can insert longer dashes than em dashes just by increasing the number of hyphens. the reference implementation's transmogrifier also translates ascii arrows like [`\-->] into their unicode equivalents ([`→]). 32 -* [*literals] (also known as [*code text]) can be inserted with the [`\[`int main(void);\]] syntax. note however that literals are not protected from the transmogrifier, and are parsed like any other span, which may cause problems if the source code you're quoting makes use of such forbidden runes. in this case, you'll want to wrap the code span in a raw span. the syntax for this is [`\[`[\\int main(void);\]]], but since this is a bit unwieldy it can also be abbreviated as [`\[`\\int main(void);\]]. 31 +* [*smart quotes] and [*em dashes] are inserted automatically, just as in markdown, provided you have the [>tsmog transmogrify] extension available. (it is part of the reference implementation and defined by the spec, but not required.) in fact, you can insert longer dashes than em dashes just by increasing the number of hyphens. the reference implementation's transmogrifier also translates ascii arrows like ["-->] into their unicode equivalents ([`→]). 32 +* [*literals] (also known as [*code text]) can be inserted with the ["[`int main(void);]] syntax. note however that literals are not protected from the transmogrifier, and are parsed like any other span, which may cause problems if the source code you're quoting makes use of such forbidden runes. in this case, you'll want to wrap the code span in a raw span. the syntax for this is ["[`[\\int main(void);]]], but since this is a bit of an unwieldy syntax for a common operation, it can also be abbreviated as ["["int main(void);]]. 33 33 34 34 of course, this is only a small taste of what cortav can do, not even touching on key features like macros, footnotes, or equation formatting. read the sections on [>onblocks blocks] and [>onspans spans] for all the gory details. 35 35 36 36 ## encoding 37 37 a cortav document is made up of a sequence of codepoints. UTF-8 must be supported, but other encodings (such as UTF-32 or C6B) may be supported as well. lines will be derived by splitting the codepoints at the linefeed character or equivalent. note that unearthly encodings like C6B or EBCDIC will need to select their own control sequences. 38 38 39 39 ## file type ................................................................................ 97 97 ** [`~~~ language] (markdown-style shorthand syntax) 98 98 ** [`~~~ \[language\] ~~~] (cortav syntax) 99 99 ** [`~~~ \[language\] #id ~~~] 100 100 ** [`~~~ title ~~~] 101 101 ** [`~~~ title \[language\] ~~~] 102 102 ** [`~~~ \[language\] title ~~~] 103 103 ** [`~~~ title \[language\] #id ~~~] 104 -*[*reference] (tab): a line beginning with a tab is treated as a "reference." references hold out-of-line metadata for preceding text like links and footnotes. a reference consists of an identifier followed by a colon and an arbitrary number of spaces or tabs, followed by text. whether this text is interpreted as raw-text or styled-text depends on the context in which the reference is used. in encodings without tab characters, two preceding blanks can be used instead. 104 +*[*definition] ([^def-ex tab]): a line [^def-tab-enc beginning with a tab] is a multipurpose metadata syntax. the tab may be followed by an identifier, a colon, and a value string, in which case it opens a new definition; alternatively, a second tab character turns the line into a [*definition continuation], adding the remaining characters as a new line to the definition value on the previous line. when a new definition is opened on a line immediately following certain kinds of objects, such as resource, it attaches key-value metadata to that object. when a definition is not preceded by such an object, an independent [*reference] is created instad. 105 +** a [*reference] is a general mechanism for out-of-line metadata, and references are used in many different ways -- e.g. to specify link destinations, footnote contents, abbreviations, or macros. to ensure that a definition is interpreted as a reference, rather than as metadata for an object, precede it with a blank line. 106 + def-tab-enc: in encodings without tab characters, a definition is opened by a line beginning with two blanks, and continued by a line beginning with four blanks. 107 + def-ex: [*open a new reference]: [`[!\\t][$key]: [$value]] 108 + [*continue a reference]: [`[!\\t\\t][$value]] 105 109 * [*quotation] ([`<]): a line of the form [`<[$name]> [$quote]] denotes an utterance by [$name]. 106 110 * [*blockquote] ([`>]): alternate blockquote syntax. can be nested by repeating the [`>] character. 107 111 * [*subtitle/caption] ([`\--]): attaches a subtitle to the previous header, or caption to the previous object 108 112 * [*embed] ([`&]): embeds a referenced object. can be used to show images or repeat previously defined objects like lists or tables, optionally with a caption. 109 113 ** [`$[$macro] [$arg1]|[$arg2]|[$argn]…] invokes a block-level macro with the supplied arguments 110 114 *** [`$mymacro arg 1|arg 2|arg 3] 111 115 ** [`&[$image]] embeds an image or other block-level object. [!image] can be a reference with a url or file path, or it can be an embed section (e.g. for SVG files) ................................................................................ 162 166 no other features (like colspans or rowspans) are currently part of the spec but they will be added eventually (if i can figure out a decent way to implement them without creating a huge mess). 163 167 164 168 you can finish each row with a bar or plus character, but it's not necessary. only do it if you think it makes the source easier to read. 165 169 166 170 * [>ex.tab an example of table notation] 167 171 168 172 ##ident identifiers 169 -any identifier (including a reference) that is defined within a named section must be referred to from outside that section as [`[!sec].[!obj]], where [$sec] is the ID of the containing section and [$obj] is the ID of the object one wishes to reference. 173 +an identifier is a string which unambiguously names a section, block, reference, or other object of interest. every section has its own identifier namespace; to reference an object in one section from a different section, the identifier must be written as [`[$sec].[$obj]], where [$sec] is the ID of the containing section and [$obj] is the ID of the object one wishes to reference. subdocuments (such as blockquotes or resources of type [`text/x.cortav]) have their own namespace collection, so an object defined within e.g. a blockquote will not escape to the enclosing context; however, subdocuments can reference objects from the containing document in the usual fashion. 174 + 175 +identifiers can be composed through interpolation in macro expansions. for instance, the macro expansion 176 +~~~cortav 177 + xref: (see [>link-[#1] [#2]] by [#3]) 178 +the 25,953CE accession of the Hyperion Entity to the Throne Unyielding is now widely considered by the collective of ascended masters to have been fraudulent {xref disc-artax|Discursus Immundus on the Immaterial Doctrines of Redemption & Liquidation|Hierophant Artaxerxes MXIV}, but at the time was received with the near-unanimous adulation of the Manifold Hierophanies. an early dissenting voice, the Kakistarch Philomene Adumbratio of Forbidden Zone 969, 179 +~~~ 180 +is equivalent to 181 +~~~cortav 182 +the 25,953CE accession of the Hyperion Entity to the Throne Unyielding is now widely considered by the collective of ascended masters to have been fraudulent (see [>link-disc-artax Discursus Immundus on the Immaterial Doctrines of Redemption & Liquidation] by Hierophant Artaxerxes MXIV), but at the time was received with the near-unanimous adulation of the Manifold Hierophanies. an early dissenting voice, the Kakistarch Philomene Adumbratio of Forbidden Zone 969, 183 +~~~ 184 +identifiers dereferenced through macro expansions which lack an explicit section prefix are first evaluated in the context of the section [!in which the macro was defined], rather than the section in which it was expanded. the latter is only searched if the definition section has no object with a matching identifier. this behavior, while useful, is not always desirable. to force the resulting identifier (whether composed through interpolation or written out explicitly) to be evaluated in the context of the macro expansion, prefix it with a period ([`.]) to form an [*expansion-site identifier]. for example: 185 +~~~cortav 186 +#alpha section alpha 187 + link: http://example.net 188 + macro-plain-id: [>link link to example.net] 189 + macro-expsite-id: [>.link link to section-dependent destination] 190 + 191 +here are links to example.net: 192 +* {macro-plain-id} 193 +* {macro-expsite-id} 194 +* {beta.macro-expsite-id} 195 + 196 +here are links to both sites: 197 +* {macro-plain-id} [%% example.net] 198 +* {beta.macro-plain-id} [%% zombo com] 199 + 200 +#beta section beta 201 + link: http://zombo.com 202 + macro-plain-id: [>link link to zombo com] 203 + macro-expsite-id: [>.link link to some website somewhere] 204 + 205 +here are links to zombo com: 206 +* {macro-plain-id} 207 +* {macro-expsite-id} 208 +* {alpha.macro-expsite-id} 209 + 210 +here are links to both sites: 211 +* {macro-plain-id} [%% zombo com] 212 +* {alpha.macro-plain-id} [%% example.net] 213 +~~~ 170 214 171 215 ##rsrc resources 172 216 a [!resource] represents content that is not encoded directly into the source file, but which is embedded by some means in the output. resources can either be [!embedded], in which case they are compiled into the final document itself, or they can be [!linked], in which case the final document only contains a URI or similar tag referencing the resource. not all render backends support both linking and embedding embedding, nor do all backends support all object types (for instance, [`groff] does not support video embedding.) 173 217 174 218 a resource definition is begun by line consisting of an [`@] sign and an [>ident identifier]. this line is followed by any number of parameters. a parameter is a line beginning with a single tab, a keyword, a colon, and a then a value. additional lines can be added to a parameter by following it with a line that consists of two tabs followed by the text you wish to add. (this is the same syntax used by references.) a resource definition is terminated by a break, or any line that does not begin with a tab 175 219 176 220 a resource definition in use looks like this: ................................................................................ 292 336 aHRzCiB5b3VyIHdhZ2VzIHdpbGwgYmUgZG9ja2VkIGFjY29yZGluZ2x54oCdCg== 293 337 } 294 338 ~~~ 295 339 296 340 inline resources can also offer a cleaner syntax for complex multiline macros. 297 341 ~~~cortav 298 342 @def text/x.cortav { 299 - * [*[#1]] [!([#2]) 343 + * [*[#1]] [!([#2])] 300 344 *: [#3] 301 345 } 302 346 &def nuclear bunker|n|that which will not protect you from the Smiling Man 303 347 ~~~ 304 348 to make this usage simpler, resources with a type of [`text/x.cortav] can omit the MIME type field. 305 349 306 350 inline resources are a great way to extend cortav with implementation-dependent features. say you want mathtex in your cortav renderer -- all you have to do is support a new MIME type [`text/x.mathtex], and then the users can embed their math equations like so: 307 351 308 352 ~~~cortav 309 -and as we see from the value of κ below, Bose-Fleischer-Kincaid entities of Carlyle subtype γ lack interaction with the putative "Higgs field" of Athabaskan Windchime Theory, seemingly ruling out any possibility of direct interaction with the spacetime metric, and consequently removing the maximal density "limitations" that exist for bosonic matter. 353 +and as we see from the value of κ below, Bose-Fleischer-Kincaid entities of Carlyle subtype γ do not interact at all with the putative "Higgs field" of Athabaskan Windchime Theory, seemingly ruling out any distortion of the spacetime metric, and consequently removing the maximal density parameter that is defined for bosonic matter. 310 354 @ text/x.mathtex {> 311 355 %% divide subtract differentiate blah blah blah i don't know math 312 356 <} 313 -given the selective cross-interaction of γ-BFKs, we conclude that, under the prevailing cosmocelestial paradigm, the answer to the age-old question of how many angels can dance on the head of a pin is "as many as would like to." 357 +given the selective cross-interaction of γ-BFKs, we conclude that, under the prevailing cosmocelestial paradigm, the answer to the age-old question of how many angels can dance on the head of a pin is [^assump "as many as would like to"] 358 + assump: assuming a perfectly spherical angel in a vacuum 314 359 ~~~ 315 360 316 361 ### supported parameters 317 362 * [`src] (all): specifies where to find the file, what it is, and how to embed it. each line of [`src] should consist of two whitespace-separated words: MIME type and URI. the specification can also be prefixed with an extra word, [`auto], [`link], or [`embed], to control how the resource will be referenced from the output file. 318 363 ** reference mode: the optional first word; if the requested reference mode is not applicable or valid for the output format or URI given, the source line will be skipped over. 319 364 *** [`embed]: loads the resource at build time and embeds it into the output file. not all implementations may allow loading remote network resources at build time. 320 365 *** [`link]: only embeds a reference to the location of the resource. use this for e.g. live iframes, dynamic images, or images hosted by a CDN. ................................................................................ 329 374 *** [`text/css] (can be used when producing HTML files to link in an extra stylesheet, either by embedding it or referencing it from the header) 330 375 *** [`text/x.cortav] (will be parsed and inserted as a formatted text block; context variables can be passed to the file by setting [`ctx.[$var]] parameters on the resource, e.g. [`ctx.recipient-name: Mr. Winthrop]) 331 376 *** [`application/x-troff] can be used to supply sections of text written in raw [`groff] syntax. these are ignored by other renderers. 332 377 *** [`text/html] can be used to supply sections of text written in raw HTML. these are ignored by non-HTML outputs. 333 378 *** any MIME-type that matches the type of file being generated by the renderer can be used to include a block of data that will be passed directly to the renderer. 334 379 ** URI types: additional URI types can be added by extensions or different implementations, but every compliant implementation must support these URIs. 335 380 *** [`http], [`https]/[`http+tls]: accesses resources over HTTP. add a [`file] fallback if possible for the benefit of renderers/viewers that do not have internet access abilities. 336 -*** [`file]: references local files. (the meaning of "local" varies depending on the translation format.) absolute paths should begin [`file:/]; the slash should be omitted for relative paths. note that this doesn't have quite the same meaning as in HTML -- [`file] can (and usually should be) used with HTML outputs to refer to resources that reside on the same server. a cortav URI of [`file:/etc/passwd] will actually result in the link [`/etc/passwd], not [`file:///etc/passwd] when converted to HTML. generally, you only should use [`http] when you're referring to a resource that exists on a different domain. 381 +*** [`file]: references local files. (the meaning of "local" varies depending on the translation format.) absolute paths should begin [`file:/]; the slash should be omitted for relative paths. note that this doesn't have quite the same meaning as in HTML -- [`file] can (and usually should be) used with HTML outputs to refer to resources that reside on the same server. a cortav URI of [`file:/etc/passwd] will actually result in the link [`/etc/passwd], not [`file:///etc/passwd] when converted to HTML. generally, you only should use [`http] when you're referring to a resource that exists on a different domain. on systems where text and binary files are handled differently, the URIs [`file+txt:] and [`file+bin:] can be used to specify an opening mode. 382 +*** [`asset]: identical to file [`file], except that paths are interpreted relative to the asset base (the parent directory of the source file if not otherwise defined), rather than the current working directory of the [`cortav] translator process. 337 383 *** [`name]: a special URI used generally for referencing resources that are already installed on a target system and do not need to be embedded or linked, the name and type are enough for a renderer on another machine to locate the correct resource. this is useful mostly for [>fonts fonts], where it's more typical to refer to fonts that are installed on your system rather than providing paths to font files. 338 384 *** [`gemini]: accesses resources over the gemini protocol. currently you should really only use this for [`embed] resources unless you're using the gemtext renderer backend, since nothing but gemini browsers are liable to support this protocol. 339 385 *** [`role]: specifies an abstract resource determined by context, e.g. [`role:backdrop], [`role:body-font]. for use by translators to formats which make provisions for viewer control. a [`role] URI is special in that it is never embedded; it always depends on context — user preferences, environment variables, system stylesheets, what have you — at the time the output file is viewed, rather than the time of the input file being rendered. 340 386 * [`desc]: supplies a narrative description of the resources, for use as an "alt-text" when the image cannot be loaded and for screenreaders. 341 387 * [`detail]: supplies extra narrative commentary that is displayed contextually, e.g. when the user hovers her mouse cursor over the embedded object. also used for [`desc] if [`desc] is not supplied. 342 388 343 389 note that in certain cases, full MIME types do not need to be used. say you're defining a font with the [`name] URI -- you can't necessary know what file type the system fonts on another computer are going to be. in this case, you can just write [`font] instead of [`font/ttf] or [`font/woff2] or similar. all cortav needs to know in this case is what abstract kind of object you're referencing. [`groff] fonts (referenced with the [`dit] URI) don't have a specific MIME type either.
Modified cortav.lua from [3b9ae546e1] to [7f118fbbfd].
121 121 ctx.line = 0 122 122 ctx.doc = doc 123 123 ctx.doc.src = src 124 124 ctx.sec = doc:mksec() -- toplevel section 125 125 ctx.sec.origin = ctx:clone() 126 126 end; 127 127 ref = function(self,id) 128 + if self.invocation then 129 + -- allow IDs to contain template substitutions by mimicking the [#n] syntax 130 + id = id:gsub('%b[]', function(sp) 131 + -- should indirection be allowed here? TODO 132 + if sp:sub(2,2) == '#' then 133 + local n = tonumber(sp:sub(3,-2)) 134 + if n == nil then 135 + self:fail('invalid template substitution “%s” in ID “%s”', sp, id) 136 + end 137 + local arg = self.invocation.args[n] 138 + if arg == nil then 139 + self:fail('template instantiation requires at least %u arguments (in ID “%s”)',n,id) 140 + end 141 + return arg 142 + else return sp end 143 + end) 144 + 145 + end 128 146 if not id:find'%.' then 129 147 local rid = self.sec.refs[id] 130 - if self.sec.refs[id] then 131 - return self.sec.refs[id], id, self.sec 132 - else self:fail("no such ref %s in current section", id or '') end 148 + if rid then 149 + return rid, id, self.sec 150 + end 151 + 152 + --nothing in the current section, but this ID could be looked up in the context of a macro expansion. if so, check section of the site of invocation as well 153 + if self.invocation then 154 + rid = self.invocation.origin:ref(id) 155 + if rid then 156 + return rid, id, self.invocation.origin.sec 157 + end 158 + end 159 + 160 + self:fail("no such ref %s in current section", id or '') 133 161 else 134 162 local sec, ref = string.match(id, "(.-)%.(.+)") 135 - local s = self.doc.sections[sec] 163 + local s 164 + if sec == '' then 165 + if self.invocation == nil then 166 + self:fail('site-of-invocation IDs can only be dereferenced in a macro expansion (offending ID: “%s”)', id) 167 + end 168 + s = self.invocation.origin.sec 169 + end 170 + s = s or self.doc.sections[sec] 136 171 if not s then -- fall back on inheritance tree 137 172 for i, p in ipairs(self.doc.parents) do 138 173 if p.sections[sec] then 139 174 s = p.sections[sec] 140 175 break 141 176 end 142 177 end ................................................................................ 1295 1330 return { 1296 1331 kind = 'macro'; 1297 1332 macro = id; 1298 1333 args = argv; 1299 1334 } 1300 1335 end)}; 1301 1336 {seq='&', fn=blockwrap(function(s,c) 1302 - local id, cap = s:match('^&([^%s]+)%s*(.-)%s*$') 1337 + local mode, id, cap = s:match('^&([-+]?)([^%s]+)%s*(.-)%s*$') 1303 1338 if id == nil or id == '' then 1304 1339 c:fail 'malformed embed block' 1305 1340 end 1306 - if cap == '' then cap = nil end 1341 + if cap == '' then cap = nil end 1342 + if mode == '-' then mode = 'closed' 1343 + elseif mode == '+' then mode = 'open' 1344 + else mode = 'inline' end 1307 1345 return { 1308 1346 kind = 'embed'; 1309 1347 ref = id; 1310 1348 cap = cap; 1349 + mode = mode; 1311 1350 } 1312 1351 end)}; 1313 1352 {fn = insert_paragraph}; 1314 1353 } 1315 1354 1316 1355 function ct.parse_line(rawline, ctx, dest) 1317 1356 local newspan
Modified render/html.lua from [9686e0dc58] to [14fa0c3d9d].
865 865 local uri = uriForSource(s) 866 866 local fbimg, idx 867 867 if next(ctr.nodes) == nil then 868 868 idx = 1 869 869 fbimg = { 870 870 elt = 'img'; --fallback 871 871 attrs = { 872 - alt = ''; 872 + alt = obj.props.desc or obj.props.detail or ''; 873 + title = obj.props.detail; 873 874 src = uri; 875 + width = obj.props.width; 876 + height = obj.props.height; 874 877 }; 875 878 } 876 879 else idx = #ctr.nodes end 877 880 table.insert(ctr.nodes, idx, { 878 881 elt = 'source'; --fallback 879 882 attrs = { srcset = uri; }; 880 883 }) ................................................................................ 969 972 local top = rtype[2]() -- create container 970 973 for n, src in ipairs(obj.srcs) do 971 974 if rtype[1] < src.mime then 972 975 rtype[2](src, top) 973 976 end 974 977 end 975 978 local ft = flatten(top) 976 - return ft 979 + local cap = b.cap or obj.props.desc or obj.props.detail 980 + if b.mode == 'inline' then 981 + -- TODO insert caption 982 + return ft 983 + else 984 + local prop = {} 985 + if b.mode == 'open' then 986 + prop.open = true 987 + end 988 + return tag('details', prop, catenate { 989 + tag('summary', {}, 990 + cap and ( 991 + -- the block here should really be the relevant 992 + -- ref definition if an override caption isn't 993 + -- specified, but oh well 994 + sr.htmlSpan(spanparse( 995 + cap, b.origin 996 + ), b, s) 997 + ) or ''); 998 + ft; 999 + }) 1000 + end 977 1001 end 978 1002 979 1003 function block_renderers.macro(b,s) 980 1004 local all = renderSubdoc(b.doc) 981 1005 local cat = catenate(ss.map(flatten,all)) 982 1006 return tag('div', {}, cat) 983 1007 end
Modified sirsem.lua from [aed49421db] to [dec9af930b].
483 483 local n = 1 484 484 for i=1, #str, 3 do 485 485 local triple = {string.byte(str, i, i+2)} 486 486 local T = function(q) 487 487 return triple[q] or 0 488 488 end 489 489 local B = function(q) 490 - print(q) 491 490 if q <= 25 then 492 491 return string.char(0x41 + q) 493 492 elseif q <= 51 then 494 493 return string.char(0x61 + (q-26)) 495 494 elseif q <= 61 then 496 495 return string.char(0x30 + (q-52)) 497 496 elseif q == 62 then ................................................................................ 1474 1473 } 1475 1474 local c = me.class 1476 1475 for k,v in pairs(mimeclasses) do 1477 1476 if me > ss.mime(k) then 1478 1477 c = v break 1479 1478 end 1480 1479 end 1481 - print(c) 1482 1480 return c == pc 1483 1481 end; 1484 1482 }; 1485 1483 } 1486 1484 ss.mime.exn = ss.exnkind 'MIME error'