aboutsummaryrefslogtreecommitdiff
path: root/src/guile/skribilo/engine/lout.scm
AgeCommit message (Collapse)Author
2020-08-06Remove 'cond-expand' clauses for Guile 1.8.Ludovic Courtès
This is a followup to d183aa487d99baea3746f79759c17cf36c55dfbf. * src/guile/skribilo/debug.scm (with-debug): Remove 'cond-expand' and keep only 'guile-2' version. * src/guile/skribilo/engine/html.scm (&html-generic-document)[set-output-encoding]: Likewise. * src/guile/skribilo/engine/info.scm (document): Likewise. * src/guile/skribilo/engine/latex.scm (document): Likewise. * src/guile/skribilo/engine/lout.scm (document): Likewise. * src/guile/skribilo/evaluator.scm (%evaluate): Likewise. * src/guile/skribilo/location.scm <top level>: Likewise. * src/guile/skribilo/module.scm (maybe-set-module-name!): Likewise. * src/guile/skribilo/package/base.scm <top level>: Likewise. * src/guile/skribilo/utils/syntax.scm (unless, when): Remove. (set-correct-file-encoding!, default-to-utf-8): Keep only 'guile-2' variant. * tests/location.test <top level>: Likewise. * tests/readers/rss-2.test <top level>: Likewise.
2020-08-02lout: Replace more Unicode characters.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-encoding): Add several diacritics, guillemets, curly quotes, etc.
2020-08-01Adjust autoload lists.Ludovic Courtès
In preparation for Guile 3 support, adjust #:autoload clauses to include list all the necessary bindings, or replace them with #:use-module.
2020-08-01Write '#:use-module', '#:export', etc. instead of ':use-module', etc.Ludovic Courtès
Changes made by running: for i in $(git ls-tree -r HEAD --name-only) ; do sed -i $i -e's/:use-module/#:use-module/g ; s/:autoload/#:autoload/g ; s/:export/#:export/g' ; done
2018-03-30syntax: Rename '_' to 'G_' to avoid issues on Guile 2.2.Ludovic Courtès
Failing to do that, literal '_' would not match in contexts such as 'match' patterns on Guile 2.2. * src/guile/skribilo/utils/syntax.scm (_): Rename to... (G_): ... this. * po/Makevars (XGETTEXT_OPTIONS): Adjust accordingly. * src/guile/skribilo.scm, src/guile/skribilo/ast.scm, src/guile/skribilo/biblio.scm, src/guile/skribilo/biblio/author.scm, src/guile/skribilo/condition.scm, src/guile/skribilo/engine.scm, src/guile/skribilo/engine/info.scm, src/guile/skribilo/engine/lout.scm, src/guile/skribilo/index.scm, src/guile/skribilo/package/base.scm, src/guile/skribilo/package/lncs.scm, src/guile/skribilo/reader/rss-2.scm, src/guile/skribilo/source.scm, src/guile/skribilo/sui.scm, src/guile/skribilo/biblio/template.scm, src/guile/skribilo/verify.scm: Use 'G_' instead of '_'.
2015-06-21Assorted improvements of user-facing messages.Ludovic Courtès
* src/guile/skribilo.scm, src/guile/skribilo/engine/info.scm, src/guile/skribilo/engine/lout.scm, src/guile/skribilo/index.scm, src/guile/skribilo/package/base.scm, src/guile/skribilo/sui.scm: Tweak messages for consistency, as suggested by Benno Schulenberg <coordinator@translationproject.org>.
2015-03-11Use quotes instead of backticks in user-facing messages.Ludovic Courtès
Suggested by Benno Schulenberg <coordinator@translationproject.org>. * doc/modules/skribilo/documentation/api.scm, src/guile/skribilo.scm, src/guile/skribilo/condition.scm, src/guile/skribilo/engine/lout.scm, src/guile/skribilo/package/base.scm, src/guile/skribilo/package/jfp.scm, src/guile/skribilo/package/lncs.scm, src/guile/skribilo/package/pie.scm, src/guile/skribilo/package/slide/latex.scm, src/guile/skribilo/utils/compat.scm, src/guile/skribilo/ast.scm, src/guile/skribilo/biblio.scm, src/guile/skribilo/engine/html.scm, src/guile/skribilo/engine/info.scm, src/guile/skribilo/index.scm, src/guile/skribilo/package/web-book2.scm, src/guile/skribilo/reader/rss-2.scm, src/guile/skribilo/source.scm, src/guile/skribilo/utils/compat.scm, src/guile/skribilo/verify.scm: Change `foo' to 'foo'.
2012-05-29lout: lout-illustration: Emit the result of `inline-definitions-proc'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-illustration): Emit the output of `inline-definitions-proc'.
2012-05-24doc: lout: Render examples in a colored box.Ludovic Courtès
* doc/modules/skribilo/documentation/api.scm (le)[inline-definitions-proc]: Add @SkribiloExample. * doc/modules/skribilo/documentation/manual.scm (example)[lout]: Use @SkribiloExample. (le): Set the `includes' custom to include `diag'. * src/guile/skribilo/engine/lout.scm (frame): Mark the trick about @Floater.
2012-05-17Switch to GPLv3+.Ludovic Courtès
2012-05-14lout: Avoid passing non-literal strings to `format'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-debug): `string-append' to FMT at compile-time. Use `display' instead of `format' when literal strings are passed.
2012-05-10info/latex/lout: Set the output port's encoding.Ludovic Courtès
* src/guile/skribilo/engine/html.scm (document): Fix typo in comment. * src/guile/skribilo/engine/info.scm (document)[guile-2]: Set the current output port's encoding to "UTF-8". * src/guile/skribilo/engine/latex.scm (latex-engine)[encoding]: New custom. (document): Set the output port's encoding to that. When that encoding is "UTF-8", add the right \usepackage. * src/guile/skribilo/engine/lout.scm (lout-engine)[encoding]: New custom. (document): Set the output encoding. Emit `@SysInclude { latin2 }' for ISO-8859-2.
2012-04-25lout: Fix support of `(font :size #f)'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (font): Output a single brace when `:size' is #f.
2010-11-07lout: Improve handling of `(font :size N ...)'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-font-size): Remove. (lout-size-ratio): New procedure. (font): Use it. Change both the font size and the inter-line gap proportionally.
2010-08-15lout: Better support boolean and AST values for `date-line'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (document): Better support boolean and AST values for DATE-LINE.
2009-11-27Add `coding:' comments.Ludovic Courtès
Add `coding:' comments for use by both Emacs and Guile 2.x.
2009-03-24Add `(skribilo-module-syntax)'.Ludovic Courtès
* src/guile/skribilo/utils/syntax.scm (skribilo-module-syntax): New macro. * src/guile/*/*.scm: Use `(skribilo-module-syntax)' instead of `(fluid-set! current-reader %skribilo-module-reader)'. The goal is to be more compilation-friendly.
2008-12-21lout: Issue a warning instead of an error for `(image :url ...)'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (image): Produce a warning, not an error, if URL is provided. Use SRFI-35 conditions for invalid arguments. * po/POTFILES.in: Add. * NEWS: Update.
2008-03-06`base' package: Add `:rulecolor' option to `table'.Ludovic Courtès
* NEWS, doc/user/colframe.skb, doc/user/table.skb: Update. * src/guile/skribilo/engine/lout.scm (table): Support `:rulecolor'. * src/guile/skribilo/package/base.scm (table): Support `:rulecolor'.
2008-02-04lout: Align `prog' line numbers.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (&prog-line): Suitably align line numbers.
2008-01-28lout: Make `lout-debug' Guile-Lint-friendly.Ludovic Courtès
2008-01-28lout: Fix `ref' and `:page'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (ref): Honor `show-page-num?' for marks; get IDENT from TARGET rather than from the `text' markup option (which doesn't exist).
2008-01-28lout: Fix debugging support.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-debug): Fix.
2008-01-25lout: Make it so that customs are not modified by `slide'.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-pdf-bookmark-node?): Handle `slide-(sub)?topic' nodes. (lout-engine)[pdf-bookmark-closed-pred]: Likewise. * src/guile/skribilo/package/slide/lout.scm: Don't modify the `pdf-bookmark-closed-pred' and `pdf-bookmark-node-pred' customs. It had the side-effect of removing all bookmarks from the user manual.
2008-01-25lout: Rename `use-skribe-footnote-numbers?' custom.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-engine)[use-skribe-footnote-numbers?]: Rename to `use-lout-footnote-numbers?', which is the opposite. (footnote): Update.
2007-12-11Improve `(skribilo config)'.Ludovic Courtès
* configure.ac: Don't generate `src/guile/skribilo/config.scm'; don't substitute `SKRIBILO_DOC_DIR', `SKRIBILO_EXT_DIR' and `SKRIBILO_SKR_PATH'. * doc/modules/skribilo/documentation/env.scm (*courtes-mail*): Update. (*skribe-user-doc-url*, *skribe-dir-doc-url*): Update. * src/guile/skribilo/Makefile.am (CLEANFILES, .in): New. Include `substitute.am'. * src/guile/skribilo/config.scm.in: Overhauled. * src/guile/skribilo/engine/context.scm: Use `skribilo-version' instead of `skribilo-release'. * src/guile/skribilo/engine/lout.scm: Likewise. * src/guile/skribilo/utils/compat.scm: Use `(skribilo config)'. (skribe-release, skribe-url, skribe-doc-dir, skribe-ext-dir, skribe-default-path, skribe-scheme): New.
2007-11-30lout: Use `@M' instead of `@Eq' for special characters.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (lout-engine): Use `@M' instead of `@Eq' in the symbol table.
2007-11-30lout: Fix `toc' to allow documentation building.Ludovic Courtès
* src/guile/skribilo/engine/lout.scm (toc): Use `*document-being-output*' if `(ast-document n)' is false. Use `find-down' instead of `search-down' when looking for chapters and sections.
2007-11-29Clean up `color' module.Ludovic Courtès
* src/guile/skribilo/color.scm (*used-colors*): Remove. (*skribe-rgb-alist*): Rename to... (%rgb-alist): New. (skribe-color->rgb): Rename to... (color->rgb): New. (skribe-get-used-colors, skribe-use-color!): Remove. Update users. * src/guile/skribilo/utils/compat.scm (skribe-color->rgb, skribe-use-color!, skribe-get-used-colors): New.
2007-09-20lout: Add customs for the `book' document type.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (lout-engine)[publisher, edition, before-title-page, on-title-page, after-title-page, at-end]: New customs. (output-report-options, output-book-options): New. (document): Use them. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-109
2007-09-20lout: New `:word' option for `chapter' et al.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (lout-block-before): Handle the `:word' option (note `@BypassWord' should be added in Lout 3.37). (chapter, section, subsection, subsubsection): Mark `:word' as supported. (ref): Sanity-check IDENT. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-106
2007-08-30Moved `first-paragraph?' to `ast'.Ludovic Court`es
* src/guile/skribilo/ast.scm (first-paragraph?): New. * src/guile/skribilo/engine/lout.scm (first-paragraph?): Removed. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-103
2007-08-30lout: Added support for drop capitals.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (lout-engine)[drop-capital?, drop-capital-lines]: New customs. (first-paragraph?, make-drop-capital?, output-with-drop-capital): New. (paragraph)[first-paragraph?]: Moved outside. Use an `:action' to support drop capitals. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-102
2007-08-29lout: Provide support for separate first-paragraph gap style.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (lout-engine)[first-paragraph-gap]: New custom. (paragraph)[first-paragraph?]: New. Use it to honor `first-paragraph-gap'. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-100
2007-08-27lout: Use `@OnePage' for `figure'.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (figure): Use "@OnePage { Yes }" so that figure and caption are kept on the same page. This looks like a sane default, since multi-page figures are expected to be rare. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-94
2007-08-20lout engine: Always use `@BypassNumber'.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (lout-block-before): Always use `@BypassNumber'. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-85
2007-07-01Fixed and simplified `(ref :line ...)', aka. `line-ref'.Ludovic Courtes
* src/guile/skribilo/engine/base.scm (line-ref): Changed the way the number is obtained. * src/guile/skribilo/engine/context.scm (line-ref): Removed. * src/guile/skribilo/engine/html.scm (&prog-line): New. Produce an anchor. Needed because `mark' are no longer produced by `make-prog-body'. (line-ref): Changed the way the number is obtained. * src/guile/skribilo/engine/latex.scm (line-ref): Removed. * src/guile/skribilo/engine/lout.scm (line-ref): Removed. * src/guile/skribilo/prog.scm (make-line-mark): Removed. (make-prog-body): No longer use it. git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-133
2007-07-01`lout' engine: Fixed argument passing for `lout-illustration'.Ludovic Courtes
* src/guile/skribilo/engine/lout.scm (lout-illustration): Better compute argument string for `lout'. git-archimport-id: skribilo@sv.gnu.org--2006/skribilo--devo--1.2--patch-129
2007-06-29Factorized `bib-ref+', add a `:sort-bib-refs' options to `ref'.Ludovic Court`es
* src/guile/skribilo/biblio.scm (bib-sort-refs/number): New. * src/guile/skribilo/engine/base.scm: Use `%skribilo-module-reader' instead of the Skribe reader. (bib-ref, bib-ref+): New writer. Handle `:sort-bib-refs' in `bib-ref+'. * src/guile/skribilo/engine/context.scm (bib-ref+): Removed. * src/guile/skribilo/engine/html.scm (bib-ref+): Removed. * src/guile/skribilo/engine/latex.scm (bib-ref, bib-ref+): Removed. * src/guile/skribilo/engine/lout.scm (lout-bib-refs-sort/number): Removed. (lout-engine): Documented `bib-refs-sort-proc' as unused. (bib-ref, bib-ref+): Removed. * src/guile/skribilo/package/base.scm (ref): New `:sort-bib-refs' option. [bib-ref]: Add it to the markup's option list. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-80
2007-06-18lout engine: Export `lout-output-pdf-meta-info'.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm: Export `lout-output-pdf-meta-info', needed by the `slide' package. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-75
2007-06-11Lout engine: Work around bug with tables within floating figures.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (table): Check whether N is within a figure, in which case `@OneRow' must be preprended. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-72
2007-06-11Switched all engines to a native Guile module.Ludovic Court`es
git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-70
2007-06-04Fixed handling of figure numbering in `ref'.Ludovic Court`es
* src/guile/skribilo/ast.scm (markup-number-string): Don't use a hierarchical numbering scheme for figures. * src/guile/skribilo/engine/lout.scm (ref): Use `markup-number-string' rather than `@NumberOf' to determine the number of a figure. This guarantees numbering consistency. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-55
2007-05-04biblio: Implemented the `name+year' label style.Ludovic Court`es
* src/guile/skribilo/biblio.scm: Use `biblio author'. (assign-entries-numbers!): New (formerly `count!' in `resolve-the-bib'). (assign-entries-name+years!): New. (resolve-the-bib): New optional `assign-entries-identifiers!' argument. Use it. * src/guile/skribilo/biblio/author.scm (short-author-names): New. * src/guile/skribilo/engine/lout.scm (lout-bib-refs-sort/number): Accept non-number identifiers. (&the-bibliography): Use simply `@TaggedList' when a style other than `number' is used. (&bib-entry): Use `@DropTagItem' when the bibliography style is not `number'. * src/guile/skribilo/package/base.scm (the-bibliography): New `:labels' option. Pass the right label assignment function to `resolve-the-bib'. --This line, and those below, will be ignored-- Files to commit: src/guile/skribilo/package/base.scm src/guile/skribilo/engine/lout.scm src/guile/skribilo/biblio.scm doc/user/bib.skb src/guile/skribilo/biblio/author.scm This list might be incomplete or outdated if editing the log message was not invoked from an up-to-date changes buffer! git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-51
2007-03-28`base' package: Introduced `breakable-space'.Ludovic Court`es
* src/guile/skribilo/engine/base.scm (breakable-space): New writer. * src/guile/skribilo/engine/latex.scm (breakable-space): New writer. * src/guile/skribilo/engine/lout.scm (breakable-space): New writer. * src/guile/skribilo/package/base.scm (breakable-space): New markup. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-33
2007-03-27`lout' engine: Fixed space handling with `color'.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (color): Insert the linebreak between the left parameter of `@Color' and `@Color' itself, so as to never insert additional spaces. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-32
2007-03-13`lout' engine: Skip lines in `color'.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm (color): Skip a line at the end. git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-24
2006-12-11lout engine: Fixed automatic `url-ref' breaking wrt. spacing.Ludovic Court`es
* src/guile/skribilo/engine/lout.scm: Use `(srfi srfi-14)'. (lout-split-external-link): Use `char-set-contains?' when looking for whitespace. (lout-make-url-breakable): Do not remove newlines. git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-90
2006-12-08lout & latex engines: Fixed the output of `&prog-line'.Ludovic Court`es
* src/guile/skribilo/engine/latex.scm: Use `(srfi srfi-13)'. (&prog-line): Use markup option `:number' instead of `markup-ident' as the line number. * src/guile/skribilo/engine/lout.scm: Likewise. git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-87
2006-11-24Introduced `markup-number-string'.Ludovic Court`es
* src/guile/skribilo/ast.scm: Use `(ice-9 optargs)'. (markup-number-string): New (stolen from the Lout engine). * src/guile/skribilo/engine/lout.scm: Use it. (lout-structure-number-string): Redefined in terms of `markup-number-string'. git-archimport-id: lcourtes@laas.fr--2005-libre/skribilo--devo--1.2--patch-76