From 379e77d53a6f5017e49e247cc87d8e20db3695df Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 13 Jul 2014 19:14:22 +0200 Subject: [doc] remove obsolete reference This got glossed over when the code of ``luaotfload.lua`` was ripped out of the DTX. No links into the implementation, for the time being. --- doc/luaotfload-main.tex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/luaotfload-main.tex b/doc/luaotfload-main.tex index 9fe9829..2e89ff0 100644 --- a/doc/luaotfload-main.tex +++ b/doc/luaotfload-main.tex @@ -1276,8 +1276,7 @@ additions. \beginsubsection {Callback Functions} The \luafunction{patch_font} callback is inserted in the wrapper -\identifier{luaotfload} provides for the font definition callback -(see below, page \pageref{define-font}). +\identifier{luaotfload} provides for the font definition callback. % At this place it allows manipulating the font object immediately after the font loader is done creating it. -- cgit v1.2.3 From 55aaa995395d670696df6542c5595b8187a7a1e9 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 13 Jul 2014 19:17:11 +0200 Subject: [build] remove obsolete targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The target ``all`` didn’t work for quite a long time and ``world`` was more or less an alias for it. The ``ctan`` target does everything now, with ``all`` as an alias. --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fd3eefb..5673cc7 100644 --- a/Makefile +++ b/Makefile @@ -87,14 +87,13 @@ DO_STATUS = $(LUA) $(STATUSSCRIPT) > /dev/null show: showtargets -all: $(GENERATED) +all: ctan builddir: $(BUILDDIR) resources: $(RESOURCES) chars: $(CHARS) status: $(STATUS) ctan: $(CTAN_ZIP) tds: $(TDS_ZIP) -world: all ctan graph: $(DOTPDF) doc: $(DOCS) @@ -185,8 +184,6 @@ mrproper: clean showtargets: @echo "Available targets:" @echo - @echo " all build everything: documentation, resources," - @echo " world build everything and package zipballs" @echo " doc compile PDF documentation" @echo " resources generate resource files (chars, glyphs)" @echo -- cgit v1.2.3 From 29a1bc3d2970f831fc3dcb0445b7992ba26982c9 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 13 Jul 2014 19:26:16 +0200 Subject: [doc,conf] move configuration example to misc/ tree --- doc/luaotfload.conf.example | 30 ------------------------------ misc/luaotfload.conf.example | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 doc/luaotfload.conf.example create mode 100644 misc/luaotfload.conf.example diff --git a/doc/luaotfload.conf.example b/doc/luaotfload.conf.example deleted file mode 100644 index 2756d62..0000000 --- a/doc/luaotfload.conf.example +++ /dev/null @@ -1,30 +0,0 @@ -;; Example configuration file for Luaotfload. This file contains the -;; defaults only, see luaotfload.conf(5) for more information. - -[db] - compress = true - formats = otf, ttf, ttc, dfont - max-fonts = 2.2517998136852e15 - scan-local = false - skip-read = false - strip = true - update-live = true - -[misc] - statistics = false - termwidth = nil - -[paths] - cache-dir = fonts - names-dir = names - index-file = luaotfload-names.lua - lookups-file = luaotfload-lookup-cache.lua - -[run] - color-callback = pre_linebreak_filter - definer = patch - log-level = 0 - resolver = cached - -;; vim:ft=dosini:et:sw=4:ts=8 - diff --git a/misc/luaotfload.conf.example b/misc/luaotfload.conf.example new file mode 100644 index 0000000..2756d62 --- /dev/null +++ b/misc/luaotfload.conf.example @@ -0,0 +1,30 @@ +;; Example configuration file for Luaotfload. This file contains the +;; defaults only, see luaotfload.conf(5) for more information. + +[db] + compress = true + formats = otf, ttf, ttc, dfont + max-fonts = 2.2517998136852e15 + scan-local = false + skip-read = false + strip = true + update-live = true + +[misc] + statistics = false + termwidth = nil + +[paths] + cache-dir = fonts + names-dir = names + index-file = luaotfload-names.lua + lookups-file = luaotfload-lookup-cache.lua + +[run] + color-callback = pre_linebreak_filter + definer = patch + log-level = 0 + resolver = cached + +;; vim:ft=dosini:et:sw=4:ts=8 + -- cgit v1.2.3 From cb67cb7aa5414186bb86d7a59a488028e19e2cf8 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 13 Jul 2014 19:29:34 +0200 Subject: [build] package example config --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5673cc7..4e21d0f 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ SRC += $(SRCSRCDIR)/luaotfload.sty SRC += $(MISCDIR)/luaotfload-blacklist.cnf VGND = $(MISCDIR)/valgrind-kpse-suppression.sup +CONFDEMO = $(MISCDIR)/luaotfload.conf.example GLYPHSCRIPT = $(SCRIPTSRCDIR)/mkglyphlist CHARSCRIPT = $(SCRIPTSRCDIR)/mkcharacters @@ -123,7 +124,7 @@ $(BUILDDIR): /dev/null define make-ctandir @$(RM) -rf $(DISTDIR) -@mkdir -p $(DISTDIR) && cp $(VGND) $(SOURCE) $(COMPILED) $(DISTDIR) +@mkdir -p $(DISTDIR) && cp $(VGND) $(CONFDEMO) $(SOURCE) $(COMPILED) $(DISTDIR) endef $(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP) @@ -133,7 +134,7 @@ $(CTAN_ZIP): $(DOCS) $(SOURCE) $(COMPILED) $(TDS_ZIP) cd $(BUILDDIR) && zip -r -9 $(CTAN_ZIPFILE) $(TDS_ZIPFILE) $(NAME) >/dev/null define run-install-doc -@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(DOCDIR) +@mkdir -p $(DOCDIR) && cp -- $(DOCSTATUS) $(VGND) $(CONFDEMO) $(DOCDIR) @mkdir -p $(SRCDIR) && cp -- $(SRCSTATUS) $(SRCDIR) @mkdir -p $(MAN1DIR) && cp -- $(TOOLMAN) $(MAN1DIR) @mkdir -p $(MAN5DIR) && cp -- $(CONFMAN) $(MAN5DIR) -- cgit v1.2.3 From fc3414e490d272380dae269ef3153f39f759a85d Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 13 Jul 2014 19:35:05 +0200 Subject: [diagnose] fix missing local --- src/luaotfload-diagnostics.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/src/luaotfload-diagnostics.lua b/src/luaotfload-diagnostics.lua index d9b13f5..e0c3c23 100644 --- a/src/luaotfload-diagnostics.lua +++ b/src/luaotfload-diagnostics.lua @@ -641,6 +641,7 @@ local diagnose = function (job) end if asked.repository == true then + local status = config.luaotfload.status check_upstream (status.notes.revision) asked.repository = nil end -- cgit v1.2.3