diff options
| author | Philipp Gesang <phg42.2a@gmail.com> | 2014-07-13 19:47:30 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg42.2a@gmail.com> | 2014-07-13 19:47:30 +0200 |
| commit | 1a2e7a02faa73856c665d0700303844c5219ef5e (patch) | |
| tree | 7e9e19433b777f7c238719c99202dcdbb4e1669a | |
| parent | bb91eaddcf575dbab69f8c001984711ce192270e (diff) | |
| parent | fc3414e490d272380dae269ef3153f39f759a85d (diff) | |
| download | luaotfload-1a2e7a02faa73856c665d0700303844c5219ef5e.tar.gz | |
Merge pull request #230 from phi-gamma/master
last minute fixes closing in on the release
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | doc/luaotfload-main.tex | 3 | ||||
| -rw-r--r-- | misc/luaotfload.conf.example (renamed from doc/luaotfload.conf.example) | 0 | ||||
| -rw-r--r-- | src/luaotfload-diagnostics.lua | 1 |
4 files changed, 6 insertions, 8 deletions
@@ -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 @@ -87,14 +88,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) @@ -124,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) @@ -134,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) @@ -185,8 +185,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 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. diff --git a/doc/luaotfload.conf.example b/misc/luaotfload.conf.example index 2756d62..2756d62 100644 --- a/doc/luaotfload.conf.example +++ b/misc/luaotfload.conf.example 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 |