Hello community,
here is the log from the commit of package texlive-specs-m for openSUSE:Factory checked in at 2015-04-25 09:49:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-m (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-m.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-m"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-m/texlive-specs-m.changes 2015-03-01 14:46:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-m.new/texlive-specs-m.changes 2015-04-25 09:50:19.000000000 +0200
@@ -1,0 +2,60 @@
+Wed Apr 15 13:43:57 UTC 2015 - werner@suse.de
+
+- Handle unkown scripts
+
+-------------------------------------------------------------------
+Tue Apr 14 13:53:08 UTC 2015 - werner@suse.de
+
+- Make sure that tabs are used within <<-EOF...EOF pair
+
+-------------------------------------------------------------------
+Thu Apr 2 12:25:21 UTC 2015 - werner@suse.de
+
+- Package pas-cours: move runfiles from doc to working directory
+
+-------------------------------------------------------------------
+Thu Apr 2 10:33:38 UTC 2015 - werner@suse.de
+
+- Handle rpmlintrc for each meta spec file its self
+
+-------------------------------------------------------------------
+Wed Apr 1 16:47:12 UTC 2015 - werner@suse.de
+
+- The new TeXLive package layout had suppressed the detection of many
+ Provides which is fixed now.
+- The null.tex is now in texlive-knuth-lib, therefore require
+ tex(null.tex) in luatex.requires and tex.requires instead of the
+ gone texlive-misc.
+
+-------------------------------------------------------------------
+Wed Apr 1 07:47:29 UTC 2015 - werner@suse.de
+
+- Add exceltex.requires which now Requires perl(Spreadsheet::ParseExcel)
+ (boo#891617)
+- Patch kpathsea_cnf.dif moved from texlive-specs-m to texlive-specs-l
+
+-------------------------------------------------------------------
+Mon Mar 30 08:39:12 UTC 2015 - werner@suse.de
+
+- Add patch dvips_config.dif (boo#897284)
+- Remove patch pgf_plain.dif as now upstream
+- Remove patch latexdiff_env.dif as the affected file is gone
+- Modified patches
+ luaotfload_varfonts.dif
+ tetex_scripts.dif
+ tex4ht_env.dif
+- Removed files pst-node.moves and pst-plot.moves as now the files
+ are at the correct location
+
+-------------------------------------------------------------------
+Thu Mar 26 14:05:48 UTC 2015 - werner@suse.de
+
+- Update to TeXLive 2014 (timestamp 20140525 revision 34252)
+ * Support DVIPDFMx
+ * [fix] avoid luatex crash under math_mode 'decimal'
+ * luaotfload: Fix incorrect handling of font file formats luaotfload)
+ * Sync with Context beta as of 2014-04-05
+ * pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6
+ * Many more ...
+
+-------------------------------------------------------------------
Old:
----
kpathsea.doc.tar.xz
kpathsea.tar.xz
kpathsea_cnf.dif
lacheck.tar.xz
latexdiff_env.dif
lgrx.doc.tar.xz
lgrx.tar.xz
lm-math.doc.tar.xz
lm-math.tar.xz
New:
----
labyrinth.doc.tar.xz
labyrinth.tar.xz
lacheck.doc.tar.xz
lambda-lists.doc.tar.xz
lambda-lists.tar.xz
latex-git-log.doc.tar.xz
latex-git-log.tar.xz
latexindent.doc.tar.xz
latexindent.tar.xz
lengthconvert.doc.tar.xz
lengthconvert.tar.xz
lexref.doc.tar.xz
lexref.tar.xz
librecaslon.doc.tar.xz
librecaslon.tar.xz
lilyglyphs.doc.tar.xz
lilyglyphs.tar.xz
texlive-specs-m-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-m.spec ++++++
++++ 7190 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-m/texlive-specs-m.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-m.new/texlive-specs-m.spec
++++++ l2tabu-french.doc.tar.xz ++++++
++++ 14690 lines of diff (skipped)
++++++ l3experimental.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3experimental/README new/doc/latex/l3experimental/README
--- old/doc/latex/l3experimental/README 2012-02-28 01:40:17.000000000 +0100
+++ new/doc/latex/l3experimental/README 2014-05-06 00:01:18.000000000 +0200
@@ -28,20 +28,11 @@
Currently included in the CTAN release of l3experimental are the following
bundles:
- * l3dt
* l3sort
* l3str
* xcoffins
* xgalley
-l3dt
-----
-
-A 'data table' is a method of storing data in a spreadsheet-like format,
-with rows and fields. This module provides the basic management structures
-needed to work with data tables, including the ability to map to fields
-on a row-by-row basis.
-
l3sort
------
Files old/doc/latex/l3experimental/l3dt/l3dt.pdf and new/doc/latex/l3experimental/l3dt/l3dt.pdf differ
Files old/doc/latex/l3experimental/l3sort/l3sort.pdf and new/doc/latex/l3experimental/l3sort/l3sort.pdf differ
Files old/doc/latex/l3experimental/l3str/l3flag.pdf and new/doc/latex/l3experimental/l3str/l3flag.pdf differ
Files old/doc/latex/l3experimental/l3str/l3regex.pdf and new/doc/latex/l3experimental/l3str/l3regex.pdf differ
Files old/doc/latex/l3experimental/l3str/l3str-convert.pdf and new/doc/latex/l3experimental/l3str/l3str-convert.pdf differ
Files old/doc/latex/l3experimental/l3str/l3str-format.pdf and new/doc/latex/l3experimental/l3str/l3str-format.pdf differ
Files old/doc/latex/l3experimental/l3str/l3str.pdf and new/doc/latex/l3experimental/l3str/l3str.pdf differ
Files old/doc/latex/l3experimental/l3str/l3tl-analysis.pdf and new/doc/latex/l3experimental/l3str/l3tl-analysis.pdf differ
Files old/doc/latex/l3experimental/l3str/l3tl-build.pdf and new/doc/latex/l3experimental/l3str/l3tl-build.pdf differ
Files old/doc/latex/l3experimental/xcoffins/xcoffins.pdf and new/doc/latex/l3experimental/xcoffins/xcoffins.pdf differ
Files old/doc/latex/l3experimental/xgalley/l3galley.pdf and new/doc/latex/l3experimental/xgalley/l3galley.pdf differ
Files old/doc/latex/l3experimental/xgalley/xgalley.pdf and new/doc/latex/l3experimental/xgalley/xgalley.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3experimental.doc.tlpobj new/tlpkg/tlpobj/l3experimental.doc.tlpobj
--- old/tlpkg/tlpobj/l3experimental.doc.tlpobj 2013-03-13 04:39:26.000000000 +0100
+++ new/tlpkg/tlpobj/l3experimental.doc.tlpobj 2014-05-06 03:31:21.000000000 +0200
@@ -1,11 +1,10 @@
name l3experimental.doc
category Package
-revision 29361
+revision 33859
shortdesc doc files of l3experimental
relocated 1
-docfiles size=1745
+docfiles size=1622
RELOC/doc/latex/l3experimental/README
- RELOC/doc/latex/l3experimental/l3dt/l3dt.pdf
RELOC/doc/latex/l3experimental/l3sort/l3sort.pdf
RELOC/doc/latex/l3experimental/l3str/l3flag.pdf
RELOC/doc/latex/l3experimental/l3str/l3regex.pdf
++++++ l3experimental.tar.xz ++++++
++++ 3875 lines of diff (skipped)
++++++ l3kernel.doc.tar.xz ++++++
Files old/doc/latex/l3kernel/expl3.pdf and new/doc/latex/l3kernel/expl3.pdf differ
Files old/doc/latex/l3kernel/interface3.pdf and new/doc/latex/l3kernel/interface3.pdf differ
Files old/doc/latex/l3kernel/l3docstrip.pdf and new/doc/latex/l3kernel/l3docstrip.pdf differ
Files old/doc/latex/l3kernel/l3styleguide.pdf and new/doc/latex/l3kernel/l3styleguide.pdf differ
Files old/doc/latex/l3kernel/l3syntax-changes.pdf and new/doc/latex/l3kernel/l3syntax-changes.pdf differ
Files old/doc/latex/l3kernel/source3.pdf and new/doc/latex/l3kernel/source3.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/l3kernel/source3body.tex new/doc/latex/l3kernel/source3body.tex
--- old/doc/latex/l3kernel/source3body.tex 2013-03-17 22:51:00.000000000 +0100
+++ new/doc/latex/l3kernel/source3body.tex 2014-05-06 00:01:18.000000000 +0200
@@ -444,5 +444,6 @@
\DocInput{l3luatex.dtx}
\DocInput{l3candidates.dtx}
+\DocInput{l3drivers.dtx}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3kernel.doc.tlpobj new/tlpkg/tlpobj/l3kernel.doc.tlpobj
--- old/tlpkg/tlpobj/l3kernel.doc.tlpobj 2013-03-18 04:36:43.000000000 +0100
+++ new/tlpkg/tlpobj/l3kernel.doc.tlpobj 2014-05-23 01:11:19.000000000 +0200
@@ -1,9 +1,9 @@
name l3kernel.doc
category Package
-revision 29409
+revision 34204
shortdesc doc files of l3kernel
relocated 1
-docfiles size=1664
+docfiles size=1722
RELOC/doc/latex/l3kernel/README
RELOC/doc/latex/l3kernel/expl3.pdf
RELOC/doc/latex/l3kernel/interface3.pdf
++++++ l3kernel.tar.xz ++++++
++++ 33789 lines of diff (skipped)
++++++ l3packages.doc.tar.xz ++++++
Files old/doc/latex/l3packages/l3keys2e/l3keys2e.pdf and new/doc/latex/l3packages/l3keys2e/l3keys2e.pdf differ
Files old/doc/latex/l3packages/xfrac/xfrac.pdf and new/doc/latex/l3packages/xfrac/xfrac.pdf differ
Files old/doc/latex/l3packages/xparse/xparse.pdf and new/doc/latex/l3packages/xparse/xparse.pdf differ
Files old/doc/latex/l3packages/xtemplate/xtemplate.pdf and new/doc/latex/l3packages/xtemplate/xtemplate.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3packages.doc.tlpobj new/tlpkg/tlpobj/l3packages.doc.tlpobj
--- old/tlpkg/tlpobj/l3packages.doc.tlpobj 2013-03-13 04:39:35.000000000 +0100
+++ new/tlpkg/tlpobj/l3packages.doc.tlpobj 2014-05-06 03:31:40.000000000 +0200
@@ -1,9 +1,9 @@
name l3packages.doc
category Package
-revision 29361
+revision 33859
shortdesc doc files of l3packages
relocated 1
-docfiles size=644
+docfiles size=482
RELOC/doc/latex/l3packages/README
RELOC/doc/latex/l3packages/l3keys2e/l3keys2e.pdf
RELOC/doc/latex/l3packages/xfrac/xfrac.pdf
++++++ l3packages.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/l3packages/l3keys2e/l3keys2e.sty new/tex/latex/l3packages/l3keys2e/l3keys2e.sty
--- old/tex/latex/l3packages/l3keys2e/l3keys2e.sty 2013-03-12 23:38:22.000000000 +0100
+++ new/tex/latex/l3packages/l3keys2e/l3keys2e.sty 2014-05-06 00:01:18.000000000 +0200
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3keys2e.dtx (C) Copyright 2009,2011-2013 The LaTeX3 Project
+%% File: l3keys2e.dtx (C) Copyright 2009,2011-2014 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2013/03/12]
-\@ifpackagelater{expl3}{2013/03/12}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -59,10 +59,11 @@
}%
\endinput
}
-\GetIdInfo$Id: l3keys2e.dtx 4467 2013-03-12 08:29:05Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4740 2014-05-05 14:04:24Z joseph $
{LaTeX2e option processing using LaTeX3 keys}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
\clist_new:N \l__keys_latexe_options_clist
\bool_new:N \l__keys_process_class_bool
\cs_new_protected:Npn \__keys_latexe_options:n #1
@@ -81,7 +82,11 @@
}
}
}
- \keys_set:nV {#1} \l__keys_latexe_options_clist
+ \clist_map_inline:Nn \l__keys_latexe_options_clist
+ {
+ \tl_set:Nn \CurrentOption {##1}
+ \keys_set:nn {#1} {##1}
+ }
\AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: }
}
\cs_new_protected:Npn \__keys_latexe_options_global:n #1
@@ -98,14 +103,20 @@
}
\cs_new_protected:Npn \__keys_latexe_options_class:n #1
{
- \keys_if_exist:nnTF {#1} { unknown }
- { \clist_put_right:No \l__keys_latexe_options_clist \@classoptionslist }
+ \cs_if_free:cF { opt@ \@currname . \@currext }
{
- \clist_map_inline:Nn \@classoptionslist
+ \keys_if_exist:nnTF {#1} { unknown }
+ {
+ \clist_put_right:Nv \l__keys_latexe_options_clist
+ { opt@ \@currname . \@currext }
+ }
{
- \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
- { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
- { \clist_put_right:Nn \@unusedoptionlist {##1} }
+ \clist_map_inline:cn { opt@ \@currname . \@currext }
+ {
+ \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
+ { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
+ { \clist_put_right:Nn \@unusedoptionlist {##1} }
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/l3packages/xfrac/xfrac.sty new/tex/latex/l3packages/xfrac/xfrac.sty
--- old/tex/latex/l3packages/xfrac/xfrac.sty 2012-11-23 00:37:49.000000000 +0100
+++ new/tex/latex/l3packages/xfrac/xfrac.sty 2014-05-06 00:01:18.000000000 +0200
@@ -14,7 +14,7 @@
%% Do not distribute a modified version of this file.
%%
%% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
-%% (C) 2011,2012 The LaTeX3 Project
+%% (C) 2011,2012,2014 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -48,7 +48,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\GetIdInfo$Id: xfrac.dtx 4299 2012-11-09 18:48:51Z joseph $
+\GetIdInfo$Id: xfrac.dtx 4728 2014-05-04 13:25:37Z joseph $
{L3 Experimental split-level fractions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/l3packages/xparse/xparse.sty new/tex/latex/l3packages/xparse/xparse.sty
--- old/tex/latex/l3packages/xparse/xparse.sty 2013-03-12 23:38:22.000000000 +0100
+++ new/tex/latex/l3packages/xparse/xparse.sty 2014-05-06 00:01:18.000000000 +0200
@@ -17,7 +17,7 @@
%% David Carlisle
%% (C) Copyright 2004-2008 Frank Mittelbach,
%% The LaTeX3 Project
-%% (C) Copyright 2009-2013 The LaTeX3 Project
+%% (C) Copyright 2009-2014 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2013/03/12]
-\@ifpackagelater{expl3}{2013/03/12}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xparse.dtx 4467 2013-03-12 08:29:05Z joseph $
+\GetIdInfo$Id: xparse.dtx 4740 2014-05-05 14:04:24Z joseph $
{L3 Experimental document command parser}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -546,17 +546,20 @@
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_g:w
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { g }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_G:w #1
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { G }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_l:w
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { l }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_m:w
@@ -600,12 +603,14 @@
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_u:w #1
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { u }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_type_v:w
{
- \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+ { v }
\__xparse_add_expandable_type_m:w
}
\cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_mandatory:n #1
@@ -1399,20 +1404,20 @@
{
You~have~used~\NewDocumentCommand
with~a~command~that~already~has~a~definition. \\
- The~existing~definition~of~'#1'~will~be~overwritten.
+ The~existing~definition~of~'#1'~will~not~be~altered.
}
\__msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
{ Command ~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentCommand
- with~a~command~that~was~never~defined.\\
+ with~a~command~that~was~never~defined. \\
A~new~command~'#1'~will~be~created.
}
\__msg_kernel_new:nnnn { xparse } { environment-already-defined }
{ Environment~'#1'~already~defined! }
{
You~have~used~\NewDocumentEnvironment
- with~an~environment~that~already~has~a~definition.\\
+ with~an~environment~that~already~has~a~definition. \\
The~existing~definition~of~'#1'~will~be~overwritten.
}
\__msg_kernel_new:nnnn { xparse } { environment-mismatch }
@@ -1425,18 +1430,20 @@
{ Environment~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentEnvironment
- with~an~environment~that~was~never~defined.\\
+ with~an~environment~that~was~never~defined. \\
A~new~environment~'#1'~will~be~created.
}
\__msg_kernel_new:nnnn { xparse } { environment-unknown }
{ Environment~'#1'~undefined. }
{
You~have~tried~to~start~an~environment~called~'#1',~
- but~this~has~never~been~defined.\\
+ but~this~has~never~been~defined. \\
The~command~will~be~ignored.
}
\__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
- { Argument~specification~for~expandable~command~ends~with~optional~argument. }
+ {
+ Argument~specification~for~expandable~command~ends~with~optional~argument.
+ }
{
\c_msg_coding_error_text_tl
Expandable~commands~must~have~a~final~mandatory~argument~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/l3packages/xtemplate/xtemplate.sty new/tex/latex/l3packages/xtemplate/xtemplate.sty
--- old/tex/latex/l3packages/xtemplate/xtemplate.sty 2013-03-12 23:38:22.000000000 +0100
+++ new/tex/latex/l3packages/xtemplate/xtemplate.sty 2014-05-06 00:01:18.000000000 +0200
@@ -17,7 +17,7 @@
%% David Carlisle
%% (C) Copyright 2004-2010 Frank Mittelbach,
%% The LaTeX3 Project
-%% (C) Copyright 2011-2013 The LaTeX3 Project
+%% (C) Copyright 2011-2014 The LaTeX3 Project
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2013/03/12]
-\@ifpackagelater{expl3}{2013/03/12}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
}%
\endinput
}
-\GetIdInfo$Id: xtemplate.dtx 4467 2013-03-12 08:29:05Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4740 2014-05-05 14:04:24Z joseph $
{L3 Experimental prototype document functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/l3packages.tlpobj new/tlpkg/tlpobj/l3packages.tlpobj
--- old/tlpkg/tlpobj/l3packages.tlpobj 2013-03-13 04:39:36.000000000 +0100
+++ new/tlpkg/tlpobj/l3packages.tlpobj 2014-05-06 03:31:42.000000000 +0200
@@ -1,27 +1,28 @@
name l3packages
category Package
-revision 29361
+revision 33859
shortdesc High-level LaTeX3 concepts.
relocated 1
longdesc The bundle holds prototype implementations of concepts for a
longdesc LaTeX designer interface, to be used with the experimental
longdesc LaTeX kernel as programming tools and kernel support. Packages
-longdesc provided in this release are: - l3keys2e, which makes the
+longdesc provided in this release are: l3keys2e, which makes the
longdesc facilities of the kernel module l3keys available for use by
-longdesc LaTeX 2e packages; - xfrac, which provides flexible split-level
-longdesc fractions; - xparse, which provides a high-level interface for
-longdesc declaring document commands; and - xtemplate, which provides a
+longdesc LaTeX 2e packages; xfrac, which provides flexible split-level
+longdesc fractions; xparse, which provides a high-level interface for
+longdesc declaring document commands; and xtemplate, which provides a
longdesc means of defining generic functions using a key-value syntax.
longdesc All the files of the bundle are also available in the
longdesc Subversion (SVN) repository of the LaTeX3 Project. The bundle
-longdesc on CTAN is based on a snapshot of the SVN repository on 2012-
-longdesc 11-21.
+longdesc on CTAN is based on a snapshot of the SVN repository on; it
+longdesc should be used with copies of the l3kernel at SVN version 2544
+longdesc or later.
runfiles size=33
RELOC/tex/latex/l3packages/l3keys2e/l3keys2e.sty
RELOC/tex/latex/l3packages/xfrac/xfrac.sty
RELOC/tex/latex/l3packages/xparse/xparse.sty
RELOC/tex/latex/l3packages/xtemplate/xtemplate.sty
catalogue-ctan /macros/latex/contrib/l3packages
-catalogue-date 2013-03-12 10:55:10 +0100
+catalogue-date 2014-05-05 18:41:10 +0200
catalogue-license lppl1.3
-catalogue-version SVN 4467
+catalogue-version SVN 4742
++++++ latex-bin.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/latex.1 new/texmf-dist/doc/man/man1/latex.1
--- old/texmf-dist/doc/man/man1/latex.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/latex.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.TH LATEX 1 "14 May 2010" "Web2C 2013"
+.TH LATEX 1 "14 May 2010" "Web2C 2014"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Files old/texmf-dist/doc/man/man1/latex.man1.pdf and new/texmf-dist/doc/man/man1/latex.man1.pdf differ
Files old/texmf-dist/doc/man/man1/pdflatex.man1.pdf and new/texmf-dist/doc/man/man1/pdflatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex-bin.doc.tlpobj new/tlpkg/tlpobj/latex-bin.doc.tlpobj
--- old/tlpkg/tlpobj/latex-bin.doc.tlpobj 2013-04-09 03:40:26.000000000 +0200
+++ new/tlpkg/tlpobj/latex-bin.doc.tlpobj 2014-04-29 03:29:59.000000000 +0200
@@ -1,6 +1,6 @@
name latex-bin.doc
category TLCore
-revision 29764
+revision 33736
shortdesc doc files of latex-bin
docfiles size=9
texmf-dist/doc/man/man1/latex.1
++++++ latex-referenz.doc.tar.xz ++++++
++++ 20181 lines of diff (skipped)
++++++ latex-tds.doc.tar.xz ++++++
++++ 5884 lines of diff (skipped)
++++++ latex-tds.source.tar.xz ++++++
++++ 2717 lines of diff (skipped)
++++++ latex.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/latex.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/latex.doc.tar.xz differ: char 26, line 1
++++++ latex.tar.xz ++++++
++++ 4849 lines of diff (skipped)
++++++ latex2e-help-texinfo-spanish.doc.tar.xz ++++++
++++ 44257 lines of diff (skipped)
++++++ latex2e-help-texinfo.doc.tar.xz ++++++
++++ 14325 lines of diff (skipped)
++++++ latex2man.doc.tar.xz ++++++
++++ 2729 lines of diff (skipped)
++++++ latex2man.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latex2man.tlpobj new/tlpkg/tlpobj/latex2man.tlpobj
--- old/tlpkg/tlpobj/latex2man.tlpobj 2013-04-08 21:26:05.000000000 +0200
+++ new/tlpkg/tlpobj/latex2man.tlpobj 2013-10-25 03:21:11.000000000 +0200
@@ -1,6 +1,6 @@
name latex2man
category Package
-revision 29725
+revision 31989
shortdesc Translate LaTeX-based manual pages into Unix man format.
longdesc A tool to translate UNIX manual pages written with LaTeX into a
longdesc man-page format understood by the Unix man(1) command.
++++++ latexdiff.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/latexdiff-vc.1 new/texmf-dist/doc/man/man1/latexdiff-vc.1
--- old/texmf-dist/doc/man/man1/latexdiff-vc.1 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/man/man1/latexdiff-vc.1 2013-06-27 00:57:37.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "LATEXDIFF-VC 1"
-.TH LATEXDIFF-VC 1 "2012-12-16" "perl v5.12.4" " "
+.TH LATEXDIFF-VC 1 "2013-06-10" "perl v5.14.2" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Files old/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf and new/texmf-dist/doc/man/man1/latexdiff-vc.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/latexdiff.1 new/texmf-dist/doc/man/man1/latexdiff.1
--- old/texmf-dist/doc/man/man1/latexdiff.1 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/man/man1/latexdiff.1 2013-06-27 00:57:37.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "LATEXDIFF 1"
-.TH LATEXDIFF 1 "2012-12-16" "perl v5.12.4" " "
+.TH LATEXDIFF 1 "2013-06-09" "perl v5.14.2" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -679,7 +679,7 @@
If a match to \f(CW\*(C`ARRENV\*(C'\fR is found within an inline math environment within a deleted or added block, then the inlined math
is surrounded by \f(CW\*(C`\embox{\*(C'\fR...\f(CW\*(C`}\*(C'\fR. This is necessary as underlining does not work within inlined array environments.
.Sp
-[ Default: \f(CW\*(C`ARRENV\*(C'\fR=\f(CW\*(C`(?:array|[pbvBV]matrix)\*(C'\fR\
+[ Default: \f(CW\*(C`ARRENV\*(C'\fR=\f(CW\*(C`(?:array|[pbvBV]matrix)\*(C'\fR\
.ie n .IP """COUNTERCMD""" 10
.el .IP "\f(CWCOUNTERCMD\fR" 10
.IX Item "COUNTERCMD"
@@ -751,8 +751,8 @@
.SH "POD ERRORS"
.IX Header "POD ERRORS"
Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 2942:" 4
-.IX Item "Around line 2942:"
+.IP "Around line 2956:" 4
+.IX Item "Around line 2956:"
=over should be: '=over' or '=over positive_number'
.Sp
-You can't have =items (as at line 2948) unless the first thing after the =over is an =item
+You can't have =items (as at line 2962) unless the first thing after the =over is an =item
Files old/texmf-dist/doc/man/man1/latexdiff.man1.pdf and new/texmf-dist/doc/man/man1/latexdiff.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/latexrevise.1 new/texmf-dist/doc/man/man1/latexrevise.1
--- old/texmf-dist/doc/man/man1/latexrevise.1 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/man/man1/latexrevise.1 2013-06-27 00:57:37.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "LATEXREVISE 1"
-.TH LATEXREVISE 1 "2012-12-16" "perl v5.12.4" " "
+.TH LATEXREVISE 1 "2013-01-27" "perl v5.14.2" " "
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Files old/texmf-dist/doc/man/man1/latexrevise.man1.pdf and new/texmf-dist/doc/man/man1/latexrevise.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexdiff/contrib/README.latexchanges new/texmf-dist/doc/support/latexdiff/contrib/README.latexchanges
--- old/texmf-dist/doc/support/latexdiff/contrib/README.latexchanges 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/support/latexdiff/contrib/README.latexchanges 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-latexchanges.py (Jan-Ake Larsson):
-Here's a wrapper I wrote for latexdiff, intended as a drop-in
-replacement for latex, when you have several numbered (or dated)
-versions of a manuscript. My coauthors don't as a rule know what CVS or
-SVN is, they simply use a number or date for the different versions.
-
-latexchanges replaces the current DVI with one that includes a
-latexdiff to the last version. The last version is selected as the
-TEX file in the same directory with the same prefix (up to a number
-or a dot), that has an mtime immediately preceding the given TEX
-file.
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexdiff/contrib/latexchanges.py new/texmf-dist/doc/support/latexdiff/contrib/latexchanges.py
--- old/texmf-dist/doc/support/latexdiff/contrib/latexchanges.py 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/support/latexdiff/contrib/latexchanges.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-#! /bin/env python
-# latexchanges
-#
-# Wrapper for latexdiff, intended as a drop-in replacement for latex,
-# when you have several numbered (or dated) versions of a manuscript.
-# My coauthors don't as a rule know what CVS or SVN is, they simply
-# use a number or date for the different versions.
-#
-# latexchanges replaces the current DVI with one that includes a
-# latexdiff to the last version. The last version is selected as the
-# TEX file in the same directory with the same prefix (up to a number
-# or a dot), that has an mtime immediately preceding the given TEX
-# file.
-#
-# (I should probably add CVS version numbering too, at some point.)
-#
-# Copyright (C) 2009 by Jan-\AA{}ke Larsson
-# Released under the terms of the GNU General Public License (GPL)
-# Version 2. See http://www.gnu.org/ for details.
-#
-# Please do provide patches and bug reports, but remember: if it
-# breaks, you get to keep the pieces.
-#
-# Jan-\AA{}ke Larsson
-# Sept 16 2009
-
-from os import listdir,system,stat
-from sys import argv
-from re import split
-
-name=""
-newarg=[]
-
-# Find filename argument
-for i in range(1,len(argv)):
- if argv[i][-4:]==".tex":
- basename=split('[0-9.]',argv[i])[0]
- name=argv[i][:-4]
- newarg.append(name+".changes.tex")
- else:
- newarg.append(argv[i])
-
-if name:
- print "Filename",name+".tex"
- print "Prefix is",basename
- # Find last archived version
- mtime=stat(name+".tex").st_mtime
- old_mtime=0
- ls=listdir(".")
- for j in ls:
- if j.startswith(basename) and j.endswith(".tex")\
- and not j.endswith(".changes.tex"):
- tmptime=stat(j).st_mtime
- if mtime>tmptime and old_mtime0:
- print "Comparing with",oldname
- system ("/bin/cp "+name+".aux "+name+".changes.aux")
- system ("/bin/cp "+name+".bbl "+name+".changes.bbl")
- system ("latexdiff "+oldname+" "+name+".tex > "+name+".changes.tex")
- system ("latex "+" ".join(newarg))
- system ("cp "+name+".changes.dvi "+name+".dvi")
- else:
- system ("latex "+" ".join(argv[1:]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap new/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap
--- old/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap 1970-01-01 01:00:00.000000000 +0100
@@ -1,192 +0,0 @@
-#!/bin/bash
-#
-# latexdiff-wrap
-#
-# Wrapper for latexdiff, to
-# * provide support for documents consiting of more than 1 latex file
-# * provide my common arguments
-#
-# Copyright (C) by Volker Kuhlmann
-# Released under the terms of the GNU General Public License (GPL) Version 2.
-# See http://www.gnu.org/ for details.
-#
-# Volker Kuhlmann
-# 5, 6, 7, 12, 16, 17 Oct 2005
-# 31 Jan; 5, 7, 13, 15 Feb 2006
-#
-
-VERSION="0.6, 15 Feb 2006"
-AUTHOR="Volker Kuhlmann "
-COPYRIGHT="Copyright (C) 2005-2006"
-
-
-####
-#### Constants and initialised variables
-#
-diffcmd="latexdiff"
-diffrc="$HOME/texmf/latexdiff"
-#diffargs="-e latin1 --ignore-warnings -p latexdiff-preamble.sty"
-diffargs="-e latin1 --ignore-warnings"
-diffargs="$diffargs --append-safecmd $diffrc/safe-cmds"
-diffargs="$diffargs --append-textcmd $diffrc/text-cmds"
-# Note: Can't use multiple --append-safecmd
-# show current command lists:
-#diffcmd="$diffcmd --show-safecmd --show-textcmd --show-config"
-
-
-####
-#### Version, Usage, Help
-#
-show_version() {
- echo "${0##*/} version $VERSION
-$COPYRIGHT by $AUTHOR"
-}
-
-show_usage() {
- echo "
-Usage: ${0##*/} OLDDIR NEWDIR DIFFDIR [DIFFARGS --] FILE.tex [...]
- ${0##*/} --show [DIFFARGS]
-Version $VERSION
-$COPYRIGHT by $AUTHOR
-"
-}
-
-show_help() {
- show_usage
- echo "\
-For each FILE.tex, build a new file DIFFDIR/FILE.tex with markup of the changes
-which were made from OLDDIR/FILE.tex to NEWDIR/FILE.tex.
-Any path given with FILE.tex is stripped off.
-Any DIFFARGS are added to the latexdiff call, if present (remember to follow
-them with a double-hyphen on its own before the FILE arguments).
-
-With --show, shows the settings latexdiff would be running with, including the
-changes applied by the user.
-"
-}
-
-# For scripts not using function library only:
-Version() { show_version; exitwith ErrVersion; }
-Usage() { show_help; exitwith ErrUsage; }
-Help() { test "$1" && exitwith ErrHelp show_help; show_help; exitwith ErrOK; }
-
-
-####
-#### Error/Exit codes
-#
-exitwith() {
- exec 1>&2 # write stdout on stderr instead
- case "$1" in
- ErrOK)
- exit 0;;
- ErrVersion|ErrUsage|ErrHelp)
- # Output generated by function (program) $2, if given
- test -n "$2" && "$2"
- exit 1;;
- # more codes in here
- # more codes in here
- ErrBadoption)
- echo "Bad option '$2'."
- echo "Call with -h for help."
- exit 9;;
- ErrMissingParameter)
- echo "A required parameter for option $2 is missing."
- echo "Call with -h for help."
- exit 9;;
- *)
- echo "Internal error: exitwith() called with illegal error code '$1'."
- exit 19;;
- esac
-}
-
-
-####
-#### Parse command line parameters
-#
-
-# If the next arg starts with a "-", collect additional argument for latexdiff
-# until "--".
-scanextraargs() {
- addargs=()
- case "$1" in -*)
- while [ $# -gt 0 -a "$1" != "--" ]; do
- addargs=( "${addargs[@]}" "$1" )
- shift
- done
- test "$1" == "--" && shift
- ;; esac
- fileargs=( "$@" )
-}
-
-case "$1" in
- --version) Version;;
- --usage) Usage;;
- --help|-h|-help) Help;;
- --show)
- shift
- scanextraargs "$@"
- (set -x
- $diffcmd $diffargs "${addargs[@]}" \
- --show-safecmd --show-textcmd --show-config
- ) | fmt
- exit $? ;;
-esac
-
-olddir="${1%/}"
-newdir="${2%/}"
-diffdir="${3%/}"
-
-if ! [ -d "$olddir" -a -d "$newdir" -a -d "$diffdir" ]; then
- Help 1>&2 err
-fi
-
-shift 3
-
-scanextraargs "$@"
-set -- "${fileargs[@]}"
-
-
-
-####
-#### Functions
-#
-#set -x
-Log() { echo 1>&2 "+ $@"; "$@"; }
-
-
-####
-#### Main
-#
-
-# Create output directory, just in case.
-(set -x
-mkdir -p "$diffdir"
-)
-while [ $# -gt 0 ]; do
- file="${1##*/}"
- echo Examining: "$file"
- # No point running latexdiff if both files are identical,
- # but run latexdiff on top-level LaTeX file in any case.
- if cmp --quiet "$olddir/$file" "$newdir/$file" \
- && ! grep -lq '\\begin.*{document}' "$newdir/$file"; then
- (set -x
- cp -p "$olddir/$file" "$diffdir"
- )
- else
- # Delete file, to make sure it's not clobbered by redirecting stdout
- # in case it's a symlink to te original.
- test -f "$diffdir/$file" && (set -x
- rm "$diffdir/$file"
- )
- # Run latexdiff if both input files are present.
- run=1
- test -f "$olddir/$file" || { echo 1>&2 "No file: $olddir/$file"; run=; }
- test -f "$newdir/$file" || { echo 1>&2 "No file: $newdir/$file"; run=; }
- test -n "$run" && \
- (set -x
- $diffcmd $diffargs "${addargs[@]}" \
- "$olddir/$file" "$newdir/$file" > "$diffdir/$file"
- )
- fi
- shift
-done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexdiff/contrib/latexdiff.spec new/texmf-dist/doc/support/latexdiff/contrib/latexdiff.spec
--- old/texmf-dist/doc/support/latexdiff/contrib/latexdiff.spec 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/support/latexdiff/contrib/latexdiff.spec 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-Summary: Diff for LaTeX files
-Name: latexdiff
-Version: 0.5
-Release: 1
-License: GPL
-Group: Productivity/Publishing/TeX/Utilities
-URL: http://www.tug.org/tex-archive/help/Catalogue/entries/latexdiff.html
-Source0: %{name}.zip
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# only required for 'make install-ext'
-# Requires: perl-Algorithm-Diff
-
-
-%description
-latexdiff is a Perl script, which compares two latex files and marks
-up significant differences between them (i.e. a diff for latex files).
- Various options are available for visual markup using standard latex
-packages such as "color.sty". Changes not directly affecting visible
-text, for example in formatting commands, are still marked in
-the latex source.
-
-(C) 2004 Frederik Tilmann
-
-
-%prep
-%setup -n %{name}
-
-
-%build
-# quick had to adapt the Makefile
-%{__mv} Makefile Makefile.old
-%{__sed} \
- -e "s;INSTALLPATH = /usr/local;INSTALLPATH = \${DESTDIR}%{_prefix};" \
- -e "s;INSTALLMANPATH = \$(INSTALLPATH)/man;INSTALLMANPATH = \${DESTDIR}%{_mandir};" \
- Makefile.old > Makefile
-
-
-%install
-%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
-
-%makeinstall
-
-
-%clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d "${RPM_BUILD_ROOT}" ] && %{__rm} -rf "${RPM_BUILD_ROOT}"
-
-
-%files
-%defattr(-,root,root)
-%doc example CHANGES LICENSE README
-%{_bindir}/*
-%{_mandir}/man*/*
-
-%changelog
-* Thu Jan 4 2007 Till Dörges - 0.5-1
-- Initial build.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexdiff/doc/example-diff.tex new/texmf-dist/doc/support/latexdiff/doc/example-diff.tex
--- old/texmf-dist/doc/support/latexdiff/doc/example-diff.tex 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/support/latexdiff/doc/example-diff.tex 2013-06-27 00:57:37.000000000 +0200
@@ -1,7 +1,7 @@
\documentclass[12pt,a4paper]{article}
%DIF LATEXDIFF DIFFERENCE FILE
-%DIF DEL example-draft.tex Sat Nov 17 00:45:22 2012
-%DIF ADD example-rev.tex Sat Nov 17 00:45:22 2012
+%DIF DEL example-draft.tex Sun Jan 27 23:50:07 2013
+%DIF ADD example-rev.tex Sun Jan 27 23:50:07 2013
\setlength{\topmargin}{-0.2in}
\setlength{\textheight}{9.5in}
Files old/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf and new/texmf-dist/doc/support/latexdiff/doc/latexdiff-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexdiff/latexdiff new/texmf-dist/doc/support/latexdiff/latexdiff
--- old/texmf-dist/doc/support/latexdiff/latexdiff 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/doc/support/latexdiff/latexdiff 2013-06-27 00:57:37.000000000 +0200
@@ -22,6 +22,15 @@
#
# Detailed usage information at the end of the file
#
+# Version 1.0.3
+# - fix bug in add_safe_commands that made latexdiff hang on DeclareMathOperator
+# command in preamble
+# - \(..\) inline math expressions were not parsed correctly, if the contained a linebreak
+# - applied patch contributed by tomflannaghan via Berlios: [ Patch #3431 ] Adds correct handling of \left< and \right>
+# - \$ is treated correctly as a literal dollar sign (thanks to Reed Cartwright and Joshua Miller for reporting this bug
+# and sketching out the solution)
+# - \^ and \_ are correctly interpreted as accent and underlined space, respectively, not as superscript of subscript (thanks to Wail Yahyaoui for pointing out this bug)
+#
# Version 1.0.1 - treat \big,\bigg etc. equivalently to \left and
# \right - include starred version in MATHENV - apply
# - flatten recursively and --flatten expansion is now
@@ -83,8 +92,8 @@
my ($versionstring)=<()\[\]|]|\\\\(?:[|{}]|\w+))';
my $cmdoptseq='\\\\[\w\d\*]+'.$extraspace.'(?:(?:\['.$brat0.'\]|\{'. $pat6 . '\}|\(' . $coords .'\))'.$extraspace.')*';
my $backslashnl='\\\\\n';
my $oneletcmd='\\\\.\*?(?:\['.$brat0.'\]|\{'. $pat6 . '\})*';
- my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(].*?\\\\[)]';
+ my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(](?:.|\n)*?\\\\[)]';
## the current maths command cannot cope with newline within the math expression
my $comment='%.*?\n';
@@ -723,7 +732,7 @@
# get rid of comments
my $to_test = "";
# test for \DeclareMathOperator{\foo}{myoperator}
- while ( $preamble =~ m/\DeclareMathOperator\s*\{\\(\w*?)\}/s) {
+ while ( $preamble =~ m/\DeclareMathOperator\s*\*?\{\\(\w*?)\}/osg) {
$to_test=$1;
if ($to_test ne "" and not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
# one should add $to_test to the list of safe commands.
@@ -1428,7 +1437,7 @@
# #. change begin and end commands within comments to BEGINDIF, ENDDIF
# so they don't disturb the pattern matching (if there are several \begin or \end in one line
# 2. mark all first empty line (in block of several) with \PAR tokens
-# 3. Convert all '\%' into '\PERCENTAGE ' to make parsing regular expressions easier
+# 3. Convert all '\%' into '\PERCENTAGE ' and all '\$' into \DOLLAR to make parsing regular expressions easier
# 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character)
# into \verb{hash}
# 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash}
@@ -1461,14 +1470,15 @@
s/\n(\s*?)\n((?:\s*\n)*)/\n$1\\PAR\n$2/g ;
s/(?
+# - \$ is treated correctly as a literal dollar sign (thanks to Reed Cartwright and Joshua Miller for reporting this bug
+# and sketching out the solution)
+# - \^ and \_ are correctly interpreted as accent and underlined space, respectively, not as superscript of subscript (thanks to Wail Yahyaoui for pointing out this bug)
+#
# Version 1.0.1 - treat \big,\bigg etc. equivalently to \left and
# \right - include starred version in MATHENV - apply
# - flatten recursively and --flatten expansion is now
@@ -644,8 +653,8 @@
my ($versionstring)=<()\[\]|]|\\\\(?:[|{}]|\w+))';
my $cmdoptseq='\\\\[\w\d\*]+'.$extraspace.'(?:(?:\['.$brat0.'\]|\{'. $pat6 . '\}|\(' . $coords .'\))'.$extraspace.')*';
my $backslashnl='\\\\\n';
my $oneletcmd='\\\\.\*?(?:\['.$brat0.'\]|\{'. $pat6 . '\})*';
- my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(].*?\\\\[)]';
+ my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(](?:.|\n)*?\\\\[)]';
## the current maths command cannot cope with newline within the math expression
my $comment='%.*?\n';
@@ -1284,7 +1293,7 @@
# get rid of comments
my $to_test = "";
# test for \DeclareMathOperator{\foo}{myoperator}
- while ( $preamble =~ m/\DeclareMathOperator\s*\{\\(\w*?)\}/s) {
+ while ( $preamble =~ m/\DeclareMathOperator\s*\*?\{\\(\w*?)\}/osg) {
$to_test=$1;
if ($to_test ne "" and not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
# one should add $to_test to the list of safe commands.
@@ -1989,7 +1998,7 @@
# #. change begin and end commands within comments to BEGINDIF, ENDDIF
# so they don't disturb the pattern matching (if there are several \begin or \end in one line
# 2. mark all first empty line (in block of several) with \PAR tokens
-# 3. Convert all '\%' into '\PERCENTAGE ' to make parsing regular expressions easier
+# 3. Convert all '\%' into '\PERCENTAGE ' and all '\$' into \DOLLAR to make parsing regular expressions easier
# 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character)
# into \verb{hash}
# 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash}
@@ -2022,14 +2031,15 @@
s/\n(\s*?)\n((?:\s*\n)*)/\n$1\\PAR\n$2/g ;
s/(?http://latexdiff.berlios.de/
# CTAN page: http://www.ctan.org/tex-archive/support/latexdiff
@@ -25,10 +25,12 @@
#
# Detailed usage information at the end of the file
#
+# version 1.0.3: Bug fix: replace use of system('cp...') with File::Copy::copy (Patch contributed by D. Bremner)
+# Quotes around system call file arguments to allow filenames with spaces (Patch contributed by ssteve)
# version 1.0.2: - option --so to use latexdiff-so
# version 1.0.1 (change version numbering to match that of latexdiff)
# - Option --fast to use latexdiff-fast,
-# - git support (thanks to Bjørn Magnus Mathisen, Santi Béjar, Pietro Battiston and Stefan Alfredson for patches) - UNTESTED
+# - git support (thanks to Bjorn Magnus Mathisen, Santi Béjar, Pietro Battiston and Stefan Alfredson for patches) - UNTESTED
# version 0.25:
# - bbl is allowed as alternative extension (instead of .tex)
# version 0.26a
@@ -38,11 +40,13 @@
use Pod::Usage qw/pod2usage/ ;
use File::Temp qw/tempdir/ ;
use File::Basename qw/dirname/;
+use File::Copy;
+
use strict ;
use warnings ;
my $versionstring=< $diff") == 0 ) {
+ unless ( system("$latexdiff $options \"$file1\" \"$file2\" > \"$diff\"") == 0 ) {
print STDERR "Something went wrong in $latexdiff. Deleting $diff and abort\n" ; unlink $diff ; exit(5)
};
print "Generated difference file $diff\n";
@@ -299,16 +302,16 @@
# adapt magically changebar styles to [pdftex] display driver if pdf output was selected
if ( $pdf ) {
- system("sed \"s/Package\\[dvips\\]/Package[pdftex]/\" $diff > $diff.tmp$$ ; \\mv $diff.tmp$$ $diff");
+ system("sed \"s/Package\\[dvips\\]/Package[pdftex]/\" \"$diff\" > \"$diff.tmp$$\" ; \\mv \"$diff.tmp$$\" \"$diff\"");
}
print STDERR "PDF: $pdf Postscript: $postscript cwd $cwd\n";
- if ( system("grep -q \'^[^%]*\\\\bibliography\' $diff") == 0 ) {
+ if ( system("grep -q \'^[^%]*\\\\bibliography\' \"$diff\"") == 0 ) {
if ( $postscript) {
- system("latex --interaction=batchmode $diff; bibtex $diffbase");
+ system("latex --interaction=batchmode \"$diff\"; bibtex \"$diffbase\"");
push @ptmpfiles, "$diffbase.bbl","$diffbase.bbl" ;
} elsif ( $pdf ) {
- system("pdflatex --interaction=batchmode $diff; bibtex $diffbase");
+ system("pdflatex --interaction=batchmode \"$diff\"; bibtex \"$diffbase\"");
push @ptmpfiles, "$diffbase.bbl","$diffbase.bbl" ;
}
}
@@ -317,12 +320,12 @@
my $dvi="$diffbase.dvi";
my $ps="$diffbase.ps";
- system("latex --interaction=batchmode $diff; latex $diff; dvips -o $ps $dvi");
+ system("latex --interaction=batchmode \"$diff\"; latex \"$diff\"; dvips -o $ps $dvi");
push @ptmpfiles, "$diffbase.aux","$diffbase.log",$dvi ;
print "Generated postscript file $ps\n";
}
elsif ( $pdf ) {
- system("pdflatex --interaction=batchmode $diff; pdflatex $diff");
+ system("pdflatex --interaction=batchmode \"$diff\"; pdflatex \"$diff\"");
push @ptmpfiles, "$diffbase.aux","$diffbase.log";
}
unlink @ptmpfiles;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/latexdiff/latexdiff.pl new/texmf-dist/scripts/latexdiff/latexdiff.pl
--- old/texmf-dist/scripts/latexdiff/latexdiff.pl 2012-12-18 01:16:57.000000000 +0100
+++ new/texmf-dist/scripts/latexdiff/latexdiff.pl 2013-06-27 00:57:37.000000000 +0200
@@ -22,6 +22,15 @@
#
# Detailed usage information at the end of the file
#
+# Version 1.0.3
+# - fix bug in add_safe_commands that made latexdiff hang on DeclareMathOperator
+# command in preamble
+# - \(..\) inline math expressions were not parsed correctly, if the contained a linebreak
+# - applied patch contributed by tomflannaghan via Berlios: [ Patch #3431 ] Adds correct handling of \left< and \right>
+# - \$ is treated correctly as a literal dollar sign (thanks to Reed Cartwright and Joshua Miller for reporting this bug
+# and sketching out the solution)
+# - \^ and \_ are correctly interpreted as accent and underlined space, respectively, not as superscript of subscript (thanks to Wail Yahyaoui for pointing out this bug)
+#
# Version 1.0.1 - treat \big,\bigg etc. equivalently to \left and
# \right - include starred version in MATHENV - apply
# - flatten recursively and --flatten expansion is now
@@ -540,8 +549,8 @@
my ($versionstring)=<()\[\]|]|\\\\(?:[|{}]|\w+))';
my $cmdoptseq='\\\\[\w\d\*]+'.$extraspace.'(?:(?:\['.$brat0.'\]|\{'. $pat6 . '\}|\(' . $coords .'\))'.$extraspace.')*';
my $backslashnl='\\\\\n';
my $oneletcmd='\\\\.\*?(?:\['.$brat0.'\]|\{'. $pat6 . '\})*';
- my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(].*?\\\\[)]';
+ my $math='\$(?:[^$]|\\\$)*?\$|\\\\[(](?:.|\n)*?\\\\[)]';
## the current maths command cannot cope with newline within the math expression
my $comment='%.*?\n';
@@ -1180,7 +1189,7 @@
# get rid of comments
my $to_test = "";
# test for \DeclareMathOperator{\foo}{myoperator}
- while ( $preamble =~ m/\DeclareMathOperator\s*\{\\(\w*?)\}/s) {
+ while ( $preamble =~ m/\DeclareMathOperator\s*\*?\{\\(\w*?)\}/osg) {
$to_test=$1;
if ($to_test ne "" and not iscmd($to_test,\@SAFECMDLIST,\@SAFECMDEXCL) and not iscmd($to_test, \@SAFECMDEXCL, [])) {
# one should add $to_test to the list of safe commands.
@@ -1885,7 +1894,7 @@
# #. change begin and end commands within comments to BEGINDIF, ENDDIF
# so they don't disturb the pattern matching (if there are several \begin or \end in one line
# 2. mark all first empty line (in block of several) with \PAR tokens
-# 3. Convert all '\%' into '\PERCENTAGE ' to make parsing regular expressions easier
+# 3. Convert all '\%' into '\PERCENTAGE ' and all '\$' into \DOLLAR to make parsing regular expressions easier
# 4. Convert all \verb|some verbatim text| commands (where | can be an arbitrary character)
# into \verb{hash}
# 5. Convert \begin{verbatim} some verbatim text \end{verbatim} into \verbatim{hash}
@@ -1918,14 +1927,15 @@
s/\n(\s*?)\n((?:\s*\n)*)/\n$1\\PAR\n$2/g ;
s/(? set print type according to the printable
+ # file(s) being made: priority 'ps', 'pdf', 'dvi'
## Which treatment of default extensions and filenames with
## multiple extensions is used, for given filename on
@@ -651,6 +609,8 @@
$ps_update_command = undef;
$pdf_update_command = undef;
+$allow_subdir_creation = 1;
+
$new_viewer_always = 0; # If 1, always open a new viewer in pvc mode.
# If 0, only open a new viewer if no previous
# viewer for the same file is detected.
@@ -1124,7 +1084,7 @@
# $cleanup_mode = 2: cleanup except for dvi,
# dviF, pdf, ps, & psF
$cleanup_fdb = 0; # No removal of file for latexmk's file-database
-$cleanup_only = 0; # When doing cleanup, do not go-on to making files
+$cleanup_only = 0; # When doing cleanup, do not go on to making files
$cleanup_includes_generated = 0;
# Determines whether cleanup deletes files generated by
# custom dependencies
@@ -1464,7 +1424,13 @@
sub read_first_rc_file_in_list {
foreach my $rc_file ( @_ ) {
#print "===Testing for rc file \"$rc_file\" ...\n";
- if ( -e $rc_file ) {
+ if ( -d $rc_file ) {
+ warn "$My_name: I have found a DIRECTORY named \"$rc_file\".\n",
+ " Have you perhaps misunderstood latexmk's documentation?\n",
+ " This name is normally used for a latexmk configuration (rc) file,\n",
+ " and in that case it should be a regular text file, not a directory.\n";
+ }
+ elsif ( -e $rc_file ) {
#print "===Reading rc file \"$rc_file\" ...\n";
process_rc_file( $rc_file );
return;
@@ -1572,13 +1538,18 @@
elsif (/^-pdf$/) { $pdf_mode = 1; }
elsif (/^-pdf-$/) { $pdf_mode = 0; }
elsif (/^-pdfdvi$/){ $pdf_mode = 3; }
+# elsif (/^-pdflatex$/) {
+# $pdflatex = "pdflatex %O %S";
+# $pdf_mode = 1;
+# $dvi_mode = $postscript_mode = 0;
+# }
elsif (/^-pdflatex=(.*)$/) {
$pdflatex = $1;
}
elsif (/^-pdfps$/) { $pdf_mode = 2; }
elsif (/^-print=(.*)$/) {
$value = $1;
- if ( $value =~ /^dvi$|^ps$|^pdf$/ ) {
+ if ( $value =~ /^dvi$|^ps$|^pdf$|^auto$/ ) {
$print_type = $value;
$printout_mode = 1;
}
@@ -1636,6 +1607,11 @@
elsif (/^-view=none$/) { $view = "none";}
elsif (/^-view=ps$/) { $view = "ps";}
elsif (/^-view=pdf$/) { $view = "pdf"; }
+ elsif (/^-lualatex$/) {
+ $pdflatex = "lualatex %O %S";
+ $pdf_mode = 1;
+ $dvi_mode = $postscript_mode = 0;
+ }
elsif (/^-xelatex$/) {
$pdflatex = "xelatex %O %S";
$pdf_mode = 1;
@@ -1737,6 +1713,23 @@
}
}
+# At least one widely package (revtex4-1) generates a bib file
+# (which is used in revtex4-1 for putting footnotes in the reference
+# list), and bibtex must be run to use it. But latexmk needs to
+# determine the existence of the bib file by use of kpsewhich, otherwise
+# there is an error. So cope with this situation (and any analogous
+# cases by adding the aux_dir to the relevant path search environment
+# variables. BIBINPUTS seems to be the only one currently affected.
+foreach ( 'BIBINPUTS' ) {
+ if ( exists $ENV{$_} ) {
+ $ENV{$_} = $aux_dir.$search_path_separator.$ENV{$_};
+ }
+ else {
+ $ENV{$_} = $aux_dir.$search_path_separator;
+ }
+}
+
+
if ($bibtex_use > 1) {
push @generated_exts, 'bbl';
}
@@ -1745,7 +1738,7 @@
# Since $texfile_search is initialized to "", a nonzero value indicates
# that an initialization file has set it.
if ( $texfile_search ne "" ) {
- @default_files = split / /, "*.tex $texfile_search";
+ @default_files = split /\s+/, "*.tex $texfile_search";
}
#Glob the filenames command line if the script was not invoked under a
@@ -1893,7 +1886,7 @@
if ( ! -e $out_dir ) {
warn "$My_name: making output directory '$out_dir'\n"
if ! $silent;
- mkdir $out_dir;
+ make_path $out_dir;
}
elsif ( ! -d $out_dir ) {
warn "$My_name: you requested output directory '$out_dir',\n",
@@ -1910,7 +1903,7 @@
if ( ! -e $aux_dir ) {
warn "$My_name: making auxiliary directory '$aux_dir'\n"
if ! $silent;
- mkdir $aux_dir;
+ make_path $aux_dir;
}
elsif ( ! -d $aux_dir ) {
warn "$My_name: you requested aux directory '$aux_dir',\n",
@@ -1963,7 +1956,18 @@
$requested_filerules{'latex'} = 1;
$requested_filerules{'dvips'} = 1;
}
-if ( $printout_mode ) { $one_time{'print'} = 1; }
+if ($print_type eq 'auto') {
+ if ( $postscript_mode ) { $print_type = 'ps'; }
+ elsif ( $pdf_mode ) { $print_type = 'pdf'; }
+ elsif ( $dvi_mode ) { $print_type = 'dvi'; }
+ else { $print_type = 'none'; }
+}
+if ( $printout_mode ) {
+ $one_time{'print'} = 1;
+ if ($print_type eq 'none'){
+ warn "$My_name: You have requested printout, but \$print_type is set to 'none'\n";
+ }
+}
if ( $preview_continuous_mode || $preview_mode ) { $one_time{'view'} = 1; }
if ( length($dvi_filter) != 0 ) { $requested_filerules{'dvi_filter'} = 1; }
if ( length($ps_filter) != 0 ) { $requested_filerules{'ps_filter'} = 1; }
@@ -2030,13 +2034,24 @@
$deps_file = '-';
}
-if ( $dependents_list ) {
+# In non-pvc mode, the dependency list is global to all processed TeX files,
+# so we open a single file here, and add items to it after processing each file
+# But in -pvc mode, the dependency list should be written after round of
+# processing the single TeX file (as if each round were a separate run of
+# latexmk). There's undoubtedly some non-optimal structuring here!
+if ( $dependents_list && ! $preview_continuous_mode ) {
$deps_handle = new FileHandle "> $deps_file";
if (! defined $deps_handle ) {
die "Cannot open '$deps_file' for output of dependency information\n";
}
}
+# Remove leading and trailing space in the following space-separated lists,
+# and collapse multiple spaces to one,
+# to avoid getting incorrect blank items when they are split.
+foreach ($clean_ext, $clean_full_ext) { s/^\s+//; s/\s+$//; s/\s+/ /g; }
+
+
FILE:
foreach $filename ( @file_list )
{
@@ -2085,7 +2100,7 @@
# ?? Should I also initialize file database?
%rule_list = ();
&rdb_make_rule_list;
- &rdb_set_rules(\%rule_list);
+ &rdb_set_rules(\%rule_list, \%extra_rule_spec );
if ( $cleanup_mode > 0 ) {
# ?? MAY NEED TO FIX THE FOLLOWING IF $aux_dir or $out_dir IS SET.
@@ -2094,7 +2109,8 @@
my @aux_files = ();
$have_fdb = 0;
if ( -e $fdb_name ) {
- print "$My_name: Examining fdb file '$fdb_name' for rules ...\n";
+ print "$My_name: Examining fdb file '$fdb_name' for rules ...\n"
+ if $diagnostics;
$have_fdb = ( 0 == rdb_read( $fdb_name ) );
}
if ( $have_fdb ) {
@@ -2118,11 +2134,11 @@
}
);
}
- else {
- # No fdb file, so do inferior job by parse_log
- print "$My_name: Examining log file '$log_name' for generated files...\n";
-
- # Variables set by parse_log. Can I remove them
+ elsif ( -e $log_name ) {
+ # No fdb file, but log file exists, so do inferior job by parse_log
+ print "$My_name: Examining log file '$log_name' for generated files...\n"
+ if $diagnostics;
+ # Variables set by parse_log. Can I remove them?
local %generated_log = ();
local %dependents = (); # Maps files to status. Not used here.
local @bbl_files = (); # Not used here.
@@ -2134,6 +2150,10 @@
&parse_log;
%other_generated = %generated_log;
}
+ else {
+ print "$My_name: No fdb or log file, so clean up default set of files ...\n"
+ if $diagnostics;
+ }
if ( ($go_mode == 2) && !$silent ) {
warn "$My_name: Removing all generated files\n" unless $silent;
@@ -2154,16 +2174,16 @@
delete( $other_generated{$_} );
}
if ($diagnostics) {
- show_array( "For deletion:\n"
+ show_array( "For deletion, the following were determined from fdb file or log file:\n"
." Generated (from makeindex and bibtex):",
keys %index_bibtex_generated );
show_array( " Aux files:", keys %aux_files );
- show_array( "Other generated files:\n"
+ show_array( " Other generated files:\n"
." (only deleted if \$cleanup_includes_generated is set): ",
keys %other_generated );
}
&cleanup1( $aux_dir1, $fdb_ext, 'blg', 'ilg', 'log', 'aux.bak', 'idx.bak',
- split(' ',$clean_ext),
+ split('\s+',$clean_ext),
keys %generated_exts_all
);
unlink_or_move( 'texput.log', "texput.aux",
@@ -2177,7 +2197,7 @@
}
if ( $cleanup_mode == 1 ) {
&cleanup1( $out_dir1, 'dvi', 'dviF', 'ps', 'psF', 'pdf',
- split(' ', $clean_full_ext)
+ split('\s+', $clean_full_ext)
);
}
}
@@ -2265,7 +2285,6 @@
if ( $preview_continuous_mode ) {
&make_preview_continuous;
- # Will probably exit by ctrl/C and never arrive here.
next FILE;
}
@@ -2286,12 +2305,16 @@
$failure = 0;
$failure_msg = '';
$failure = rdb_make( keys %requested_filerules );
+ if ( ( $failure <= 0 ) || $force_mode ) {
+ rdb_for_some( [keys %one_time], \&rdb_run1 );
+ }
if ($failure > 0) { next FILE; }
- rdb_for_some( [keys %one_time], \&rdb_run1 );
} # end FILE
continue {
- if ($dependents_list) { deps_list($deps_handle); }
- if ($rules_list) { rdb_list(); }
+ if ($deps_handle) { deps_list($deps_handle); }
+ # If requested, print the list of rules. But don't do this in -pvc
+ # mode, since the rules list has already been printed.
+ if ($rules_list && ! $preview_continuous_mode) { rdb_list(); }
# Handle any errors
$error_message_count = rdb_show_rule_errors();
if ( ($error_message_count == 0) || ($failure > 0) ) {
@@ -2400,6 +2423,7 @@
#############################################################
sub rdb_make_rule_list {
+# Set up specifications for standard rules, adjusted to current conditions
# Substitutions: %S = source, %D = dest, %B = this rule's base
# %T = texfile, %R = root = base for latex.
# %Y for $aux_dir1, %Z for $out_dir1
@@ -2417,7 +2441,7 @@
}
my $print_file = '';
- my $print_cmd = '';
+ my $print_cmd = 'NONE';
if ( $print_type eq 'dvi' ) {
$print_file = $dvi_final;
$print_cmd = $lpr_dvi;
@@ -2430,6 +2454,9 @@
$print_file = $ps_final;
$print_cmd = $lpr;
}
+ elsif ( $print_type eq 'none' ) {
+ $print_cmd = 'NONE echo NO PRINTING CONFIGURED';
+ }
my $view_file = '';
my $viewer = '';
@@ -2465,15 +2492,6 @@
$view_file, "", "", 2 ],
'view' => [ 'external', "$viewer", 'if_source', $view_file, "", "", 2 ],
);
- %source_list = ();
- foreach my $rule (keys %rule_list) {
- $source_list{$rule} = [];
- my $PAsources = $source_list{$rule};
- my ( $cmd_type, $cmd, $source, $dest, $root ) = @{$rule_list{$rule}};
- if ($source) {
- push @$PAsources, [ $rule, $source, '' ];
- }
- }
# Ensure we only have one way to make pdf file, and that it is appropriate:
if ($pdf_mode == 1) { delete $rule_list{'dvipdf'}; delete $rule_list{'ps2pdf'}; }
@@ -2726,6 +2744,7 @@
return &Run_subst();
}
else {
+ warn "Needed source file '$$Psource' does not exist.\n";
return -1;
}
} #END if_source
@@ -2941,7 +2960,7 @@
}
@pre_primary = (); # Array of rules
@post_primary = (); # Array of rules
- @one_time = (); # Array of rules
+ @unusual_one_time = (); # Array of rules
&rdb_classify_rules( \%possible_primaries, keys %requested_filerules );
# There will be files changed during the run that are irrelevant.
# We need to wait for the user to change the files.
@@ -2968,7 +2987,18 @@
}
}
rdb_show_rule_errors();
+ if ($rules_list) { rdb_list(); }
if ($show_time && ! $first_time) { show_timing(); }
+ if ( $dependents_list && ($updated || $failure) ) {
+ my $deps_handle = new FileHandle "> $deps_file";
+ if ( defined $deps_handle ) {
+ deps_list($deps_handle);
+ close($deps_handle);
+ }
+ else {
+ warn "Cannot open '$deps_file' for output of dependency information\n";
+ }
+ }
if ( $first_time || $updated || $failure ) {
print "\n=== Watching for updated files. Use ctrl/C to stop ...\n";
}
@@ -3002,8 +3032,8 @@
} # end WAIT:
&default_break;
if ($have_break) {
- print "$My_name: User typed ctrl/C or ctrl/break. I'll stop.\n";
- exit;
+ print "$My_name: User typed ctrl/C or ctrl/break. I'll finish.\n";
+ return;
}
$waiting = 0; if ($diagnostics) { warn "NOT WAITING\n"; }
} #end infinite_loop CHANGE:
@@ -3032,6 +3062,11 @@
warn "$My_name: The rc-file '$rc_file' does not exist\n";
return 1;
}
+ elsif ( -d $rc_file ) {
+ warn "$My_name: The supposed rc-file '$rc_file' is a directory; but it\n",
+ " should be a normal text file\n";
+ return 1;
+ }
elsif ( open $RCH, "<$rc_file" ) {
{ local $/; eval <$RCH>; }
close $RCH;
@@ -3092,10 +3127,13 @@
sub cleanup1 {
# Usage: cleanup1( directory, exts_without_period, ... )
- my $dir = shift;
+ #
+ # The directory is a fixed name, so I must escape any glob metacharacters
+ # in it:
+ my $dir = fix_pattern( shift );
foreach (@_) {
(my $name = /%R/ ? $_ : "%R.$_") =~ s/%R/$dir$root_filename/;
- unlink_or_move("$name");
+ unlink_or_move( glob( "$name" ) );
}
} #END cleanup1
@@ -3311,7 +3349,10 @@
" -view=none - no viewer is used\n",
" -view=ps - viewer is for ps\n",
" -view=pdf - viewer is for pdf\n",
+ " -lualatex - use lualatex for processing files to pdf\n",
+ " and turn pdf mode on, dvi/ps modes off\n",
" -xelatex - use xelatex for processing files to pdf\n",
+ " and turn pdf mode on, dvi/ps modes off\n",
"\n",
" filename = the root filename of LaTeX document\n",
"\n",
@@ -3327,8 +3368,8 @@
} #END print_help
#************************************************************
-sub print_commands
-{
+
+sub print_commands {
warn "Commands used by $my_name:\n",
" To run latex, I use \"$latex\"\n",
" To run pdflatex, I use \"$pdflatex\"\n",
@@ -3489,7 +3530,9 @@
sub run_bibtex {
my $return = 999;
if ( $aux_dir ) {
- if ( $$Psource =~ /^$aux_dir1/ ) {
+ # Use \Q and \E round directory name in regex to avoid interpretation
+ # of metacharacters in directory name:
+ if ( $$Psource =~ /^\Q$aux_dir1\E/ ) {
# Run bibtex in $aux_dir, fixing input search path
# to allow for finding files in original directory
my ( $base, $path, $ext ) = fileparseA( $$Psource );
@@ -3636,6 +3679,12 @@
# %idx_files to map from .idx files to .ind files.
# %generated_log: keys give set of files written by (pdf)latex (e.g., aux, idx)
# as determined by \openout = ... lines in log file.
+# @missing_subdirs = list of needed subdirectories of aux_dir
+# These are needed for writing aux_files when an included file is in
+# a subdirectory relative to the directory of the main TeX file.
+# This variable is only set when the needed subdirectories don't exist,
+# and the aux_dir is non-trivial, which results in an error message in
+# the log file
# Also set
# $reference_changed, $bad_reference, $bad_citation
# Trivial or default values if log file does not exist/cannot be opened
@@ -3658,6 +3707,8 @@
%idx_files = (); # Maps idx_file to (ind_file, base)
%generated_log = ();
%conversions = ();
+ @missing_subdirs = ();
+
# $primary_out is actual output file (dvi or pdf)
# It is initialized before the call to this routine, to ensure
# a sensible default in case of misparsing
@@ -3931,6 +3982,24 @@
if (/^\! LaTeX Error: / ) {
next LINE;
}
+ if ( m[^! I can't write on file `(.*)/([^/']*)'.\s*$] ) {
+ my $dir = $1;
+ my $file = $2;
+ my $full_dir = $aux_dir1.$dir;
+ if ( ($aux_dir ne '') && (! -e $full_dir) && ( $file =~ /\.aux$/) ) {
+ warn "$My_name: === There were problems writing to '$file' in '$full_dir'\n",
+ " I'll try to make the subdirectory later.\n"
+ if $diagnostics;
+ push @missing_subdirs, $full_dir;
+ }
+ else {
+ warn "$My_name: ====== There were problems writing to",
+ "----- '$file' in '$full_dir'.\n",
+ "----- But this is not the standard situation of\n",
+ "----- aux file to subdir of output directory, with\n",
+ "----- non-existent subdir\n",
+ }
+ }
INCLUDE_CANDIDATE:
while ( /\((.*$)/ ) {
# Filename found by
@@ -4311,8 +4380,10 @@
# Remove current directory string:
$file =~ s(^\./)();
- $file =~ s(^$cwd/)();
-
+ # Remove initial component equal to current working directory.
+ # Use \Q and \E round directory name in regex to avoid interpretation
+ # of metacharacters in directory name:
+ $file =~ s(^\Q$cwd\E/)();
return $file;
}
@@ -4327,6 +4398,17 @@
#************************************************************
+sub fix_pattern {
+ # Escape the characters [ and {, to give a pattern for use in glob
+ # with these characters taken literally.
+ my $pattern = shift;
+ $pattern =~ s/\[/\\\[/g;
+ $pattern =~ s/\{/\\\{/g;
+ return $pattern;
+}
+
+#************************************************************
+
sub OS_preferred_filename {
# Usage: OS_preferred_filename(name)
# Returns filename with directory separator '/' converted
@@ -4423,13 +4505,13 @@
while (<$aux_fh>) {
if ( /^\\bibdata\{(.*)\}/ ) {
# \\bibdata{comma_separated_list_of_bib_file_names}
- # (Without the '.bib' extension)
- push( @$Pbib_files, split /,/, $1 );
+ # These are normally without the '.bib' extension.
+ push @$Pbib_files, split /,/, $1;
}
elsif ( /^\\bibstyle\{(.*)\}/ ) {
# \\bibstyle{bst_file_name}
- # (Without the '.bst' extension)
- push( @$Pbst_files, $1 );
+ # Normally without the '.bst' extension.
+ push @$Pbst_files, split /,/, $1;
}
elsif ( /^\\\@input\{(.*)\}/ ) {
# \\@input{next_aux_file_name}
@@ -4629,7 +4711,7 @@
$dest = "$base.$toext";
my $PAnew_cmd = ['do_cusdep', ''];
foreach my $dep ( @cus_dep_list ) {
- my ($tryfromext,$trytoext,$must,$func_name) = split(' ',$dep);
+ my ($tryfromext,$trytoext,$must,$func_name) = split('\s+',$dep);
if ( ($tryfromext eq $fromext) && ($trytoext eq $toext) ) {
$$PAnew_cmd[1] = $func_name;
}
@@ -4768,7 +4850,7 @@
# circular dependencies
local @pre_primary = (); # Array of rules
local @post_primary = (); # Array of rules
- local @one_time = (); # Array of rules
+ local @unusual_one_time = (); # Array of rules
&rdb_classify_rules( \%possible_primaries, keys %requested_filerules );
print $out_handle "# Fdb version $fdb_ver\n";
@@ -4838,10 +4920,49 @@
local %conversions = (); # (pdf)latex-performed conversions.
# Maps output file created and read by (pdf)latex
# to source file of conversion.
+ local @missing_subdirs = (); # Missing subdirectories in aux_dir
+
# The following are also returned, but are global, to be used by caller
# $reference_changed, $bad_reference $bad_citation
&parse_log;
+ $missing_dirs = 'none'; # Status of missing directories
+ if (@missing_subdirs) {
+ $missing_dirs = 'success';
+ if ($allow_subdir_creation) {
+ foreach my $dir ( uniqs( @missing_subdirs ) ) {
+ if ( -d $dir ) {
+ $missing_dirs = 'failure';
+ warn "$My_name: ==== Directory '$dir' is said to be missing\n",
+ " But it exists!\n";
+ }
+ elsif ( (-e $dir) && (!-d $dir) ) {
+ $missing_dirs = 'failure';
+ warn "$My_name: ==== Directory '$dir' is said to be missing\n",
+ " But a non-directory file of this name exists!\n";
+ }
+ else {
+ if (mkdir $dir) {
+ warn "$My_name: Directory '$dir' created\n";
+ }
+ else {
+ $missing_dirs = 'failure';
+ warn "$My_name: Couldn't create directory '$dir'.\n",
+ " System error: '$!'\n";
+ }
+ }
+ }
+ }
+ else {
+ $missing_dirs = 'not allowed';
+ warn "$My_name: There are missing subdirectories, but their creation\n",
+ " is not allowed. The subdirectories are:\n";
+ foreach my $dir ( uniqs( @missing_subdirs ) ) {
+ warn " '$dir'\n";
+ }
+ }
+ }
+
my $fls_file = "$aux_dir1$root_filename.fls";
if ($recorder && test_gen_file($fls_file) ) {
parse_fls( $fls_file, \%source_fls, \%generated_fls, \%first_read_after_write );
@@ -4849,7 +4970,6 @@
$dependents{$_} = 4;
}
foreach (keys %generated_fls) {
- $_ = normalize_filename($_);
rdb_add_generated( $_ );
if ( exists($dependents{$_}) ) {
$dependents{$_} = 6;
@@ -5099,7 +5219,7 @@
}
if ( $ext ne "" ) {
foreach my $dep (@cus_dep_list){
- my ($fromext,$toext) = split(' ',$dep);
+ my ($fromext,$toext) = split('\s+',$dep);
if ( ( "$ext" eq "$toext" )
&& ( -e "$path$base.$fromext" )
) {
@@ -5118,7 +5238,7 @@
# $_ doesn't exist, $_.tex doesn't exist,
# and $_ doesn't have an extension
foreach my $dep (@cus_dep_list){
- my ($fromext,$toext) = split(' ',$dep);
+ my ($fromext,$toext) = split('\s+',$dep);
if ( -e "$path$base.$fromext" ) {
# Source file for the missing file exists
# So we have a real include file, and it will be made
@@ -5206,7 +5326,7 @@
my $Pinput_extensions = $input_extensions{$rule};
DEP:
foreach my $dep ( @cus_dep_list ) {
- my ($fromext,$proptoext,$must,$func_name) = split(' ',$dep);
+ my ($fromext,$proptoext,$must,$func_name) = split('\s+',$dep);
if ( $toext eq $proptoext ) {
my $source = "$base_name.$fromext";
# Found match of rule
@@ -5354,10 +5474,10 @@
# List dependent files to file open on fh
my $fh = $_[0];
print $fh "#===Dependents for $filename:\n";
- my @dest = ();
- if ($pdf_mode) {push @dest, '.pdf';}
- if ($dvi_mode) {push @dest, '.dvi';}
- if ($postscript_mode) {push @dest, '.ps';}
+ my @dest_exts = ();
+ if ($pdf_mode) {push @dest_exts, '.pdf';}
+ if ($dvi_mode) {push @dest_exts, '.dvi';}
+ if ($postscript_mode) {push @dest_exts, '.ps';}
my %source = ( $texfile_name => 1 );
my @generated = ();
my @accessible_all = rdb_accessible( keys %requested_filerules );
@@ -5376,11 +5496,11 @@
foreach (@generated) {
delete $source{$_};
}
- foreach my $dest (@dest) {
+ foreach my $ext (@dest_exts) {
if ($deps_file eq '-' ) {
- print $fh "$root_filename$dest :";
+ print $fh "${out_dir1}${root_filename}${ext} :";
} else {
- print $fh "$root_filename$dest $deps_file :";
+ print $fh "${out_dir1}${root_filename}${ext} $deps_file :";
}
foreach (sort keys %source) {
print $fh "\\\n $_";
@@ -5579,7 +5699,7 @@
# circular dependencies
local @pre_primary = (); # Array of rules
local @post_primary = (); # Array of rules
- local @one_time = (); # Array of rules
+ local @unusual_one_time = (); # Array of rules
# For diagnostics on changed files, etc:
@@ -5615,7 +5735,7 @@
# could become a needed source file for a run
# and therefore undo an error condition
if ($diagnostics) {
- print "MakeB: doing pre_primary and primary...\n";
+ print "Make: doing pre_primary and primary...\n";
}
# Do the primary run if it is needed. On return $runs == 0
# signals that nothing was run (and hence no output
@@ -5639,7 +5759,7 @@
last PASS;
}
if ($diagnostics) {
- print "MakeB: doing post_primary...\n";
+ print "Make: doing post_primary...\n";
}
rdb_for_some( [@post_primary], \&rdb_make1 );
if ( ($runs == 0) || $too_many_passes ) {
@@ -5659,7 +5779,7 @@
&rdb_make_links;
}
}
- rdb_for_some( [@one_time], \&rdb_make1 );
+ rdb_for_some( [@unusual_one_time], \&rdb_make1 );
rdb_write( $fdb_name );
if (! $silent) {
@@ -5728,7 +5848,7 @@
# Assumes contexts for recursion, make, and rule, and
# assumes that source files for the rule are to be considered
# up-to-date.
- if ($diagnostics) { print " MakeB1 $rule\n"; }
+ if ($diagnostics) { print " Make1 $rule\n"; }
if ($failure & ! $force_mode) {return;}
if ( ! defined $pass{$rule} ) {$pass{$rule} = 0; }
&rdb_clear_change_record;
@@ -5869,7 +5989,7 @@
# If there is a destination to make, but for some reason
# it did not get made, and no other error was reported,
# then a priori there appears to be an error condition:
- # the run failed. But there are two important cases in
+ # the run failed. But there are some important cases in
# which this is a wrong diagnosis.
if ( ( $$Pcmd_type eq 'cusdep') && $$Psource && (! -e $$Psource) ) {
# However, if the rule is a custom dependency, this is not by
@@ -5894,6 +6014,13 @@
# Missing output file was reported to be NOT an error
$$Pout_of_date = 0;
}
+ elsif ( ($bibtex_use <= 1) && ($bibtex_not_run > 0) ) {
+ # Lack of destination file is not to be treated as an error
+ # for a bibtex rule when latexmk is configured not to treat
+ # this as an error, and the lack of a destination file is the
+ # only error.
+ $$Pout_of_date = 0;
+ }
else {
$failure = 1;
}
@@ -5934,7 +6061,7 @@
# %current_primaries # Keys are actual primaries
# @pre_primary # Array of rules
# @post_primary # Array of rules
- # @one_time # Array of rules
+ # @unusual_one_time # Array of rules
# @pre_primary and @post_primary are in natural order of application.
local $P_allowed_primaries = shift;
@@ -5945,7 +6072,7 @@
%current_primaries = ();
@pre_primary = ();
@post_primary = ();
- @one_time = ();
+ @unusual_one_time = ();
rdb_recurse( \@requested_targets, \&rdb_classify1, 0,0, \&rdb_classify2 );
@@ -5978,12 +6105,20 @@
print " Post-primaries:\n";
foreach (@post_primary) { print " $_\n"; }
}
- if ($#one_time < 0) {
- print " No one_time rules\n";
+ if ($#unusual_one_time < 0) {
+ print " No inner-level one_time rules, as expected\n";
}
else {
- print " One_time rules:\n";
- foreach ( @one_time ) { print " $_\n"; }
+ print " Inner-level one_time rules:\n";
+ foreach ( @unusual_one_time ) { print " $_\n"; }
+ }
+ my @normal_one_time = keys %one_time;
+ if ($#normal_one_time < 0) {
+ print " No outer-level one_time rules\n";
+ }
+ else {
+ print " Outer-level one_time rules:\n";
+ foreach ( @normal_one_time ) { print " $_\n"; }
}
} #end diagnostics
@@ -6003,7 +6138,7 @@
if ($depth > 1) {
warn "ONE TIME rule not at outer level '$rule'\n";
}
- push @one_time, $rule;
+ push @unusual_one_time, $rule;
}
elsif ($state == 0) {
if ( exists ${$P_allowed_primaries}{$rule} ) {
@@ -6309,20 +6444,18 @@
if ( $aux_dir1 ne '' ) {
push @other_fls_names, "$root_filename.fls";
}
- my $have_fls = 0;
- if ( test_gen_file($std_fls_file) ) {
- $have_fls = 1;
+ # Find the first non-standard fls file and copy it to the standard
+ # place. But only do this if the file time is compatible with being
+ # generated in the current run, as tested by the use of
+ # test_gen_file; that avoids problems with fls files leftover from
+ # earlier runs with other versions of latex.
+ foreach my $cand (@other_fls_names) {
+ if ( test_gen_file( $cand ) ) {
+ copy $cand, $std_fls_file;
+ last;
+ }
}
- else {
- foreach my $cand (@other_fls_names) {
- if ( test_gen_file($cand) ) {
- copy $cand, $std_fls_file;
- $have_fls = 1;
- last;
- }
- }
- }
- if (! $have_fls) {
+ if ( ! test_gen_file( $std_fls_file ) ) {
warn "$My_name: fls file doesn't appear to have been made\n";
}
}
@@ -6831,13 +6964,13 @@
# Makes rule. Error if it already exists.
# Omitted arguments: replaced by 0 or '' as needed.
# ==== Sets rule data ====
- my ( $rule, $cmd_type, $int_cmd, $PAext_cmd, $test_kind,
+ my ( $rule, $cmd_type, $ext_cmd, $PAint_cmd, $test_kind,
$source, $dest, $base,
$needs_making, $run_time, $check_time, $set_file_not_exists, $extra_gen ) = @_;
my $changed = 0;
# Set defaults, and normalize parameters:
- foreach ( $cmd_type, $int_cmd, $PAext_cmd, $source, $dest, $base,
+ foreach ( $cmd_type, $ext_cmd, $PAint_cmd, $source, $dest, $base,
$set_file_not_exists ) {
if (! defined $_) { $_ = ''; }
}
@@ -6848,20 +6981,20 @@
# Default to test on file change
$test_kind = 1;
}
- if ( ref( $PAext_cmd ) eq '' ) {
+ if ( ref( $PAint_cmd ) eq '' ) {
# It is a single command. Convert to array reference:
- $PAext_cmd = [ $PAext_cmd ];
+ $PAint_cmd = [ $PAint_cmd ];
}
else {
# COPY the referenced array:
- $PAext_cmd = [ @$PAext_cmd ];
+ $PAint_cmd = [ @$PAint_cmd ];
}
my $PA_extra_gen = [];
if ($extra_gen) {
@$PA_extra_gen = @$extra_gen;
}
$rule_db{$rule} =
- [ [$cmd_type, $int_cmd, $PAext_cmd, $test_kind,
+ [ [$cmd_type, $ext_cmd, $PAint_cmd, $test_kind,
$source, $dest, $base,
$needs_making, 0, $run_time, $check_time, $changed,
-1, '', $PA_extra_gen ],
@@ -7129,14 +7262,10 @@
my @globbed = ();
foreach my $file_spec (@_) {
# Problem, when the PATTERN contains spaces, the space(s) are
- # treated as pattern separaters (in MSWin at least).
- # MSWin: I can quote the pattern (is that MSWin native, or also
- # cygwin?)
- # Linux: Quotes in a pattern are treated as part of the filename!
- # So quoting a pattern is definitively wrong.
- # The following hack solves this partly, for the cases that there is no wildcarding
- # and the specified file exists possibly space-containing, and that there is wildcarding,
- # but spaces are prohibited.
+ # treated as pattern separaters.
+ # Solution: I now the glob from use File::Glob.
+ # The following hack avoids issues with glob in the case that a file exists
+ # with the specified name (possibly with extension .tex):
if ( -e $file_spec || -e "$file_spec.tex" ) {
# Non-globbed file exists, return the file_spec.
# Return $file_spec only because this is not a file-finding subroutine, but
@@ -7417,6 +7546,8 @@
# suffix,
# ref_to_array_search_path
# )
+ # SPECIAL TREATMENT TO .bib extension, because of behavior of bibtex
+ # OTHER SPECIAL TREATMENT IF EXTENSION IS GIVEN.
my $ref_output = $_[0];
my $ref_input = $_[1];
@@ -7430,7 +7561,9 @@
my @return_list = (); # Generate list in local array, since input
# and output arrays may be same
my $retcode = 0;
- foreach my $file (@$ref_input) {
+ foreach my $file1 (@$ref_input) {
+ my $file = $file1;
+ if ($suffix eq '.bib') { $file =~ s/\.bib$//; }
my ($tmp_file, $find_retcode) = &find_file1( "$file$suffix", $ref_search );
if ($tmp_file) {
push @return_list, $tmp_file;
@@ -7510,7 +7643,9 @@
my ($from_ext, $to_ext) = @_;
my $i = 0;
while ($i <= $#cus_dep_list) {
- if ( $cus_dep_list[$i] =~ /^$from_ext $to_ext / ) {
+ # Use \Q and \E round directory name in regex to avoid interpretation
+ # of metacharacters in directory name:
+ if ( $cus_dep_list[$i] =~ /^\Q$from_ext $to_ext \E/ ) {
splice @cus_dep_list, $i, 1;
}
else {
@@ -7962,7 +8097,7 @@
shift(@ps_output); # Discard the header line from ps
foreach (@ps_output) {
next unless ( /$looking_for/ ) ;
- my @ps_line = split (' ');
+ my @ps_line = split ('\s+');
# OLD return($ps_line[$pid_position]);
push @found, $ps_line[$pid_position];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexmk.tlpobj new/tlpkg/tlpobj/latexmk.tlpobj
--- old/tlpkg/tlpobj/latexmk.tlpobj 2013-04-08 21:26:06.000000000 +0200
+++ new/tlpkg/tlpobj/latexmk.tlpobj 2014-04-30 03:26:03.000000000 +0200
@@ -1,6 +1,6 @@
name latexmk
category Package
-revision 29752
+revision 33756
shortdesc Fully automated LaTeX document generation.
longdesc Latexmk completely automates the process of generating a LaTeX
longdesc document. Given the source files for a document, latexmk issues
@@ -9,12 +9,12 @@
longdesc is the "preview continuous mode", where the script watches all
longdesc of the source files (primary file and included TeX and graphics
longdesc files), and reruns LaTeX, etc., whenever a source file has
-longdesc changed. Thus a previewer can have an updated display whenever
-longdesc the source files change.
+longdesc changed. Thus a previewer can offer a display of the document's
+longdesc latest state.
depend latexmk.ARCH
-runfiles size=78
+runfiles size=79
texmf-dist/scripts/latexmk/latexmk.pl
catalogue-ctan /support/latexmk
-catalogue-date 2012-11-17 01:32:51 +0100
+catalogue-date 2013-12-03 18:34:20 +0100
catalogue-license gpl
-catalogue-version 4.35
+catalogue-version 4.39
++++++ latexpand.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/Makefile new/texmf-dist/doc/support/latexpand/Makefile
--- old/texmf-dist/doc/support/latexpand/Makefile 2012-12-01 00:36:10.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/Makefile 2014-03-24 21:42:27.000000000 +0100
@@ -1,11 +1,15 @@
-all: latexpand.zip
+all: dist/latexpand.zip
-README: latexpand
- ./latexpand --help > README
+dist/latexpand/README: latexpand
+ pod2text latexpand > $@
-.PHONY: latexpand.zip
-latexpand.zip: README
- -$(RM) $@
+.PHONY: all force
+dist/latexpand.zip: force
+ -$(RM) -r dist/
+ mkdir -p dist/latexpand
+ @$(MAKE) dist/latexpand/README
@echo "latexpand version $$(git rev-parse HEAD).\n\
-Commited on $$(git show HEAD --pretty=format:'%cd')." > version.txt
- zip $@ README version.txt $$(git ls-files | grep -v '\.gitignore')
+Commited on $$(git show -s HEAD --pretty=format:'%cd')." > dist/latexpand/version.txt
+ git ls-files | grep -v '\.gitignore' | tar -cf - -T - | (cd dist/latexpand/ && tar xf -)
+ cd dist && zip -r latexpand.zip latexpand/
+force:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/README new/texmf-dist/doc/support/latexpand/README
--- old/texmf-dist/doc/support/latexpand/README 2012-12-01 00:36:10.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/README 2014-03-24 21:42:27.000000000 +0100
@@ -1,52 +1,71 @@
-LATEXPAND(1) User Contributed Perl Documentation LATEXPAND(1)
+NAME
+ latexpand - Flatten LaTeX file by expanding \include and \input, ... and
+ remove comments
+
+SYNOPSIS
+ latexpand [options] FILE...
+
+ Options:
+ --verbose show what's going on
+ --keep-comments don't strip comments (comments are lines
+ starting with %, and anything below
+ \end{document})
+ --empty-comments keep empty comments (i.e. % at end of lines) for clarity
+ --keep-includes don't expand \input and \include directives
+ --expand-usepackage
+ Expand \usepackage{...} directives if the
+ corresponding .sty file is found in
+ $TEXINPUTS
+ --expand-bbl FILE
+ Expand the bibliography by inlining FILE
+ (should be a *.bbl file)
+ --help this help message
+ --output <file>, -o <file>
+ generate output in <file>
+ --explain generate explanatory comments in output
+ --show-graphics show included graphics
+ --graphics_extensions
+ colon-separated list of possible graphics extensions
+ (used by --show-graphics to find the actual graphics files)
+
+USES
+ The most common use of latexpand is to simplify distribution of source
+ LaTeX files, typically to satisfy the requirement of editors and
+ archival sites (springer, arXiv.org, ...) who force the authors to
+ submit sources. One does not necessarily want to submit sources with
+ comments, and uploading a document made of several files including each
+ other is a bit painful. By default, latexpand answers both problems by
+ outputing a single LaTeX file that contain no comment.
+
+GETTING LATEXPAND
+ The latest version of latexpand is available here:
+
+ https://gitorious.org/latexpand
+
+ Versions are uploaded to ctan.org from time to time:
+
+ http://www.ctan.org/pkg/latexpand
+
+BUGS
+ Please, report bugs to Matthieu Moy .
+
+ Known bugs
+ latexpand currently ignores \begin{verbatim} ... \end{verbatim}, and
+ will therefore process any \include, \input, ... directives that appear
+ within verbatim environments (while it shouldn't).
+
+ It would be nice to remove code between \begin{comment} and
+ \end{comment} too if \usepackage{comment} is used.
+
+ Code like
+
+ foo%
+ \begin{comment}
+ will produce the incorrect
+ foo\begin{comment}
-NNAAMMEE
- latexpand - Flatten LaTeX file by expanding \include and \input, remove
- comments
-
-SSYYNNOOPPSSIISS
- latexpand [options] FILE...
-
- Options:
- --verbose show what's going on
- --keep-comments don't strip comments
- --empty-comments keep empty comments (i.e. % at end of lines) for clarity
- --keep-includes don't expand \input and \include directives
- --expand-usepackage
- Expand \usepackage{...} directives if the
- corresponding .sty file is found in
- $TEXINPUTS
- --expand-bbl FILE
- Expand the bibliography by inlining FILE
- (should be a *.bbl file)
- --help this help message
- --output <file>, -o <file>
- generate output in <file>
- --explain generate explanatory comments in output
- --show-graphics show included graphics
- --graphics_extensions
- colon-separated list of possible graphics extensions
- (used by --show-graphics to find the actual graphics files)
-
-UUSSEESS
- The most common use of latexpand is to simplify distribution of source
- LaTeX files, typically to satisfy the requirement of editors and
- archival sites (springer, arXiv.org, ...) who force the authors to
- submit sources. One does not necessarily want to submit sources with
- comments, and uploading a document made of several files including each
- other is a bit painful. By default, latexpand answers both problems by
- outputing a single LaTeX file that contain no comment.
-
-GGEETTTTIINNGG LLAATTEEXXPPAANNDD
- The latest version of latexpand is available here:
+ A workaround is to use --empty-comments when such tricky usage of the
+ comments package is done.
- https://gitorious.org/latexpand
-
-BBUUGGSS
- Please, report bugs to Matthieu Moy .
-
-
-
-perl v5.10.1 2012-11-07 LATEXPAND(1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/tests/df-conflict/a.tex new/texmf-dist/doc/support/latexpand/tests/df-conflict/a.tex
--- old/texmf-dist/doc/support/latexpand/tests/df-conflict/a.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/tests/df-conflict/a.tex 2013-08-22 00:08:40.000000000 +0200
@@ -0,0 +1,7 @@
+\documentclass{article}
+\begin{document}
+
+Hello
+\input{b}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/tests/df-conflict/b/README-df-conflict.txt new/texmf-dist/doc/support/latexpand/tests/df-conflict/b/README-df-conflict.txt
--- old/texmf-dist/doc/support/latexpand/tests/df-conflict/b/README-df-conflict.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/tests/df-conflict/b/README-df-conflict.txt 2013-08-22 00:08:40.000000000 +0200
@@ -0,0 +1 @@
+This directory is likely to confuse latexpand.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/tests/df-conflict/b.tex new/texmf-dist/doc/support/latexpand/tests/df-conflict/b.tex
--- old/texmf-dist/doc/support/latexpand/tests/df-conflict/b.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/tests/df-conflict/b.tex 2013-08-22 00:08:40.000000000 +0200
@@ -0,0 +1 @@
+world.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/tests/includegraphic.tex new/texmf-dist/doc/support/latexpand/tests/includegraphic.tex
--- old/texmf-dist/doc/support/latexpand/tests/includegraphic.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/tests/includegraphic.tex 2014-04-05 00:30:23.000000000 +0200
@@ -0,0 +1,8 @@
+\documentclass{article}
+
+\usepackage{graphicx}
+\begin{document}
+test includegraphics:
+\includegraphics{smile.pdf}
+\includegraphics[scale=2]{smile.pdf}
+\end{document}
Files old/texmf-dist/doc/support/latexpand/tests/smile.pdf and new/texmf-dist/doc/support/latexpand/tests/smile.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/tests/text-after-end.tex new/texmf-dist/doc/support/latexpand/tests/text-after-end.tex
--- old/texmf-dist/doc/support/latexpand/tests/text-after-end.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/tests/text-after-end.tex 2013-08-22 00:08:40.000000000 +0200
@@ -0,0 +1,16 @@
+\documentclass{article}
+
+\begin{document}
+should be displayed
+\verb|\end{document}|
+should be displayed too.
+\end{document} end of line discarded.
+
+should not be displayed.
+\end{document}
+should not be displayed either.
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/latexpand/version.txt new/texmf-dist/doc/support/latexpand/version.txt
--- old/texmf-dist/doc/support/latexpand/version.txt 2012-12-01 00:36:10.000000000 +0100
+++ new/texmf-dist/doc/support/latexpand/version.txt 2014-04-05 00:30:23.000000000 +0200
@@ -1,2 +1,2 @@
-latexpand version b88cfb73604b8424c9cae5ea4acc6ff2f27d3c12.
-Commited on Wed Nov 7 10:55:26 2012 +0100.
+latexpand version ac5896be7dc7c7481695c1ac23da838a31b5c50b.
+Commited on Fri Apr 4 09:58:49 2014 +0200.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexpand.doc.tlpobj new/tlpkg/tlpobj/latexpand.doc.tlpobj
--- old/tlpkg/tlpobj/latexpand.doc.tlpobj 2012-12-01 04:36:27.000000000 +0100
+++ new/tlpkg/tlpobj/latexpand.doc.tlpobj 2014-04-05 03:24:55.000000000 +0200
@@ -1,15 +1,21 @@
name latexpand.doc
category Package
-revision 28402
+revision 33372
shortdesc doc files of latexpand
-docfiles size=10
+docfiles size=17
texmf-dist/doc/support/latexpand/Makefile
texmf-dist/doc/support/latexpand/README
texmf-dist/doc/support/latexpand/tests/README
+ texmf-dist/doc/support/latexpand/tests/df-conflict/a.tex
+ texmf-dist/doc/support/latexpand/tests/df-conflict/b.tex
+ texmf-dist/doc/support/latexpand/tests/df-conflict/b/README-df-conflict.txt
texmf-dist/doc/support/latexpand/tests/foo.tex
+ texmf-dist/doc/support/latexpand/tests/includegraphic.tex
texmf-dist/doc/support/latexpand/tests/includer.tex
texmf-dist/doc/support/latexpand/tests/just-comment.tex
texmf-dist/doc/support/latexpand/tests/my-package.sty
texmf-dist/doc/support/latexpand/tests/no-eol.tex
texmf-dist/doc/support/latexpand/tests/package-user.tex
+ texmf-dist/doc/support/latexpand/tests/smile.pdf
+ texmf-dist/doc/support/latexpand/tests/text-after-end.tex
texmf-dist/doc/support/latexpand/version.txt
++++++ latexpand.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/latexpand/latexpand new/texmf-dist/scripts/latexpand/latexpand
--- old/texmf-dist/scripts/latexpand/latexpand 2012-12-01 00:36:10.000000000 +0100
+++ new/texmf-dist/scripts/latexpand/latexpand 2014-03-24 21:42:27.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# Inspired by latexpand by D. Musliner, University of Michigan
-# 2012 Matthieu Moy
+# 2012, 2013, 2014 Matthieu Moy
# BSD License
use strict;
@@ -73,12 +73,19 @@
my $prefix = (shift || "");
local(*FILE);
open(FILE, $file) or die "could not open input file '$file'\n";
- while (<FILE>) {
- process_line($_, $prefix);
+ while (my $line = <FILE>) {
+ process_line($line, $prefix);
if (/^%.*[^\n]\z/ || /[^\\]%.*[^\n]\z/) {
# file ends with a comment not ending with a newline
print "\n";
}
+ # Garbage at end of line after \end{document} is
+ # ignored by LaTeX, but we don't allow anything before
+ # to avoid e.g. \verb|\end{document}| from terminating
+ # the file.
+ if (!$keep_comments && $line =~ /^[ \t]*\\end{document}/) {
+ last;
+ }
}
close(FILE);
}
@@ -151,8 +158,8 @@
}
}
if ($show_graphics) {
- if (/\\includegraphics{([^}]*)}/) {
- my $full = find_tex_file($1, $graphics_extensions);
+ if (/\\includegraphics(\[[^\]]*\])?{([^}]*)}/) {
+ my $full = find_tex_file($2, $graphics_extensions);
say $prefix . "needs graphics file: ";
print STDERR "$full\n";
}
@@ -178,14 +185,14 @@
{
my ($file, $path) = @_;
if (File::Spec->file_name_is_absolute($file)) {
- if (-e "$file") {
+ if (-e "$file" && ! -d "$file") {
return $file;
} else {
return;
}
}
foreach my $dir (split(':', $path)) {
- if (-e "$dir/$file") {
+ if (-e "$dir/$file" && ! -d "$dir/$file") {
return("$dir/$file");
}
}
@@ -197,15 +204,18 @@
=head1 NAME
-latexpand - Flatten LaTeX file by expanding \include and \input, remove comments
+latexpand - Flatten LaTeX file by expanding \include and \input, ... and remove comments
=head1 SYNOPSIS
latexpand [options] FILE...
- Options:
+=head2 Options:
+
--verbose show what's going on
- --keep-comments don't strip comments
+ --keep-comments don't strip comments (comments are lines
+ starting with %, and anything below
+ \end{document})
--empty-comments keep empty comments (i.e. % at end of lines) for clarity
--keep-includes don't expand \input and \include directives
--expand-usepackage
@@ -240,6 +250,31 @@
https://gitorious.org/latexpand
+Versions are uploaded to ctan.org from time to time:
+
+ http://www.ctan.org/pkg/latexpand
+
=head1 BUGS
Please, report bugs to Matthieu Moy .
+
+=head2 Known bugs
+
+latexpand currently ignores \begin{verbatim} ... \end{verbatim}, and
+will therefore process any \include, \input, ... directives that
+appear within verbatim environments (while it shouldn't).
+
+It would be nice to remove code between \begin{comment} and
+\end{comment} too if \usepackage{comment} is used.
+
+Code like
+
+ foo%
+ \begin{comment}
+
+will produce the incorrect
+
+ foo\begin{comment}
+
+A workaround is to use --empty-comments when such tricky usage of the
+comments package is done.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/latexpand.tlpobj new/tlpkg/tlpobj/latexpand.tlpobj
--- old/tlpkg/tlpobj/latexpand.tlpobj 2012-12-01 04:36:27.000000000 +0100
+++ new/tlpkg/tlpobj/latexpand.tlpobj 2014-04-05 03:24:55.000000000 +0200
@@ -1,6 +1,6 @@
name latexpand
category Package
-revision 28402
+revision 33372
shortdesc Expand \input and \include in a LaTeX document.
longdesc Latexpand is a Perl script that simply replaces \input and
longdesc \include commands with the content of the file input/included.
@@ -9,5 +9,5 @@
runfiles size=2
texmf-dist/scripts/latexpand/latexpand
catalogue-ctan /support/latexpand
-catalogue-date 2012-11-28 13:57:31 +0100
+catalogue-date 2014-04-04 14:16:13 +0200
catalogue-license bsd
++++++ lcdftypetools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/cfftot1.1 new/texmf-dist/doc/man/man1/cfftot1.1
--- old/texmf-dist/doc/man/man1/cfftot1.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/cfftot1.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/cfftot1.man1.pdf and new/texmf-dist/doc/man/man1/cfftot1.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mmafm.1 new/texmf-dist/doc/man/man1/mmafm.1
--- old/texmf-dist/doc/man/man1/mmafm.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/mmafm.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/mmafm.man1.pdf and new/texmf-dist/doc/man/man1/mmafm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mmpfb.1 new/texmf-dist/doc/man/man1/mmpfb.1
--- old/texmf-dist/doc/man/man1/mmpfb.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/mmpfb.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,5 +1,5 @@
.\" -*-nroff-*-
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/mmpfb.man1.pdf and new/texmf-dist/doc/man/man1/mmpfb.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/otfinfo.1 new/texmf-dist/doc/man/man1/otfinfo.1
--- old/texmf-dist/doc/man/man1/otfinfo.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/otfinfo.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/otfinfo.man1.pdf and new/texmf-dist/doc/man/man1/otfinfo.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/otftotfm.1 new/texmf-dist/doc/man/man1/otftotfm.1
--- old/texmf-dist/doc/man/man1/otftotfm.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/otftotfm.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,5 +1,5 @@
'\"t
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/otftotfm.man1.pdf and new/texmf-dist/doc/man/man1/otftotfm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/t1dotlessj.1 new/texmf-dist/doc/man/man1/t1dotlessj.1
--- old/texmf-dist/doc/man/man1/t1dotlessj.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/t1dotlessj.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/t1dotlessj.man1.pdf and new/texmf-dist/doc/man/man1/t1dotlessj.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/t1lint.1 new/texmf-dist/doc/man/man1/t1lint.1
--- old/texmf-dist/doc/man/man1/t1lint.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/t1lint.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/t1lint.man1.pdf and new/texmf-dist/doc/man/man1/t1lint.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/t1rawafm.1 new/texmf-dist/doc/man/man1/t1rawafm.1
--- old/texmf-dist/doc/man/man1/t1rawafm.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/t1rawafm.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/t1rawafm.man1.pdf and new/texmf-dist/doc/man/man1/t1rawafm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/t1reencode.1 new/texmf-dist/doc/man/man1/t1reencode.1
--- old/texmf-dist/doc/man/man1/t1reencode.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/t1reencode.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/t1reencode.man1.pdf and new/texmf-dist/doc/man/man1/t1reencode.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/t1testpage.1 new/texmf-dist/doc/man/man1/t1testpage.1
--- old/texmf-dist/doc/man/man1/t1testpage.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/t1testpage.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/t1testpage.man1.pdf and new/texmf-dist/doc/man/man1/t1testpage.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ttftotype42.1 new/texmf-dist/doc/man/man1/ttftotype42.1
--- old/texmf-dist/doc/man/man1/ttftotype42.1 2013-04-08 23:16:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/ttftotype42.1 2014-04-29 00:59:31.000000000 +0200
@@ -1,4 +1,4 @@
-.ds V 2.97
+.ds V 2.100
.de M
.BR "\\$1" "(\\$2)\\$3"
..
Files old/texmf-dist/doc/man/man1/ttftotype42.man1.pdf and new/texmf-dist/doc/man/man1/ttftotype42.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lcdftypetools.doc.tlpobj new/tlpkg/tlpobj/lcdftypetools.doc.tlpobj
--- old/tlpkg/tlpobj/lcdftypetools.doc.tlpobj 2013-04-09 03:40:26.000000000 +0200
+++ new/tlpkg/tlpobj/lcdftypetools.doc.tlpobj 2014-04-29 03:29:59.000000000 +0200
@@ -1,6 +1,6 @@
name lcdftypetools.doc
category TLCore
-revision 29764
+revision 33736
shortdesc doc files of lcdftypetools
docfiles size=65
texmf-dist/doc/man/man1/cfftot1.1
++++++ lcg.doc.tar.xz ++++++
Files old/doc/latex/lcg/lcg.pdf and new/doc/latex/lcg/lcg.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lcg.doc.tlpobj new/tlpkg/tlpobj/lcg.doc.tlpobj
--- old/tlpkg/tlpobj/lcg.doc.tlpobj 2010-06-10 18:32:56.000000000 +0200
+++ new/tlpkg/tlpobj/lcg.doc.tlpobj 2013-08-20 03:22:07.000000000 +0200
@@ -1,7 +1,7 @@
name lcg.doc
category Package
-revision 15878
+revision 31474
shortdesc doc files of lcg
relocated 1
-docfiles size=36
+docfiles size=65
RELOC/doc/latex/lcg/lcg.pdf
++++++ lcg.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lcg/lcg.sty new/tex/latex/lcg/lcg.sty
--- old/tex/latex/lcg/lcg.sty 2008-09-15 02:42:56.000000000 +0200
+++ new/tex/latex/lcg/lcg.sty 2013-08-20 00:50:31.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% lcg.dtx (with options: `lcg')
%%
-%% Copyright (c) 2001, 2003, 2008 Erich Janka -- Das Vollpreiskind (janka@utanet.at)
+%% Copyright (c) 2001--2013 Erich Janka (erich.janka@gmail.com)
%%
%% This package may be distributed and/or modified under the terms of the
%% LaTeX Project Public License, as described in lppl.txt in the base
@@ -17,7 +17,7 @@
%%
%% This program consits of the files lcg.dtx and lcg.ins
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lcg}[2008/09/10 v1.2 generating random numbers]
+\ProvidesPackage{lcg}[2013/08/09 v1.3 generating random numbers]
\RequirePackage{keyval}
\@ifundefined{rand}{}
{\PackageWarning{lcg}{Command `rand' already defined}}
@@ -193,13 +193,13 @@
} % end of \rand
\def\r@nd{%
\ifnum \cr@nd < \@ne% then ... initialize generator
- \cr@nd = \the\time
- \advance \cr@nd \inputlineno
- \multiply \cr@nd \thepage
- \advance \cr@nd \the\year
+ \cr@nd = \the\time
+ \advance \cr@nd \inputlineno
+ \multiply \cr@nd \value{page}
+ \advance \cr@nd \the\year
\multiply \cr@nd \the\month
\multiply \cr@nd \the\day
- \advance \cr@nd \inputlineno
+ \advance \cr@nd \inputlineno
\if \qui@t y%
\else
\typeout{Random number generator initialized to \the\cr@nd}%
@@ -217,6 +217,7 @@
\ifnum \cr@nd < \z@%
\advance \cr@nd 2147483647 % cr@nd = (a*z mod m) > 0
\fi
+ \global\cr@nd=\cr@nd % persist the change outside current scope
\fi
}% end of \r@nd
\initr@nd % initialize the package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lcg.tlpobj new/tlpkg/tlpobj/lcg.tlpobj
--- old/tlpkg/tlpobj/lcg.tlpobj 2010-06-10 18:32:56.000000000 +0200
+++ new/tlpkg/tlpobj/lcg.tlpobj 2013-08-20 03:22:07.000000000 +0200
@@ -1,15 +1,16 @@
name lcg
category Package
-revision 15878
+revision 31474
shortdesc Generate random integers.
relocated 1
longdesc The lcg package generates random numbers (integers) via a
longdesc linear congruential generator (Schrage's method). The random
-longdesc numbers are written to a counter. The keyval package is used to
-longdesc set values for the range, a seed, and the name of the counter.
+longdesc numbers are written to a counter. The keyval package is used
+longdesc for the user to provide values for the range and a seed, and
+longdesc for the name of the counter to be used.
runfiles size=2
RELOC/tex/latex/lcg/lcg.sty
catalogue-ctan /macros/latex/contrib/lcg
-catalogue-date 2008-09-10 22:47:41 +0200
+catalogue-date 2013-08-19 14:43:09 +0200
catalogue-license lppl
-catalogue-version 1.2
+catalogue-version 1.3
++++++ leaflet.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leaflet/README new/doc/latex/leaflet/README
--- old/doc/latex/leaflet/README 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/leaflet/README 2013-11-07 23:32:28.000000000 +0100
@@ -1,9 +1,10 @@
-The leaflet class
+The leaflet document class
+==========================
-A document class to create small hand-outs (flyers) that fit on a single sheet
-of paper which is then folded twice. Pages are rearranged by LaTeX so that they
-print correctly on a single sheet -- no external script is necessary. (Works
-with PostScript and PDF.)
+A LaTeX document class to create small hand-outs (flyers) that fit on a
+single sheet of paper which is then folded twice. Pages are rearranged by
+LaTeX so that they print correctly on a single sheet -- no external script
+is necessary. (Works with PostScript and PDF.)
Recommended TDS locations:
Files old/doc/latex/leaflet/leaflet-manual.pdf and new/doc/latex/leaflet/leaflet-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leaflet/leaflet-manual.tex new/doc/latex/leaflet/leaflet-manual.tex
--- old/doc/latex/leaflet/leaflet-manual.tex 2012-07-24 01:37:22.000000000 +0200
+++ new/doc/latex/leaflet/leaflet-manual.tex 2013-11-07 23:32:28.000000000 +0100
@@ -21,9 +21,9 @@
%% This work has the LPPL maintenance status "author-maintained".
%%
\def\filename{leaflet-manual.tex}
-\def\fileversion{v1.0d} % change this when leaflet-manual changed, too.
-\def\filedate{2012/06/04}
-\def\docdate {2012/06/04} % change this when leaflet-manual changed, too.
+\def\fileversion{v1.0e} % change this when leaflet-manual changed, too.
+\def\filedate{2013/11/06}
+\def\docdate {2013/11/06} % change this when leaflet-manual changed, too.
\listfiles
\errorcontextlines=99
\documentclass[
Files old/doc/latex/leaflet/leaflet.pdf and new/doc/latex/leaflet/leaflet.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leaflet.doc.tlpobj new/tlpkg/tlpobj/leaflet.doc.tlpobj
--- old/tlpkg/tlpobj/leaflet.doc.tlpobj 2012-07-24 04:33:58.000000000 +0200
+++ new/tlpkg/tlpobj/leaflet.doc.tlpobj 2013-11-08 03:22:32.000000000 +0100
@@ -1,6 +1,6 @@
name leaflet.doc
category Package
-revision 27126
+revision 32093
shortdesc doc files of leaflet
relocated 1
docfiles size=86
++++++ leaflet.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leaflet/leaflet.cls new/tex/latex/leaflet/leaflet.cls
--- old/tex/latex/leaflet/leaflet.cls 2012-07-24 01:37:22.000000000 +0200
+++ new/tex/latex/leaflet/leaflet.cls 2013-11-07 23:32:28.000000000 +0100
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{leaflet}
- [2012/06/04 v1.0d LaTeX document class (JS,WaS,RN,HjG)]
+ [2013/11/06 v1.0d LaTeX document class (JS,WaS,RN,HjG)]
\let\LL@shipout\shipout \let\LL@outputpage\@outputpage
\let\LL@begindvi\@begindvi \let\LL@@end\@@end
\@ifundefined{iflandscape}{\newif\iflandscape}{}%
@@ -236,26 +236,33 @@
\ifx\filename@base\reserved@a\@tempswatrue\fi%
\def\reserved@a{dvipdfm}%
\ifx\filename@base\reserved@a\@tempswatrue\fi%
- \if@tempswa%
+ \if@tempswa
\ClassInfo{leaflet}{Generating code for dvips}%
\def\LL@pagesize@specials#1#2{%
\@tempdima=#1\@tempdimb=#2%
\AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}}}%
- \fi%
+ \fi
\def\reserved@a{pdftex}%
\ifx\filename@base\reserved@a
\ClassInfo{leaflet}{Generating code for pdfTeX}%
\def\LL@pagesize@specials#1#2{%
\@tempdima=#1\@tempdimb=#2%
\pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}%
- \fi%
+ \fi
+ \def\reserved@a{xetex}%
+ \ifx\filename@base\reserved@a
+ \ClassInfo{leaflet}{Generating code for XeTeX}%
+ \def\LL@pagesize@specials#1#2{%
+ \@tempdima=#1\@tempdimb=#2%
+ \pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}%
+ \fi
\def\reserved@a{vtex}%
\ifx\filename@base\reserved@a
\ClassInfo{leaflet}{Generating code for VTeX}%
\def\LL@pagesize@specials#1#2{%
\@tempdima=#1\@tempdimb=#2%
\mediawidth\@tempdima\mediaheight\@tempdimb}%
- \fi%
+ \fi
\fi
}
\newcommand*\LL@CmdIgnored[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leaflet.tlpobj new/tlpkg/tlpobj/leaflet.tlpobj
--- old/tlpkg/tlpobj/leaflet.tlpobj 2012-07-24 04:33:58.000000000 +0200
+++ new/tlpkg/tlpobj/leaflet.tlpobj 2013-11-08 03:22:32.000000000 +0100
@@ -1,6 +1,6 @@
name leaflet
category Package
-revision 27126
+revision 32093
shortdesc Create small handouts (flyers).
relocated 1
longdesc A document class to create small hand-outs (flyers) that fit on
@@ -12,6 +12,6 @@
runfiles size=5
RELOC/tex/latex/leaflet/leaflet.cls
catalogue-ctan /macros/latex/contrib/leaflet
-catalogue-date 2012-07-05 15:17:31 +0200
+catalogue-date 2013-11-07 14:52:10 +0100
catalogue-license lppl
-catalogue-version 1.0d
+catalogue-version 1.0e
++++++ ledmac.doc.tar.xz ++++++
Files old/doc/latex/ledmac/ledarab.pdf and new/doc/latex/ledmac/ledarab.pdf differ
Files old/doc/latex/ledmac/ledmac.pdf and new/doc/latex/ledmac/ledmac.pdf differ
Files old/doc/latex/ledmac/ledpar.pdf and new/doc/latex/ledmac/ledpar.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ledmac.doc.tlpobj new/tlpkg/tlpobj/ledmac.doc.tlpobj
--- old/tlpkg/tlpobj/ledmac.doc.tlpobj 2012-09-19 04:29:35.000000000 +0200
+++ new/tlpkg/tlpobj/ledmac.doc.tlpobj 2013-06-29 03:22:05.000000000 +0200
@@ -1,6 +1,6 @@
name ledmac.doc
category Package
-revision 27721
+revision 30987
shortdesc doc files of ledmac
relocated 1
docfiles size=822
++++++ ledmac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ledmac/ledmac.sty new/tex/latex/ledmac/ledmac.sty
--- old/tex/latex/ledmac/ledmac.sty 2012-09-19 01:40:10.000000000 +0200
+++ new/tex/latex/ledmac/ledmac.sty 2013-06-28 01:09:27.000000000 +0200
@@ -23,7 +23,7 @@
%% This work consists of the files listed in the README file.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2012/08/14 v0.18 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2013/06/14 v0.19.1 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifnoeledmac
@@ -49,7 +49,7 @@
\newcommand{\ledmac@error}[2]{\PackageError{ledmac}{#1}{#2}}
\ifnoeledmac
\else
-\ledmac@error{Ledmac is an depreciated package. We suggest you to use eledmac instead. If you want to continue to use ledmac, you can disable this message by adding option noeledmac when loading package.}{\@ehc}
+\ledmac@error{Using package `ledmac' is deprecated. We suggest\MessageBreak using `eledmac' instead. If you want to continue\MessageBreak with `ledmac', you can disable this message by\MessageBreak adding the option `noeledmac' when loading `ledmac'}{\@ehc}
\fi
\newcommand*{\led@err@NumberingStarted}{%
\ledmac@error{Numbering has already been started}{\@ehc}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ledmac.tlpobj new/tlpkg/tlpobj/ledmac.tlpobj
--- old/tlpkg/tlpobj/ledmac.tlpobj 2012-09-19 04:29:36.000000000 +0200
+++ new/tlpkg/tlpobj/ledmac.tlpobj 2013-06-29 03:22:07.000000000 +0200
@@ -1,6 +1,6 @@
name ledmac
category Package
-revision 27721
+revision 30987
shortdesc Typeset scholarly editions.
relocated 1
longdesc A macro package for typesetting scholarly critical editions.
@@ -15,6 +15,6 @@
RELOC/tex/latex/ledmac/ledmac.sty
RELOC/tex/latex/ledmac/ledpar.sty
catalogue-ctan /macros/latex/contrib/ledmac
-catalogue-date 2012-09-17 12:04:36 +0200
+catalogue-date 2013-06-15 00:57:55 +0200
catalogue-license lppl
-catalogue-version 0.19
+catalogue-version 0.19.1
++++++ leipzig.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leipzig/README new/doc/latex/leipzig/README
--- old/doc/latex/leipzig/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/leipzig/README 2013-06-29 17:41:53.000000000 +0200
@@ -0,0 +1,47 @@
+%%
+%% This is file `README.txt',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% leipzig.dtx (with options: `readme')
+%% This is a generated file.
+%%
+%% ----------------------------------------------------------------
+%% leipzig --- A package to typeset and index linguistic gloss abbreviations.
+%% E-mail: natalie.a.weber@gmail.com
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+%%
+%% Copyright (C) 2013 by Natalie Weber
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Natalie Weber.
+%%
+%% This work consists of the files leipzig.dtx,
+%% leipzig.ins
+%% leipzig.tex
+%%
+%% and the derived files leipzig.sty and leipzig.pdf.
+%%
+
+The leipzig package provides a set of macros for standard glossing abbreviations, with options to create new ones. They are mnemonic (e.g. \Acc{} for accusative, abbreviated \textsc{acc}). They can be used alone or on top of the glossaries package for easy indexing and glossary printing.
+
+For full indexing capabilities, leipzig should be used in conjunction with the glossaries package. Notes for installation are included in the package documentation.
+
+\endinput
+%%
+%% End of file `README.txt'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leipzig.doc.tlpobj new/tlpkg/tlpobj/leipzig.doc.tlpobj
--- old/tlpkg/tlpobj/leipzig.doc.tlpobj 2013-05-29 03:52:45.000000000 +0200
+++ new/tlpkg/tlpobj/leipzig.doc.tlpobj 2013-06-30 03:19:47.000000000 +0200
@@ -1,9 +1,10 @@
name leipzig.doc
category Package
-revision 30785
+revision 31045
shortdesc doc files of leipzig
relocated 1
-docfiles size=118
+docfiles size=119
+ RELOC/doc/latex/leipzig/README
RELOC/doc/latex/leipzig/README.txt
RELOC/doc/latex/leipzig/leipzig.pdf
RELOC/doc/latex/leipzig/leipzig.tex
++++++ leipzig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leipzig.tlpobj new/tlpkg/tlpobj/leipzig.tlpobj
--- old/tlpkg/tlpobj/leipzig.tlpobj 2013-05-29 03:52:45.000000000 +0200
+++ new/tlpkg/tlpobj/leipzig.tlpobj 2013-06-30 03:19:47.000000000 +0200
@@ -1,6 +1,16 @@
name leipzig
category Package
-revision 30785
+revision 31045
+shortdesc Typeset and index linguistic gloss abbreviations.
relocated 1
+longdesc The leipzig package provides a set of macros for standard
+longdesc glossing abbreviations, with options to create new ones. They
+longdesc are mnemonic (e.g. \Acc{} for accusative, abbreviated acc).
+longdesc These abbre can be used alone or on top of the glossaries
+longdesc package for easy indexing and glossary printing.
runfiles size=2
RELOC/tex/latex/leipzig/leipzig.sty
+catalogue-ctan /macros/latex/contrib/leipzig
+catalogue-date 2013-06-19 00:57:02 +0200
+catalogue-license lppl1.3
+catalogue-version 1.1
++++++ lettre.doc.tar.xz ++++++
++++ 76306 lines of diff (skipped)
++++++ lettre.tar.xz ++++++
++++ 1730 lines of diff (skipped)
++++++ lhcyr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lhcyr/lhcyrkoi/maketfms.sh new/tex/latex/lhcyr/lhcyrkoi/maketfms.sh
--- old/tex/latex/lhcyr/lhcyrkoi/maketfms.sh 2013-03-12 01:01:41.000000000 +0100
+++ new/tex/latex/lhcyr/lhcyrkoi/maketfms.sh 2013-09-30 02:09:52.000000000 +0200
@@ -1,11 +1,16 @@
-if [ mktextfm ]; then
+echo To create tfm\'s for lh-fonts in the KOI-8 encoding we have
+echo to determine the proper command which depends on the teTeX version.
+echo Trying \"mktextfm\" and \"MakeTeXTFM\" ...
+if [ `mktextfm cmr10` ]; then
MKTFMC=mktextfm
-elif [ MakeTeXTFM ]; then
+elif [ `MakeTeXTFM cmr10` ]; then
MKTFMC=MakeTeXTFM
else
- echo Cannot determine a command for creating tfm
+ echo Cannot determine a command for creating tfm!
exit 1
fi
+echo Using \"$MKTFMC\" ...
+
$MKTFMC kcb10
$MKTFMC kcbx10
$MKTFMC kcbx12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lhcyr.tlpobj new/tlpkg/tlpobj/lhcyr.tlpobj
--- old/tlpkg/tlpobj/lhcyr.tlpobj 2013-03-12 04:38:13.000000000 +0100
+++ new/tlpkg/tlpobj/lhcyr.tlpobj 2013-09-30 03:20:13.000000000 +0200
@@ -1,6 +1,6 @@
name lhcyr
category Package
-revision 29349
+revision 31795
shortdesc A non-standard Cyrillic input scheme.
relocated 1
longdesc A collection of three LaTeX 2e styles intended for typesetting
++++++ libertine.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertine/README new/doc/fonts/libertine/README
--- old/doc/fonts/libertine/README 2013-02-14 00:19:55.000000000 +0100
+++ new/doc/fonts/libertine/README 2014-02-21 00:12:22.000000000 +0100
@@ -1,4 +1,4 @@
-This is the README for libertine, version 5.3.0 (2013-02-13).
+This is the README for libertine, version 5.3.0 (2014-02-19).
This package provides support for use of the Linux Libertine and Linux
Biolinum families of fonts with LaTeX. Most features are usable with
@@ -8,22 +8,23 @@
and should provide partial compatibility with the obsolete libertineotf
and libertine-legacy packages.
-To install this package on a TDS-compliant TeX system download the file
-tex-archive/install/fonts/libertine.tds.zip and unzip at the root of an
-appropriate texmf tree, likely a personal or local tree. If necessary,
-update the file-name database (e.g., texhash texmf). Update the font-map
-files by enabling the Map file libertine.map.
+To install this package on a TDS-compliant TeX system download
+the file "tex-archive"/install/fonts/libertine.tds.zip, where the
+preferred URL for "tex-archive" is http://mirror.ctan.org. Unzip the
+archive at the root of an appropriate texmf tree, likely a personal
+or local tree. If necessary, update the file-name database (e.g.,
+texhash texmf). Update the font-map files by enabling the Map file
+libertine.map.
For most purposes, simply add
\usepackage{libertine}
to the preamble of your document. This will activate Libertine as the
-main (serifed) text font, Biolinum as the sans font and LibertineMono as
-the monospaced font. Use the mono=false (or tt=false) option to suppress
-activating LibertineMono. It is recommended that the font encoding
-be set to T1 or LY1, but the default OT1 encoding is also supported.
-Available shapes in all series (except tt) include:
+main (serifed) text font, Biolinum as the sans font and LibertineMono
+as the monospaced font. It is recommended that the font encoding be set
+to T1 or LY1, but the default OT1 encoding is also supported. Available
+shapes in all series (except tt) include:
it italic
sc small caps
@@ -37,8 +38,13 @@
To activate Libertine (without Biolinum), use the libertine (or rm)
option. Similarly, to activate Biolinum (without Libertine), use the
biolinum (or sf or ss) option. To use Biolinum as the main text font
-(as well as the sans font), use the option sfdefault (which redefines
-\familydefault, not \rmdefault).
+(as well as the sans font), use the option sfdefault. To suppress
+activating LibertineMono, use mono=false (or tt=false). To activate
+single font families, use one or more of
+
+\usepackage{libertineRoman}
+\usepackage{libertineMono}
+\usepackage{biolinum}
For more advanced usage, please see the libertine.pdf document.
Files old/doc/fonts/libertine/libertine.pdf and new/doc/fonts/libertine/libertine.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertine/libertine.tex new/doc/fonts/libertine/libertine.tex
--- old/doc/fonts/libertine/libertine.tex 2013-02-14 00:19:55.000000000 +0100
+++ new/doc/fonts/libertine/libertine.tex 2014-02-15 00:25:41.000000000 +0100
@@ -1,7 +1,7 @@
\documentclass[11pt]{article}
\usepackage[textwidth=5.5in,textheight=8.5in]{geometry}
\usepackage[T1]{fontenc}
-\usepackage[osf,p]{libertine}
+\usepackage[osf,proportional]{libertine}
\usepackage{lettrine}
\renewcommand{\ttfamily}{\fontencoding{OT1}\fontfamily{cmtt}\selectfont}
\PassOptionsToPackage{urlcolor=black,colorlinks}{hyperref}
@@ -56,8 +56,6 @@
to the preamble of your document. This will activate Libertine as
the main (seriffed) text font, Biolinum as the sans font,
and (from January~2013) LibertineMono as the monospaced font.
-Use the \verb|mono=false| (or \verb|tt=false|) option to suppress
-activating LibertineMono.
It is
recommended that the font encoding be set to \verb\T1\ or \verb\LY1\ but the default
\verb\OT1\ encoding is also supported. Available shapes in all series (except \texttt{tt}, which
@@ -77,16 +75,24 @@
To activate Libertine (without Biolinum), use the \texttt{libertine} (or \texttt{rm})
option. Similarly, to activate Biolinum (without Libertine) use the
\texttt{biolinum} (or \texttt{sf} or \texttt{ss}) option. To use Biolinum as the main text font (as
-well as the sans font), use the option \texttt{sfdefault} (which redefines
-\verb|\familydefault|, not \verb|\rmdefault|).
+well as the sans font), use the option \texttt{sfdefault}.
+Use the \verb|mono=false| (or \verb|tt=false|) option to suppress
+activating LibertineMono.
+To activate single font families,
+use one or more of
+\begin{list}{}{}
+\item \verb|\usepackage{libertineRoman}|
+\item \verb|\usepackage{libertineMono}|
+\item \verb|\usepackage{biolinum}|
+\end{list}
+
\section{Advanced Usage}
Lua\LaTeX\ and xe\LaTeX\ users who might prefer to use Type~1 fonts or who
wish to avoid \texttt{fontspec} may use the \texttt{type1} (or \texttt{nofontspec}) option.
-Users who wish to activate Type~1 font families \emph{separately} may use \verb\libertine-type1.sty\
-and/or
-\verb\biolinum-type1.sty\ and/or \verb\libertineMono-type1.sty\; these also provide
+The \verb\libertine-type1.sty\,
+\verb\biolinum-type1.sty\ and \verb\libertineMono-type1.sty\ packages provide
compatibility
with older packages. For legacy documents that use only basic
facilities of \verb\libertineotf\, a wrapper package \verb\libertineotf.sty\ is provided.
@@ -127,7 +133,7 @@
\texttt{sftabular} (\texttt{sft}) or \texttt{sfproportional} (\texttt{sfp})
\end{list}
-The \texttt{semibold} (\texttt{sb}) option will set \verb|\bfdefault| to \texttt{sb} to enable use of the
+The \texttt{semibold} (\texttt{sb}) option will enable use of the
semi-bold series of Libertine; this has no effect on the Biolinum fonts,
for which there is no semi-bold variant. The options \verb|scale=|<\emph{number}> (or
\verb|scaled=|<\emph{number}>) will scale the Biolinum fonts but have no effect on the
@@ -136,6 +142,9 @@
also be used
in the form \verb|osf=true| or \verb|osf=false|.
+The option \verb\defaultfeatures=...\ allows the user to add default OpenType
+features; for example, \verb\defaultfeatures={Variant=01}\ will force use of the Stylistic~Set~1
+variant glyphs.
Commands \verb|\oldstylenums{|\ldots\verb|}| and \verb|\oldstylenumsf{|\ldots\verb|}| are defined to
allow for local use of old-style figures in Libertine and Biolinum,
@@ -150,12 +159,16 @@
Superior numbers (for footnote markers) are available using \verb|\sufigures|
or \verb|\textsu{|\ldots\verb|}|.
-\clearpage
+
+Command \verb|\useosf| switches the default figure style for Libertine and Biolinum to old-style figures; this is
+primarily for use \emph{after} calling a math package (such as \verb|newtxmath| with the
+\verb|libertine| option) with lining figures as the default.
+
The following macros select the font family indicated:
\begin{center}
\begin{tabular}{ll}
\verb|\libertine| & Libertine \\
-\verb|\libertineSB|& Libertine with semibold \verb|\bfdefault| \\
+\verb|\libertineSB|& Libertine with semibold \\
\verb|\libertineOsF| & Libertine with oldstyle figures \\
\verb|\libertineLF| & Libertine with lining figures \\
\verb|\libertineDisplay| & Libertine Display \\
@@ -689,11 +702,9 @@
in \texttt{fontspec} in case other fonts will be activated by the user.
\subsection{Additional \texttt{sty} Files}
-A ``wrapper'' file \verb\libertineotf.sty\ provides partial compatibility with
-an obsolete package, primarily for legacy documents; explicit options are passed on to \verb|libertine.sty|.
-The \verb|tex/latex/libertine/| directory also contains three files
-\verb|libertine-type1.sty|, \verb|biolinum-type1.sty| and \verb\libertineMono-type1.sty\
-derived from \verb|libertine.sty|; these
-allow those font families to be activated separately or together (and provide partial compatibility with obsolete packages).
+The \verb|tex/latex/libertine/| directory also contains three ``front-end'' files
+\verb|libertineotf.sty|, \verb|libertine-type1.sty|, and \verb|biolinum-type1.sty|,
+which provide partial compatibility with obsolete packages, primarily for legacy
+documents.
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertine.doc.tlpobj new/tlpkg/tlpobj/libertine.doc.tlpobj
--- old/tlpkg/tlpobj/libertine.doc.tlpobj 2013-02-14 04:32:46.000000000 +0100
+++ new/tlpkg/tlpobj/libertine.doc.tlpobj 2014-02-21 03:21:24.000000000 +0100
@@ -1,6 +1,6 @@
name libertine.doc
category Package
-revision 29099
+revision 33008
shortdesc doc files of libertine
relocated 1
docfiles size=303
++++++ libertine.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-m/libertine.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-m.new/libertine.tar.xz differ: char 26, line 1
++++++ librebaskerville.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/librebaskerville/README new/doc/fonts/librebaskerville/README
--- old/doc/fonts/librebaskerville/README 2013-01-27 23:52:56.000000000 +0100
+++ new/doc/fonts/librebaskerville/README 2013-09-25 00:24:51.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the librebaskerville package, version 2013-01-25.
+This is the README for the librebaskerville package, version 2013-09-20.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Libre Baskerville family of fonts, designed by Pablo Impallari.
@@ -24,7 +24,7 @@
Options scaled=<number> or scale=<number> may be used to scale the
fonts.
-The only figure style supported is tabular-lining. Font encodings
+The only figure style supported is proportional-lining. Font encodings
supported are OT1, T1, LY1 and TS1.
Macro \librebaskerville selects the Libre Baskerville family.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librebaskerville.doc.tlpobj new/tlpkg/tlpobj/librebaskerville.doc.tlpobj
--- old/tlpkg/tlpobj/librebaskerville.doc.tlpobj 2013-04-10 21:04:48.000000000 +0200
+++ new/tlpkg/tlpobj/librebaskerville.doc.tlpobj 2013-09-25 03:20:33.000000000 +0200
@@ -1,6 +1,6 @@
name librebaskerville.doc
category Package
-revision 29803
+revision 31741
shortdesc doc files of librebaskerville
relocated 1
docfiles size=13
++++++ librebaskerville.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librebaskerville.tlpobj new/tlpkg/tlpobj/librebaskerville.tlpobj
--- old/tlpkg/tlpobj/librebaskerville.tlpobj 2013-04-10 21:04:49.000000000 +0200
+++ new/tlpkg/tlpobj/librebaskerville.tlpobj 2013-09-25 03:20:33.000000000 +0200
@@ -1,6 +1,6 @@
name librebaskerville
category Package
-revision 29803
+revision 31741
shortdesc LaTeX support for the Libre Baskerville family of fonts.
relocated 1
longdesc Libre Baskerville is designed by Pablo Impallari. It is
@@ -105,5 +105,5 @@
RELOC/tex/latex/librebaskerville/TS1LibreBaskerville-TLF.fd
RELOC/tex/latex/librebaskerville/librebaskerville.sty
catalogue-ctan /fonts/librebaskerville
-catalogue-date 2013-01-28 07:51:38 +0100
+catalogue-date 2013-09-23 21:56:36 +0200
catalogue-license lppl
++++++ linearA.doc.tar.xz ++++++
++++++ linearA.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/linearA.tlpobj new/tlpkg/tlpobj/linearA.tlpobj
--- old/tlpkg/tlpobj/linearA.tlpobj 2010-06-10 18:34:15.000000000 +0200
+++ new/tlpkg/tlpobj/linearA.tlpobj 2014-04-18 03:12:36.000000000 +0200
@@ -20,5 +20,5 @@
RELOC/fonts/type1/public/linearA/LinearACmplxSigns.pfb
RELOC/tex/latex/linearA/linearA.sty
catalogue-ctan /fonts/archaic/linearA
-catalogue-date 2006-12-01 16:33:32 +0100
+catalogue-date 2012-05-22 10:49:40 +0200
catalogue-license lppl
++++++ lisp-on-tex.doc.tar.xz ++++++
++++ 7103 lines of diff (skipped)
++++++ lisp-on-tex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lisp-on-tex/lisp-arith.sty new/tex/latex/lisp-on-tex/lisp-arith.sty
--- old/tex/latex/lisp-on-tex/lisp-arith.sty 2013-03-05 01:33:46.000000000 +0100
+++ new/tex/latex/lisp-on-tex/lisp-arith.sty 2014-01-04 01:18:26.000000000 +0100
@@ -75,4 +75,7 @@
\addassoc\@globalenv\<{\@tlabel@func{\@arith@lt}}
\def\@arith@lt#1\@tlabel@int#2\@tlabel@int#3{%
- \ifnum#2<#3 \gdef#1{\@tlabel@bool{t}}\else\gdef#1{\@tlabel@bool{f}}\fi}
\ No newline at end of file
+ \ifnum#2<#3 \gdef#1{\@tlabel@bool{t}}\else\gdef#1{\@tlabel@bool{f}}\fi}
+\addassoc\@globalenv\>{\@tlabel@func{\@arith@gt}}
+\def\@arith@gt#1\@tlabel@int#2\@tlabel@int#3{%
+ \ifnum#2>#3 \gdef#1{\@tlabel@bool{t}}\else\gdef#1{\@tlabel@bool{f}}\fi}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lisp-on-tex/lisp-on-tex.sty new/tex/latex/lisp-on-tex/lisp-on-tex.sty
--- old/tex/latex/lisp-on-tex/lisp-on-tex.sty 2013-03-05 01:33:46.000000000 +0100
+++ new/tex/latex/lisp-on-tex/lisp-on-tex.sty 2014-01-04 01:18:26.000000000 +0100
@@ -1,5 +1,5 @@
%%
-%% This is file `lisp.sty'.
+%% This is file `lisp-on-tex.sty'.
%%
%% License: Modified BSD - see LICENSE file
%%
@@ -77,19 +77,17 @@
% interface
\def\@lisp@empty{}
-\def\lispinterp#1{\begingroup%
- \gdef\@read@buffer{#1\@@eof\@@eof}\@lispinterp}
-\def\@lispinterp{%
- \readchar
- \ifx\@currentread\@eof
- \def\@next{\endgroup}%
+\def\lispinterp#1{%
+ \@lispread\@lisp@read@eval@loop#1\@end@lispread}
+\def\@lisp@read@eval@loop#1#2{%
+ \ifx#1\@tlabel@exception
+ \let\@@next\relax
\else
- \def\@next{%
- \unreadchar
- \@lispread\@lisp@input
- \lispeval\@lisp@input\@lisp@result
- \@lispinterp}\fi
- \@next}
+ \def\@reg@tmp{#1{#2}}%
+ \def\@@next{%
+ \lispeval\@reg@tmp\@reg@tmp
+ \@lispread\@lisp@read@eval@loop}%
+ \fi\@@next}
% eval
@@ -120,8 +118,8 @@
\def\@@@@make@cons#1#2#3{\gdef#1{\@tlabel@cons{#2#3}}}
-\def\@defined@datatype{symbol,string,int,bool,dimen,skip,cons,nil,func,closure,macro,envfunc,mutable}
-\def\@defined@specialform{lambda,quote,define,if,defmacro,begin,mdefine,setb,@let,@mlet}
+\def\@defined@datatype{symbol,string,int,bool,dimen,skip,cons,nil,func,closure,macro,envfunc,mutable,exception}
+\def\@defined@specialform{lambda,quote,define,if,defmacro,begin,mdefine,setb,@let,@mlet,macroexpand}
\edef\@defined@lisp@on@tex{\@defined@datatype,\@defined@specialform}
@@ -153,13 +151,34 @@
\csname @tlabel@\@type\endcsname}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% memo of fasteval branch
+% Each bound variables \var
+% is defined as TeX macro [[@lisp@env@\var]]
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\def\@lisp@expand@env@last{\@lisp@expand@env@last}
+
+\def\@lisp@expand@environment#1#2{%
+ \ifx#1\@lisp@expand@env@last
+ \let\@@next\relax
+ \else
+ \expandafter\def\csname @lisp@env@\string#1\endcsname{#2}%
+ \let\@@next\@lisp@expand@environment
+ \fi
+ \@@next}
+
\def\lispeval#1#2{% #1 : \cs -> S-exp, #2 : target register
\gdef\@temp@write@buffer{}%
- \expandafter\@eval#1{}#2%
+ \expandafter\@lisp@expand@environment\@globalenv\@lisp@expand@env@last\@lisp@expand@env@last%
+ \expandafter\@eval#1{}#2%
\@temp@write@buffer}
\def\@eval#1#2#3#4{%
- \begingroup\expandafter\@@select@eval#1{#2}{#3}#4\endgroup}
+ \begingroup
+ \@lisp@expand@environment#3\@lisp@expand@env@last\@lisp@expand@env@last
+ \expandafter\@@select@eval#1{#2}{#3}#4%
+ \endgroup}
\def\@append@env@global#1#2{%
\def#2{#1}%
@@ -167,12 +186,25 @@
\expandafter\expandafter\expandafter#2%
\expandafter\expandafter\expandafter{\expandafter#2\@globalenv}}
-\def\@eval@symbol#1#2#3{%
- \@append@env@global{#2}\@temp@env
- %% \@temp@env = #2(local environment) ++ global environment
- \getassoc\@temp@env#1#3%
- \expandafter\@expand@if@mutable#3#3}
-\def\@expand@if@mutable#1#2#3{\ifx#1\@tlabel@mutable\global\let#3#2\fi}
+% \def\@eval@symbol#1#2#3{%
+% \@append@env@global{#2}\@temp@env
+% %% \@temp@env = #2(local environment) ++ global environment
+% \getassoc\@temp@env#1#3%
+% \expandafter\@expand@if@mutable#3#3}
+\def\@eval@symbol#1#2#3{% #1 symbol #2 current env (ignored) #3 dist
+ \expandafter\global\expandafter\let\expandafter#3\csname @lisp@env@\string#1\endcsname
+ \ifx#3\relax % not found
+ \errmessage{LISP on TeX [evaluation of a symbol]: unbound variable...}%
+ \else
+ \expandafter\@expand@if@mutable#3#3%
+ \fi}
+\def\@expand@if@mutable#1#2#3{%
+ \let\@@next\@expand@if@mutable@next@f
+ \ifx#1\@tlabel@mutable\let\@@next\@expand@if@mutable@next@t\fi
+ \@@next{#2}{#3}}
+\def\@expand@if@mutable@next@f#1#2{}
+\def\@expand@if@mutable@next@t#1#2{\global\let#2#1}
+
\def\@eval@envcs#1#2#3#4{\expandafter\@@eval@envcs\expandafter{#1}#2{#3}#4}
\def\@@eval@envcs#1#2#3#4{\@eval#2{#3}{#1}#4}
@@ -288,27 +320,36 @@
\aftergroup\@@tco
}
\def\@apply@if@next\@tlabel@bool#1#2#3#4#5#6#7{%
+ \let\@@next\relax
\ifx#1t%
- \gdef\@@tco{\@eval#2{#3}{#6}#7}%
+ \let\@@next\@apply@if@next@t
\else\ifx#1f%
- \gdef\@@tco{\@eval#4{#5}{#6}#7}%
+ \let\@@next\@apply@if@next@f
\else
\errmessage{LISP on TeX [if]: Invalid boolean. It's BUG. Please report.}%
- \fi\fi}
+ \fi\fi\@@next{#1}{#2}{#3}{#4}{#5}{#6}{#7}}
+\def\@apply@if@next@t#1#2#3#4#5#6#7{\gdef\@@tco{\@eval#2{#3}{#6}#7}}
+\def\@apply@if@next@f#1#2#3#4#5#6#7{\gdef\@@tco{\@eval#4{#5}{#6}#7}}
%% use general
\def\@apply@eval@args#1#2#3#4{%
+ \let\@@next@pre\@apply@eval@args@pre@default
\ifx#3\relax
\let\@@next\@@next@fin
\else
- \let\@@save#1%
- \@eval#3{#4}{#2}#1%
- \expandafter\expandafter\expandafter\def
- \expandafter\expandafter\expandafter#1\expandafter\expandafter\expandafter{%
- \expandafter\@@save#1}%
- \let\@@next\@apply@eval@args
- \fi\@@next#1{#2}}
+ \let\@@next@pre\@apply@eval@args@pre@i
+ \fi\@@next@pre{#1}{#2}{#3}{#4}\@@next#1{#2}}
+
+\def\@apply@eval@args@pre@default#1#2#3#4{}
+\def\@apply@eval@args@pre@i#1#2#3#4{%
+ \let\@@save#1%
+ \@eval#3{#4}{#2}#1%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter#1\expandafter\expandafter\expandafter{%
+ \expandafter\@@save#1}%
+ \let\@@next\@apply@eval@args}
+
\def\@@next@fin#1#2{}
\def\@apply@func#1#2\@#3#4{%
@@ -344,6 +385,7 @@
\aftergroup\@@tco}
\def\@@apply@create@env#1#2:#3#4#5{%
+ \let\@@next@pre\@@apply@create@env@pre@default
\ifx!#2!% if #2 is empty
\let\@@next@args@\@empty
\ifx#3\@@unused
@@ -353,17 +395,24 @@
\let\@@next\@@apply@create@env@fin
\@@apply@modify@env#1\@tlabel@nil{}#3\@
\else
- \@@apply@create@env@phantom
- \expandafter\@@apply@modify@env\expandafter#1\@@@@ph#3\@
- \expandafter\gdef\csname car\the\@malloc\endcsname{#4{#5}}%
- \let\@@next\@@apply@create@env@cdr
+ \let\@@next@pre\@@apply@create@env@pre@i
\fi
\fi
\else
- \@@apply@modify@env#1#4{#5}#2\@
- \@@next@args#2\@
- \let\@@next\@@apply@create@env
- \fi\expandafter\@@next\expandafter#1\@@next@args@:#3}
+ \let\@@next@pre\@@apply@create@env@pre@ii
+ \fi\@@next@pre{#1}{#2}{#3}{#4}{#5}\expandafter\@@next\expandafter#1\@@next@args@:#3}
+
+\def\@@apply@create@env@pre@default#1#2#3#4#5{}
+\def\@@apply@create@env@pre@i#1#2#3#4#5{%
+ \@@apply@create@env@phantom
+ \expandafter\@@apply@modify@env\expandafter#1\@@@@ph#3\@
+ \expandafter\gdef\csname car\the\@malloc\endcsname{#4{#5}}%
+ \let\@@next\@@apply@create@env@cdr}
+\def\@@apply@create@env@pre@ii#1#2#3#4#5{%
+ \@@apply@modify@env#1#4{#5}#2\@
+ \@@next@args#2\@
+ \let\@@next\@@apply@create@env}
+
\def\@@apply@create@env@cdr#1:#2{\@@@apply@create@env@cdr}
\def\@@@apply@create@env@cdr#1#2{%
@@ -395,7 +444,6 @@
\fi}
\def\@@next@args#1#2\@{\def\@@next@args@{#2}}
-
\def\@@apply@macro#1#2\@#3#4{\@@apply@macro@next#1#2\@{#3}#4}
\def\@@apply@macro@next#1#2#3#4#5\@#6#7{%
\def\@temp@env{}%
@@ -406,6 +454,25 @@
\aftergroup\@@tco}
\let\@apply@macro\@@apply@macro
+\def\@apply@macroexpand#1#2#3\@#4#5{% cont, args, \@ env, reg
+ \let\@@apply@macro@next\@@apply@macro@next@expand@only
+ \@eval#2{#3}{#4}#5%
+ \expandafter\@eval#5{#4}#5}
+\def\@@apply@macro@next@expand@only#1#2#3#4#5\@#6#7{%
+ \def\@temp@env{}%
+ \@@apply@create@env\@temp@env#1#5\relax\relax
+ \expandafter\gdef\expandafter\@@tco\expandafter{%
+ \expandafter\@@eval@envcs\expandafter{\@temp@env#2}#3{#4}#7%
+ \expandafter\@eval@if@macro#7{#6}#7}%
+ \aftergroup\@@tco}
+\def\@eval@if@macro#1#2#3#4{%
+ \ifx#1\@tlabel@cons\@eval@if@macro@#2{#3}#4\fi}
+\def\@eval@if@macro@#1#2#3#4{%
+ \expandafter\@eval#1{#3}\@temp@i
+ \expandafter\@eval@if@macro@@\@temp@i#1#2{#3}#4}
+\def\@eval@if@macro@@#1#2#3#4#5#6{%
+ \ifx#1\@tlabel@macro\@eval\@tlabel@cons{#3#4}{#5}#6\else\gdef#6{\@tlabel@cons{#3#4}}\fi}
+
\def\@apply@begin#1#2\@#3#4{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lisp-on-tex/lisp-prim.sty new/tex/latex/lisp-on-tex/lisp-prim.sty
--- old/tex/latex/lisp-on-tex/lisp-prim.sty 2013-03-05 01:33:46.000000000 +0100
+++ new/tex/latex/lisp-on-tex/lisp-prim.sty 2014-01-04 01:18:26.000000000 +0100
@@ -9,7 +9,7 @@
\addassoc\@globalenv\setB{\@tlabel@setb{}}
\addassoc\@globalenv\@let{\@tlabel@@let{}}
\addassoc\@globalenv\@mlet{\@tlabel@@mlet{}}
-
+\addassoc\@globalenv\macroexpand{\@tlabel@macroexpand{}}
\addassoc\@globalenv\car{\@tlabel@func{\@get@car}}
@@ -97,15 +97,14 @@
\addassoc\@globalenv\stdprint{\@tlabel@func{\@tex@stdprint}}
\def\@tex@stdprint#1#2#3{%
- \gdef#1{\@tlabel@nil{}}\@@tex@stdprint#2{#3}}
-\def\@@tex@stdprint#1#2{%
- \ifx#1\@tlabel@string
- \message{#2}%
- \else\ifx#1\@tlabel@int
- \message{#2}%
- \else
- \message{INNER TOKEN}%
- \fi\fi}
+ \gdef#1{\@tlabel@nil{}}%
+ \let\@save@write@buffer\@temp@write@buffer
+ \def\@temp@write@buffer{}%
+ \@tex@print@#2{#3}%
+ \toks0\expandafter{\@temp@write@buffer}%
+ \immediate\write16{\the\toks0}%
+ \let\@temp@write@buffer\@save@write@buffer}
+
% Type predicates
\def\@type@pred@add#1{\expandafter\@@type@pred@add\expandafter#1}
@@ -134,6 +133,13 @@
{\expandafter\@@select@@apply#2{#3}#1\@{#4}#5}}
% values
-\addassoc\@globalenv\values{\@tlabel@func{\@lisp@multivalues}}
-\def\@lisp@multivalues#1#2\relax{\gdef#1{#2}}
+%\addassoc\@globalenv\values{\@tlabel@func{\@lisp@multivalues}}
+%\def\@lisp@multivalues#1#2\relax{\gdef#1{#2}}
+% read
+\addassoc\@globalenv\read{\@tlabel@func{\@lisp@read@stdin}}
+\def\@lisp@read@stdin#1{%
+ \read-1 to#1%
+ \def\@lisp@read@stdin@callback##1##2{%
+ \gdef#1{##1{##2}}}%
+ \expandafter\@lispread\expandafter\@lisp@read@stdin@callback#1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lisp-on-tex/lisp-read.sty new/tex/latex/lisp-on-tex/lisp-read.sty
--- old/tex/latex/lisp-on-tex/lisp-read.sty 2013-03-05 01:33:46.000000000 +0100
+++ new/tex/latex/lisp-on-tex/lisp-read.sty 2014-01-04 01:18:26.000000000 +0100
@@ -1,83 +1,128 @@
-\def\lispread#1#2{\gdef\@read@buffer{#2\@@eof\@@eof}\@lispread#1}
-\def\@lispread#1{%
-\begingroup
- \readchar
- \if(\expandafter\noexpand\@currentread
- \readchar
- \if\expandafter\noexpand\@currentread)%
- \gdef#1{\@tlabel@nil{}}%
- \else
- \unreadchar
- \@lispread\@temp@i
- \readchar
- \if.\expandafter\noexpand\@currentread
- \let\@save@temp\@temp@i
- \@lispread\@temp@ii
- \let\@temp@i\@save@temp
- \readchar
- \if)\expandafter\noexpand\@currentread
- \expandafter\expandafter\expandafter\@make@cons
- \expandafter\expandafter\expandafter#1%
- \expandafter\@temp@i\@temp@ii
- \else
- \errmessage{LISP on TeX [Parse] :CANNOT FIND )}%
- \fi
- \else\if)\expandafter\noexpand\@currentread
- \expandafter\@make@cons\expandafter#1\@temp@i\@tlabel@nil{}%
- \else
- \unreadchar
- \expandafter\gdef
- \expandafter\@read@buffer
- \expandafter{%
- \expandafter(\@read@buffer}%
- \let\@save@temp\@temp@i
- \@lispread\@temp@ii
- \let\@temp@i\@save@temp
- \expandafter\expandafter\expandafter\@make@cons
- \expandafter\expandafter\expandafter#1%
- \expandafter\@temp@i\@temp@ii
- \fi\fi
- \fi
- \else\ifcat\relax\expandafter\noexpand\@currentread
- \expandafter\gdef\expandafter#1\expandafter{%
- \expandafter\@tlabel@symbol\expandafter{\@currentread}}%
- \else\if'\expandafter\noexpand\@currentread
- \expandafter\@read@string\expandafter#1\expandafter\@lisp@empty\@read@buffer\@@end
- \else\if/\expandafter\noexpand\@currentread
- \readchar
- \xdef#1{\noexpand\@tlabel@bool{\@currentread}}%
- \else\if:\expandafter\noexpand\@currentread
- \expandafter\@read@num\expandafter#1\@read@buffer
- \else\if!\expandafter\noexpand\@currentread
- \expandafter\@read@dimen\expandafter#1\@read@buffer
- \else\if @\expandafter\noexpand\@currentread
- \expandafter\@read@skip\expandafter#1\@read@buffer
- \else\if +\expandafter\noexpand\@currentread % parser module
- \readchar
- \expandafter\@read@module\expandafter#1\@currentread\@@end
- \fi\fi\fi\fi\fi\fi\fi\fi
-\endgroup}
-
-\newcount\@temp@read@cnt
-\def\@read@num#1#2\@@eof\@@eof{%
- \afterassignment\@@read@num\@temp@read@cnt#2\@@end
- \expandafter\gdef
- \expandafter#1%
- \expandafter{\expandafter\@tlabel@int\expandafter{\the\@temp@read@cnt}}}
-\def\@@read@num#1\@@end{\gdef\@read@buffer{#1\@@eof\@@eof}}
+%%
+%% This is file `lisp-read.sty'.
+%%
+%% License: Modified BSD - see LICENSE file
+%%
-\def\@read@dimen#1#2\@@eof\@@eof{\afterassignment\@@read@dimen\dimen@#2\@@end
-\expandafter\gdef\expandafter#1\expandafter{\expandafter\@tlabel@dimen\expandafter{\the\dimen@}}}
-\let\@@read@dimen\@@read@num
+%% End Of Input(EOI)
+\def\@end@lispread{\@@end@lispread}
-\def\@read@skip#1#2\@@eof\@@eof{\afterassignment\@@read@skip\skip@#2\@@end
-\expandafter\gdef\expandafter#1\expandafter{\expandafter\@tlabel@skip\expandafter{\the\skip@}}}
-\let\@@read@skip\@@read@num
+%% Reader Macro
+%% @param #1 callback function (which gets a S-exp and do something)
+%% @param #2 the first letter of the input or EOI
+%% @return #1\@tlabel@xxx{contents}
+\def\@lispread#1#2{\begingroup\@lispread@main#1#2}
-\def\@read@string#1#2'#3\@@end{%
- \expandafter\gdef\expandafter#1%
- \expandafter{\expandafter\@tlabel@string\expandafter{#2}}% expand \@lisp@empty
- \gdef\@read@buffer{#3}}% I don't consider that #3 is single grouped tokens. In LISP on TeX, it never happen.
-
-\def\@read@module#1#2::#3\@@end{% #1 : register, #2 : module name (MUST unique), #3 : parse target
- \csname @mod@read@#2\endcsname#1{#3}}
+%% The first branch
+%% @param #1 callback function
+%% @param #2 the first letter of the input or EOI
+\def\@lispread@main#1#2{% Define \@@next, the continuation.
+ \if\noexpand#2(% [Branch 1] CONS cell or NIL
+ \def\@@next{\@lispread@cell#1}%
+ \else\ifcat\noexpand#2\relax% [Branch 2] A control sequence or a control symbol
+ \ifx#2\@end@lispread % [Branch 2-1] EOI
+ \def\@@next{\endgroup#1\@tlabel@exception{!Found End of Input!}}%
+ \else
+ \def\@@next{\@lispread@symbol#1#2}% [Branch 2-2] Symbol
+ \fi
+ \else\if\noexpand#2'% [Branch 3] String
+ \def\@@next{\@lispread@string#1}%
+ \else\if\noexpand#2/% [Branch 4] Boolean
+ \def\@@next{\@lispread@bool#1}%
+ \else\if\noexpand#2:% [Branch 5] Integer
+ \def\@@next{\@lispread@int#1}%
+ \else\if\noexpand#2!% [Branch 6] Dimension
+ \def\@@next{\@lispread@dimen#1}%
+ \else\if\noexpand#2@% [Branch 7] Skip
+ \def\@@next{\@lispread@skip#1}%
+ \else\if\noexpand#2+% [Branch 8] call a Reader Module
+ \def\@@next{\@lispread@module#1}%
+ \else % Otherwise -- parse error
+ \errmessage{LISP on teX [read]: no such type start with \noexpand#2}%
+ \fi\fi\fi\fi\fi\fi\fi\fi
+ \@@next}
+%% Symbol
+\def\@lispread@symbol#1#2{%
+ \endgroup#1\@tlabel@symbol{#2}}
+%% String
+\def\@lispread@string#1#2'{%
+ \endgroup#1\@tlabel@string{#2}}
+%% Boolean
+\def\@lispread@bool#1#2{%
+ \endgroup#1\@tlabel@bool{#2}}
+%% Reader Module
+\def\@lispread@module#1#2{%
+ \@lispread@module@main\@register@lispread@module#2\@@end
+ \endgroup
+ \expandafter#1\@register@lispread@module}
+\def\@lispread@module@main#1#2::#3\@@end{\csname @mod@read@#2\endcsname#1{#3}}
+%% Integer
+\newcount\@cnt@lispread@int
+\def\@lispread@int#1{%
+ \gdef\@lispread@int@callback{\@lispread@int@main#1}%
+ \afterassignment\@lispread@int@callback
+ \global\@cnt@lispread@int}
+\def\@lispread@int@main#1{%
+ \endgroup\expandafter#1\expandafter\@tlabel@int\expandafter{\the\@cnt@lispread@int}}
+%% Skip
+\newskip\@cnt@lispread@skip
+\def\@lispread@skip#1{%
+ \gdef\@lispread@skip@callback{\@lispread@skip@main#1}%
+ \afterassignment\@lispread@skip@callback
+ \global\@cnt@lispread@skip}
+\def\@lispread@skip@main#1{%
+ \endgroup\expandafter#1\expandafter\@tlabel@skip\expandafter{\the\@cnt@lispread@skip}}
+%% Dimen
+\newdimen\@cnt@lispread@dimen
+\def\@lispread@dimen#1{%
+ \gdef\@lispread@dimen@callback{\@lispread@dimen@main#1}%
+ \afterassignment\@lispread@dimen@callback
+ \global\@cnt@lispread@dimen}
+\def\@lispread@dimen@main#1{%
+ \endgroup\expandafter#1\expandafter\@tlabel@dimen\expandafter{\the\@cnt@lispread@dimen}}
+%% CONS cell or NIL
+\def\@lispread@cell#1#2{%
+ \if\noexpand#2)% [Branch 1] NIL
+ \def\@@next{\endgroup#1\@tlabel@nil{}}%
+ \else % Otherwise CONS cell
+ \def\@@next{\@lispread@cell@car#1#2}%
+ \fi\@@next}
+%% first part of CONS cell : read CAR
+\def\@lispread@cell@car#1{%
+ \def\@lispread@car@reg##1##2{%
+ \def\@reg@lispread@car{##1{##2}}%
+ \@lispread@cell@dot#1}%
+ \@lispread\@lispread@car@reg}
+\def\@lispread@cell@dot#1#2{%
+ \if\noexpand#2.%
+ \def\@@next{%
+ \def\@lispread@cell@fincheck####1####2{%
+ \def\@reg@lispread@cdr{####1{####2}}%
+ \@lispread@fin#1}%
+ \@lispread\@lispread@cell@fincheck}% kokonaosu
+ \else
+ \def\@@next{\@lispread@cell@cdr#1(#2}%
+ \fi\@@next}
+\def\@lispread@cell@cdr#1{%
+ \def\@lispread@cdr@reg##1##2{%
+ \expandafter\@read@malloc\expandafter\@reg@tmp\@reg@lispread@car##1{##2}%
+ \expandafter\endgroup\expandafter#1\@reg@tmp}%
+ \@lispread\@lispread@cdr@reg}
+\def\@lispread@fin#1#2{%
+ \if\noexpand#2)%
+ \def\@@next{%
+ \expandafter\expandafter\expandafter\@read@malloc
+ \expandafter\expandafter\expandafter\@reg@tmp
+ \expandafter\@reg@lispread@car\@reg@lispread@cdr
+ \expandafter\endgroup\expandafter#1\@reg@tmp}%
+ \else
+ \def\@@next{\errmessage{LISP on teX [read]: missing )}}%
+ \fi\@@next}
+\def\@read@malloc#1#2#3#4#5{%
+ \expandafter\gdef\csname car\the\@malloc\endcsname{#2{#3}}%
+ \expandafter\gdef\csname cdr\the\@malloc\endcsname{#4{#5}}%
+ \expandafter\@@read@malloc\expandafter#1\csname car\the\@malloc\endcsname\csname cdr\the\@malloc\endcsname}
+\def\@@read@malloc#1#2{\expandafter\@@@read@malloc\expandafter#1\expandafter#2}
+\def\@@@read@malloc#1#2#3{%
+ \global\advance\@malloc1
+ \def#1{\@tlabel@cons{#2#3}}}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lisp-on-tex/lisp-string.sty new/tex/latex/lisp-on-tex/lisp-string.sty
--- old/tex/latex/lisp-on-tex/lisp-string.sty 2013-03-05 01:33:46.000000000 +0100
+++ new/tex/latex/lisp-on-tex/lisp-string.sty 2014-01-04 01:18:26.000000000 +0100
@@ -25,7 +25,7 @@
%% IMMEDIATEWRITE : () -> ()
%% It outputs the output buffer immediately.
-%% It cause error if the buffer is imcomlete.
+%% It cause error if the buffer is incomplete.
\addassoc\@globalenv\immediatewrite{\@tlabel@func{\@immediate@write}}
\def\@immediate@write#1{%
\gdef#1{\@tlabel@nil{}}%
@@ -60,5 +60,20 @@
The argument of ungroup must be a grouped string.}%
\fi}
+%% FGETS : () -> string
+%% (\fgets) -> read tokens from standard-in
+\addassoc\@globalenv\fgets{\@tlabel@func{\@text@fgets}}
+\def\@text@fgets#1{%
+\endlinechar=-1
+\read-1to#1%
+\expandafter\gdef\expandafter#1\expandafter{\expandafter\@tlabel@string\expandafter{#1}}}
+
+%% EXPAND : string -> string
+%% (\expand '<token>') -> '' where is expanded tokens of <token>
+\addassoc\@globalenv\expand{\@tlabel@func{\@lot@text@expand}}
+\def\@lot@text@expand#1\@tlabel@string#2{%
+ \edef\@temp@i{#2}%
+ \xdef#1{\noexpand\@tlabel@string{\@temp@i}}}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lisp-on-tex/lisp-util.sty new/tex/latex/lisp-on-tex/lisp-util.sty
--- old/tex/latex/lisp-on-tex/lisp-util.sty 2013-03-05 01:33:46.000000000 +0100
+++ new/tex/latex/lisp-on-tex/lisp-util.sty 2014-01-04 01:18:26.000000000 +0100
@@ -48,7 +48,22 @@
(\lambda (\binds \body)
(\lispif (\= \binds ())
\body
- (\list \let (\cdr \binds) (\list \@mlet (\car (\car \binds)) (\car (\cdr (\car \binds))) \body)))))
+ (\list \letM (\cdr \binds) (\list \@mlet (\car (\car \binds)) (\car (\cdr (\car \binds))) \body)))))
+% letrec
+(\defmacro \letrec (\lambda (\binds \body) (\list \@letrec \binds \binds \body)))
+(\defmacro \@letrec
+ (\lambda (\binds \save \body)
+ (\lispif (\= \binds ())
+ (\list \@@letrec \save \body)
+ (\list \@letrec (\cdr \binds) \save
+ (\list \begin
+ (\list \setB (\car (\car \binds)) (\car (\cdr (\car \binds))))
+ \body)))))
+(\defmacro \@@letrec
+ (\lambda (\binds \body)
+ (\lispif (\= \binds ())
+ \body
+ (\list \@@letrec (\cdr \binds) (\list \@mlet (\car (\car \binds)) () \body)))))
% nth
(\define \nth (\lambda (\lst \n)
(\lispif (\= \n :0) (\car \lst) (\nth (\cdr \lst) (\- \n :1)))))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lisp-on-tex.tlpobj new/tlpkg/tlpobj/lisp-on-tex.tlpobj
--- old/tlpkg/tlpobj/lisp-on-tex.tlpobj 2013-03-05 04:40:50.000000000 +0100
+++ new/tlpkg/tlpobj/lisp-on-tex.tlpobj 2014-01-05 03:24:08.000000000 +0100
@@ -1,12 +1,12 @@
name lisp-on-tex
category Package
-revision 29291
+revision 32561
shortdesc Execute LISP code in a LaTeX document.
relocated 1
longdesc The package provides a LISP interpreter written using TeX
longdesc macros; it is provided as a LaTeX package. The interpreter
longdesc static scoping, dynamic typing, and eager evaluation.
-runfiles size=12
+runfiles size=14
RELOC/tex/latex/lisp-on-tex/lisp-arith.sty
RELOC/tex/latex/lisp-on-tex/lisp-latexutil.sty
RELOC/tex/latex/lisp-on-tex/lisp-mod-fpnum.sty
@@ -16,6 +16,6 @@
RELOC/tex/latex/lisp-on-tex/lisp-string.sty
RELOC/tex/latex/lisp-on-tex/lisp-util.sty
catalogue-ctan /macros/latex/contrib/lisp-on-tex
-catalogue-date 2013-03-04 11:46:28 +0100
+catalogue-date 2014-01-03 19:54:22 +0100
catalogue-license bsd
-catalogue-version 1.0
+catalogue-version 1.2
++++++ listings.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/Makefile new/doc/latex/listings/Makefile
--- old/doc/latex/listings/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/listings/Makefile 2014-03-06 00:15:14.000000000 +0100
@@ -0,0 +1,172 @@
+### Makefile ---
+#
+# This file generates files required to use the listings package.
+#
+# $Id: Makefile 127 2014-03-04 19:54:08Z j_hoffmann $
+#
+# (c) 2007 Brooks Moses
+# (c) 2013 Jobst Hoffmann
+#
+# This file is distributed under the terms of the LaTeX Project Public
+# License from CTAN archives in directory macros/latex/base/lppl.txt.
+# Either version 1.3 or, at your option, any later version.
+
+# remember:
+# $<: first element of list of dependees
+# $^: list of (all) dependees
+# $@: target
+
+# formatting tools
+LATEX = pdflatex
+MAKEINDEX = makeindex
+TEX = tex
+# tarring options
+ifneq "$(wildcard listings.version)" ""
+include listings.version # version and date of the package
+endif
+TAR_SRC = $(PACKAGE)-$(VERSION)_source.tar.gz
+EXsvn = --exclude .svn --exclude auto --exclude contrib --exclude requests \
+ --exclude support --exclude testing \
+ --exclude *.gz --exclude *.txt
+
+DISTRIBUTION_FILES = $(PACKAGE).pdf $(PACKAGE).dtx \
+ $(PACKAGE).ins README Makefile \
+ lstdrvrs.dtx lstdrvrs.ins lstdrvrs.pdf
+
+
+.SUFFIXES: # Delete the default suffixes
+.SUFFIXES: .dtx .ins .pdf .sty # Define our own suffix list
+
+.PHONY: listings pdf pdf-devel tests all
+
+listings: listings.sty
+
+pdf: listings.pdf lstdrvrs.pdf
+
+pdf-devel: listings-devel.pdf
+
+all: listings pdf pdf-devel
+
+
+listings.sty: listings.ins listings.dtx lstdrvrs.dtx
+ $(TEX) $<
+
+listings.pdf: listings.sty
+ rm -f ltxdoc.cfg
+ $(LATEX) ${<:.sty=.dtx}
+ $(MAKEINDEX) -s gind.ist ${@:.pdf=}
+ $(LATEX) ${<:.sty=.dtx}
+ $(LATEX) ${<:.sty=.dtx}
+
+listings-devel.pdf: listings.sty
+ rm -rf ltxdoc.cfg
+ echo "\AtBeginDocument{\AlsoImplementation}" > ltxdoc.cfg
+ $(LATEX) -jobname=${@:.pdf=} ${<:.sty=.dtx}
+ $(MAKEINDEX) -s gind.ist ${@:.pdf=}
+ $(LATEX) -jobname=${@:.pdf=} ${<:.sty=.dtx}
+ $(LATEX) -jobname=${@:.pdf=} ${<:.sty=.dtx}
+ rm -rf ltxdoc.cfg
+
+lstdrvrs.pdf: lstdrvrs.dtx
+ rm -f ltxdoc.cfg
+ $(LATEX) ${<:.sty=.dtx}
+ $(MAKEINDEX) -s gind.ist lstdrvrs
+ $(LATEX) ${<:.sty=.dtx}
+ $(LATEX) ${<:.sty=.dtx}
+
+## Testing targets
+acm-tests:
+ cd testing; make acm
+
+fortran-tests:
+ cd testing; make fortran
+
+gap-tests:
+ cd testing; make gap
+
+hansl-tests:
+ cd testing; make hansl
+
+llvm-tests:
+ cd testing; make llvm
+
+lua-tests:
+ cd testing; make lua
+
+vbscript-tests:
+ cd testing; make vbscript
+
+tests:
+ cd testing; make all
+
+## Clean targets
+clean:
+ -rm -f *~ *.aux *.lof *.log *.lot *.tmp *.toc
+ -rm -f *.idx *.ind *.glg *.glo *.gls *.ilg *.out
+ -rm -f *.bbl *.blg *.brf
+
+clean-results:
+ -rm -f *.cfg *.pdf *.prf *.sty
+
+realclean: clean clean-results
+
+### create packed files
+tar-src:
+ @$(MAKE) realclean; \
+ sed -i -e "s+fileversion{[a-z0-9\.\-]*}+fileversion{$(VERSION)}+g" \
+ -e "s+filedate{[0-9/]*}+filedate{$(DATE)}+g" \
+ -e "s+date{[0-9/]*\\\\enspace+date{$(DATE)\\\\enspace+g" \
+ -e "s+Version [a-z0-9\.\-]*\\\\+Version $(VERSION)\\\\+g" \
+ listings.dtx; \
+ sed -i -e "s+date{[0-9/]*\\\\enspace+date{$(DATE)\\\\enspace+g" \
+ -e "s+Version [a-z0-9\.\-]*\\\\+Version $(VERSION)\\\\+g" \
+ -e "s+\[[0-9/]* [a-z0-9\.\-]* listings+[$(DATE) $(VERSION) listings+g" \
+ lstdrvrs.dtx; \
+ cd ..; tar $(EXsvn) -czvf $(PACKAGE)/$(TAR_SRC) $(PACKAGE)
+
+tar-dist: $(DISTRIBUTION_FILES)
+ @$(MAKE) realclean; \
+ sed -i -e "s+fileversion{[a-z0-9\.\-]*}+fileversion{$(VERSION)}+g" \
+ -e "s+filedate{[0-9/]*}+filedate{$(DATE)}+g" \
+ -e "s+date{[0-9/]*\\\\enspace+date{$(DATE)\\\\enspace+g" \
+ -e "s+Version [a-z0-9\.\-]*\\\\+Version $(VERSION)\\\\+g" \
+ listings.dtx; \
+ sed -i -e "s+date{[0-9/]*\\\\enspace+date{$(DATE)\\\\enspace+g" \
+ -e "s+Version [a-z0-9\.\-]*\\\\+Version $(VERSION)\\\\+g" \
+ -e "s+\[[0-9/]* [a-z0-9\.\-]* listings+[$(DATE) $(VERSION) listings+g" \
+ lstdrvrs.dtx; \
+ $(MAKE) listings.pdf; \
+ $(MAKE) lstdrvrs.pdf; \
+ tar cfvz $(PACKAGE)-$(VERSION).tgz $^;
+
+## Documentation target
+help::
+ $(info Usage:)
+ $(info )
+ $(info make [all] generates listings.sty and [all] the .pdf versions)
+ $(info $(empty) (user/developer) of the documentation)
+ $(info )
+ $(info make <file name>)
+ $(info $(empty) creates the corresponding file denoted by <file name>)
+ $(info )
+ $(info make help shows this help)
+ $(info )
+ $(info make tests performs a little test suite)
+ $(info )
+ $(info make clean removes all intermediate files created by a LaTeX run)
+ $(info )
+ $(info make clean-results)
+ $(info $(empty) removes .cfg, .sty, and .pdf files)
+ $(info )
+ $(info make realclean)
+ $(info $(empty) performs clean and clean-results)
+ $(info )
+ $(info make tar-src)
+ $(info $(empty) generates a tarred version of the current directory)
+ $(info )
+ $(info make tar-dist)
+ $(info $(empty) generates a distributable version of the listings)
+ $(info $(empty) package)
+ @echo "" # prevents message "nothing to do ..."
+
+### Makefile ends here ---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/README new/doc/latex/listings/README
--- old/doc/latex/listings/README 2007-02-28 23:32:28.000000000 +0100
+++ new/doc/latex/listings/README 2013-07-12 01:22:08.000000000 +0200
@@ -1,7 +1,12 @@
Listings package
+
Copyright 1996--2004 Carsten Heinz (the package)
Copyright 1996--2007 individual authors (language drivers)
Copyright 2006--2007 Brooks Moses (continued maintenance)
+Copyright 2013-- Jobst Hoffmann (continued maintenance)
+
+$Id: README 38 2013-06-16 19:03:21Z j_hoffmann $
+
Released under the LaTeX Project Public License 1.3 or later
The `listings' package is a source code printer for LaTeX.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/listings-acm.prf new/doc/latex/listings/listings-acm.prf
--- old/doc/latex/listings/listings-acm.prf 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/listings/listings-acm.prf 2014-03-06 00:15:14.000000000 +0100
@@ -0,0 +1,53 @@
+%%
+%% This is file `listings-acm.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `acm-prf')
+%%
+%% The listings package is copyright 1996--2004 Carsten Heinz, and
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
+%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
+%% 2007/2013 any individual author listed in this file.
+%%
+%% This file is distributed under the terms of the LaTeX Project Public
+%% License from CTAN archives in directory macros/latex/base/lppl.txt.
+%% Either version 1.3 or, at your option, any later version.
+%%
+%% This file is completely free and comes without any warranty.
+%%
+%% Send comments and ideas on the package, error reports and additional
+%% programming languages to Jobst Hoffmann at .
+%%
+\ProvidesFile{listings-acm.prf}
+ [2014/03/04 1.5c listings language file]
+\usepackage[rgb, x11names]{xcolor}
+
+\definecolor{Comments}{rgb}{0.00,0.50,0.00}
+\definecolor{KeyWords}{rgb}{0.00,0.00,0.63}
+\definecolor{Strings}{rgb}{0.84,0.00,0.00}
+
+\lstdefinestyle{ACM}{%
+ basicstyle=\scriptsize\ttfamily,%
+ keywordstyle=\color{KeyWords},%
+ showstringspaces=false,%
+ identifierstyle=\color{black},%
+ commentstyle=\color{Comments},%
+ stringstyle=\color{Strings},%
+ frame=shadowbox,% % for ACM-Code scrartcl commented out
+ rulesepcolor=\color{black},%
+ numbers=left,% % left
+ firstnumber=1,%
+ stepnumber=5,%
+ columns=fixed,% % to prevent inserting spaces
+ fontadjust=true,%
+ basewidth=0.5em,%
+ captionpos=t,%
+ abovecaptionskip=\smallskipamount,% same amount as default
+ belowcaptionskip=\smallskipamount,% in caption package
+}%
+\endinput
+%%
+%% End of file `listings-acm.prf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/listings-fortran.prf new/doc/latex/listings/listings-fortran.prf
--- old/doc/latex/listings/listings-fortran.prf 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/listings/listings-fortran.prf 2014-03-06 00:15:14.000000000 +0100
@@ -0,0 +1,66 @@
+%%
+%% This is file `listings-fortran.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `fortran-prf')
+%%
+%% The listings package is copyright 1996--2004 Carsten Heinz, and
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
+%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
+%% 2007/2013 any individual author listed in this file.
+%%
+%% This file is distributed under the terms of the LaTeX Project Public
+%% License from CTAN archives in directory macros/latex/base/lppl.txt.
+%% Either version 1.3 or, at your option, any later version.
+%%
+%% This file is completely free and comes without any warranty.
+%%
+%% Send comments and ideas on the package, error reports and additional
+%% programming languages to Jobst Hoffmann at .
+%%
+\ProvidesFile{listings-fortran.prf}
+ [2014/03/04 1.5c listings language file]
+\usepackage[rgb, x11names]{xcolor}
+
+\lstset{%
+ frame=tlb,% the frame is open on the right side
+ resetmargins=false,%
+ rulesepcolor=\color{black},%
+ numbers=left,% % left
+ numberstyle=\tiny,%
+ numbersep=5pt,%
+ firstnumber=1,%
+ stepnumber=5,%
+ columns=fixed,% % to prevent inserting spaces
+ fontadjust=true,%
+ keepspaces=true,%
+ basewidth=0.5em,%
+ captionpos=t,%
+ abovecaptionskip=\smallskipamount,% same amount as default
+ belowcaptionskip=\smallskipamount,% in caption package
+}
+\lstdefinestyle{fortran}{%
+ backgroundcolor=\color{yellow!10},%
+ basicstyle=\small\ttfamily,%
+ identifierstyle=\color{black},%
+ keywordstyle=\color{blue},%
+ keywordstyle={[2]\color{cyan}},%
+ keywordstyle={[3]\color{olive}},%
+ stringstyle=\color{teal},%
+ commentstyle=\itshape\color{orange},%
+}%
+\lstdefinestyle{fortranbw}{%
+ backgroundcolor={},%
+ basicstyle=\small\ttfamily,%
+ identifierstyle={},%
+ keywordstyle=\bfseries,%
+ stringstyle=\itshape,%
+ commentstyle=\slshape,%
+ rulesepcolor=\color{black},%
+}%
+\endinput
+%%
+%% End of file `listings-fortran.prf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/listings-lua.prf new/doc/latex/listings/listings-lua.prf
--- old/doc/latex/listings/listings-lua.prf 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/listings/listings-lua.prf 2014-03-06 00:15:14.000000000 +0100
@@ -0,0 +1,39 @@
+%%
+%% This is file `listings-lua.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `lua-prf')
+%%
+%% The listings package is copyright 1996--2004 Carsten Heinz, and
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
+%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
+%% 2007/2013 any individual author listed in this file.
+%%
+%% This file is distributed under the terms of the LaTeX Project Public
+%% License from CTAN archives in directory macros/latex/base/lppl.txt.
+%% Either version 1.3 or, at your option, any later version.
+%%
+%% This file is completely free and comes without any warranty.
+%%
+%% Send comments and ideas on the package, error reports and additional
+%% programming languages to Jobst Hoffmann at .
+%%
+\ProvidesFile{listings-lua.prf}
+ [2014/03/04 1.5c listings language file]
+\usepackage[rgb, x11names]{xcolor}
+\lstdefinestyle{Lua}{%
+ language=[5.2]Lua,
+ basicstyle=\ttfamily,
+ columns=spaceflexible,
+ keywordstyle=\bfseries\color{Blue4},% language keywords
+ keywordstyle=[2]\bfseries\color{RoyalBlue3},% std. library identifiers
+ keywordstyle=[3]\bfseries\color{Purple3},% labels
+ stringstyle=\bfseries\color{Coral4},% strings
+ commentstyle=\itshape\color{Green4},% comments
+}
+\endinput
+%%
+%% End of file `listings-lua.prf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/listings/listings-python.prf new/doc/latex/listings/listings-python.prf
--- old/doc/latex/listings/listings-python.prf 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/listings/listings-python.prf 2014-03-06 00:15:14.000000000 +0100
@@ -0,0 +1,49 @@
+%%
+%% This is file `listings-python.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `python-prf')
+%%
+%% The listings package is copyright 1996--2004 Carsten Heinz, and
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
+%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
+%% 2007/2013 any individual author listed in this file.
+%%
+%% This file is distributed under the terms of the LaTeX Project Public
+%% License from CTAN archives in directory macros/latex/base/lppl.txt.
+%% Either version 1.3 or, at your option, any later version.
+%%
+%% This file is completely free and comes without any warranty.
+%%
+%% Send comments and ideas on the package, error reports and additional
+%% programming languages to Jobst Hoffmann at .
+%%
+\ProvidesFile{listings-python.prf}
+ [2014/03/04 1.5c listings language file]
+\usepackage{xcolor}
+\usepackage{textcomp}
+
+%% Actual colors from idlelib/config-highlight.def --> corrected to ``web-safe''
+%% strings = #00aa00 / 0,170,0 (a darker green)
+%% builtins = #900090 / 144,0,144 (purple-ish)
+%% keywords = #FF7700 / 255,119,0 (quite close to plain `orange')
+%% Corrected to ``web-safe''
+\definecolor{purple2}{RGB}{153,0,153} % there's actually no standard purple
+\definecolor{green2}{RGB}{0,153,0} % a darker green
+
+\lstdefinestyle{python-idle-code}{%
+ language=Python, % the language
+ basicstyle=\normalsize\ttfamily, % size of the fonts for the code
+ % Color settings to match IDLE style
+ keywordstyle=\color{orange}, % core keywords
+ keywordstyle={[2]\color{purple2}}, % built-ins
+ stringstyle=\color{green2},
+ commentstyle=\color{red},
+ upquote=true, % requires textcomp
+}
+\endinput
+%%
+%% End of file `listings-python.prf'.
Files old/doc/latex/listings/listings.pdf and new/doc/latex/listings/listings.pdf differ
Files old/doc/latex/listings/lstdrvrs.pdf and new/doc/latex/listings/lstdrvrs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listings.doc.tlpobj new/tlpkg/tlpobj/listings.doc.tlpobj
--- old/tlpkg/tlpobj/listings.doc.tlpobj 2010-06-10 18:34:17.000000000 +0200
+++ new/tlpkg/tlpobj/listings.doc.tlpobj 2014-03-06 03:23:24.000000000 +0100
@@ -1,8 +1,14 @@
name listings.doc
category Package
-revision 15878
+revision 33095
shortdesc doc files of listings
relocated 1
-docfiles size=176
+docfiles size=303
+ RELOC/doc/latex/listings/Makefile
RELOC/doc/latex/listings/README
+ RELOC/doc/latex/listings/listings-acm.prf
+ RELOC/doc/latex/listings/listings-fortran.prf
+ RELOC/doc/latex/listings/listings-lua.prf
+ RELOC/doc/latex/listings/listings-python.prf
RELOC/doc/latex/listings/listings.pdf
+ RELOC/doc/latex/listings/lstdrvrs.pdf
++++++ listings.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings.cfg new/tex/latex/listings/listings.cfg
--- old/tex/latex/listings/listings.cfg 2008-06-10 22:46:51.000000000 +0200
+++ new/tex/latex/listings/listings.cfg 2014-03-06 00:15:14.000000000 +0100
@@ -7,9 +7,10 @@
%% lstdrvrs.dtx (with options: `config')
%%
%% The listings package is copyright 1996--2004 Carsten Heinz, and
-%% continued maintenance on the package is copyright 2006--2007 Brooks Moses.
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
-%% 2007 any individual author listed in this file.
+%% 2007/2013 any individual author listed in this file.
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -18,9 +19,9 @@
%% This file is completely free and comes without any warranty.
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to Brooks Moses at .
+%% programming languages to Jobst Hoffmann at .
%%
-\ProvidesFile{listings.cfg}[2007/02/22 1.4 listings configuration]
+\ProvidesFile{listings.cfg}[2014/03/04 1.5c listings configuration]
\def\lstlanguagefiles
{lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty}
\lstset{defaultdialect=[R/3 6.10]ABAP,
@@ -30,7 +31,7 @@
defaultdialect=[ANSI]C,
defaultdialect=[light]Caml,
defaultdialect=[1985]Cobol,
-defaultdialect=[WinXP]command.com,
+ defaultdialect=[WinXP]command.com,
defaultdialect=[ISO]C++,
defaultdialect=[95]Fortran,
defaultdialect=[5.2]Mathematica,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/listings.sty new/tex/latex/listings/listings.sty
--- old/tex/latex/listings/listings.sty 2008-06-10 22:46:51.000000000 +0200
+++ new/tex/latex/listings/listings.sty 2014-03-06 00:15:14.000000000 +0100
@@ -11,12 +11,13 @@
%% (w)(c) 1996--2004 Carsten Heinz and/or any other author listed
%% elsewhere in this file.
%% (c) 2006 Brooks Moses
+%% (c) 2013- Jobst Hoffmann
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to .
+%% programming languages to Jobst Hoffmann at .
%%
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2014/03/04}
+\def\fileversion{1.5c}
\NeedsTeXFormat{LaTeX2e}
\AtEndOfPackage{\ProvidesPackage{listings}
[\filedate\space\fileversion\space(Carsten Heinz)]}
@@ -1488,7 +1489,11 @@
\global\advance\c@lstnumber-\lst@advancelstnum
\ifx \lst@firstnumber\c@lstnumber
\global\advance\c@lstnumber-\lst@advancelstnum
- \fi}
+ \fi%
+ \lst@ifincluderangemarker\else%
+ \global\advance\c@lstnumber by 1%
+ \fi%
+ }
\def\lst@DefRangeEnd{%
\ifx\lst@rangeend\@empty\else
\expandafter\lst@CArgX\lst@rangeend\relax\lst@DefRangeE
@@ -1883,7 +1888,9 @@
\def\lst@boxpos{b}%
\lsthk@PreSet\lstset{flexiblecolumns,#1}%
\lsthk@TextStyle
- \@ifnextchar\bgroup{\afterassignment\lst@InlineG \let\@let@token}%
+ \@ifnextchar\bgroup{%
+ \ifnum`{=0}\fi%
+ \afterassignment\lst@InlineG \let\@let@token}%
\lstinline@}
\def\lstinline@#1{%
\lst@Init\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstdoc.sty new/tex/latex/listings/lstdoc.sty
--- old/tex/latex/listings/lstdoc.sty 2008-06-10 22:46:51.000000000 +0200
+++ new/tex/latex/listings/lstdoc.sty 2014-03-06 00:15:14.000000000 +0100
@@ -11,12 +11,13 @@
%% (w)(c) 1996--2004 Carsten Heinz and/or any other author listed
%% elsewhere in this file.
%% (c) 2006 Brooks Moses
+%% (c) 2013- Jobst Hoffmann
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to .
+%% programming languages to Jobst Hoffmann at .
%%
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2014/03/04}
+\def\fileversion{1.5c}
\ProvidesPackage{lstdoc}
[\filedate\space\fileversion\space(Carsten Heinz)]
\let\lstdoc@currversion\fileversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstlang1.sty new/tex/latex/listings/lstlang1.sty
--- old/tex/latex/listings/lstlang1.sty 2007-02-28 23:32:28.000000000 +0100
+++ new/tex/latex/listings/lstlang1.sty 2014-03-06 00:15:14.000000000 +0100
@@ -7,9 +7,10 @@
%% lstdrvrs.dtx (with options: `lang1')
%%
%% The listings package is copyright 1996--2004 Carsten Heinz, and
-%% continued maintenance on the package is copyright 2006--2007 Brooks Moses.
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
-%% 2007 any individual author listed in this file.
+%% 2007/2013 any individual author listed in this file.
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -18,10 +19,10 @@
%% This file is completely free and comes without any warranty.
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to Brooks Moses at .
+%% programming languages to Jobst Hoffmann at .
%%
\ProvidesFile{lstlang1.sty}
- [2004/09/05 1.3 listings language file]
+ [2014/03/04 1.5c listings language file]
%%
%% ACSL definition (c) 2000 by Andreas Matthias
%%
@@ -305,30 +306,72 @@
morecomment=[l]\#,%
morestring=[d]"%
}[keywords,comments,strings]%
+\lst@definelanguage[08]{Fortran}[03]{Fortran}{%
+ morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,%
+ ERROR, LOCK, SUBMODULE, SYNC, UNLOCK},%
+ morekeywords=[3]{ACOSH,ASINH,ATANH,ATOMIC_DEFINE,ATOMIC_REF,BESSEL_J0,%
+ BESSEL_J1,BESSEL_JN,BESSEL_Y0,BESSEL_Y1,BESSEL_YN,BGE,BGT,BLE,BLT,%
+ C_SIZEOF,COMPILER_OPTIONS,COMPILER_VERSION,DSHIFTL,DSHIFTR,ERF,ERFC,%
+ ERFC_SCALED,EXECUTE_COMMAND_LINE,GAMMA,HYPOT,IALL,IANY,IMAGE_INDEX,%
+ IPARITY,LCOBOUND,LEADZ,LOG_GAMMA,MASKL,MASKR,MERGE_BITS,NORM2,%
+ NUM_IMAGES,PARITY,POPCNT,POPPAR,SHIFTA,SHIFTL,SHIFTR,STORAGE_SIZE,%
+ THIS_IMAGE,TRAILZ,UCOBOUND}%
+}%
+\lst@definelanguage[03]{Fortran}[95]{Fortran}{%
+ morekeywords={ABSTRACT, ASSOCIATE, ASYNCHRONOUS, BIND, CLASS, DEFERRED,%
+ ENUM, ENUMERATOR, EXTENDS, FINAL, FLUSH, GENERIC, IMPORT,%
+ NON_OVERRIDABLE, NOPASS, PASS, PROTECTED, VALUE, VOLATILE, WAIT},%
+ morekeywords=[2]{DECIMAL,ENCODING,IOMSG,ROUND},% corrected NML from NMT
+ morekeywords=[3]{C_ASSOCIATED,C_F_POINTER,C_F_PROCPOINTER,C_FUNLOC,%
+ C_LOC,COMMAND_ARGUMENT_COUNT,EXTENDS_TYPE_OF,GET_COMMAND,GET_COMMAND_ARGUMENT,%
+ GET_ENVIRONMENT_VARIABLE,IS_IOSTAT_END,MOVE_ALLOC,NEW_LINE,SAME_TYPE_AS,%
+ SELECTED_CHAR_KIND}%
+}%
\lst@definelanguage[90]{Fortran}[95]{Fortran}{}
\lst@definelanguage[95]{Fortran}[77]{Fortran}%
{deletekeywords=SAVE,%
- morekeywords={ACTION,ADVANCE,ALLOCATE,ALLOCATABLE,ASSIGNMENT,CASE,%
- CONTAINS,CYCLE,DEALLOCATE,DEFAULT,DELIM,EXIT,INCLUDE,IN,NONE,IN,%
- OUT,INTENT,INTERFACE,IOLENGTH,KIND,LEN,MODULE,NAME,NAMELIST,NMT,%
- NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,PAD,POINTER,POSITION,PRIVATE,%
- PUBLIC,READWRITE,RECURSIVE,RESULT,SELECT,SEQUENCE,SIZE,STAT,%
+ morekeywords={ALLOCATABLE,ALLOCATE,ASSIGNMENT,CASE,%
+ CONTAINS,CYCLE,DEALLOCATE,DEFAULT,EXIT,INCLUDE,IN,NONE,%
+ OUT,INTENT,INTERFACE,MODULE,NAMELIST,%
+ NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,POINTER,PRIVATE,%
+ PUBLIC,RECURSIVE,RESULT,SELECT,SEQUENCE,%
TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,%
ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,%
ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,%
- INOUT,SELECTCASE},%
+ INOUT,SELECTCASE,%
+ ELEMENTAL, ELSEWHERE, FORALL, PURE},%
+ morekeywords=[2]{ACTION,ADVANCE,DELIM,IOLENGTH,LEN,NAME,%
+ NML,PAD,POSITION,READWRITE,SIZE,STAT},% corrected NML from NMT
+ morekeywords=[3]{ADJUSTL,ADJUSTR,ALL,ALLOCATED,ANY,ASSOCIATED,BIT_SIZE,%
+ BTEST,CEILING,COUNT,CPU_TIME,CSHIFT,DATE_AND_TIME,DIGITS,DOT_PRODUCT,%
+ EOSHIFT,EPSILON,EXPONENT,FLOOR,FRACTION,HUGE,IACHAR,IAND,IBCLR,
+ IBITS,IBSET,ICHAR,IEOR,IOR,ISHFT,ISHFTC,KIND,LBOUND,LEN_TRIM,% left out LOGICAL
+ MATMUL,MAXEXPONENT,MAXLOC,MAXVAL,MERGE,MINEXPONENT,MINLOC,MINVAL,%
+ MODULO,MVBITS,NEAREST,NOT,NULL,PACK,PRECISION,PRESENT,PRODUCT,%
+ RADIX,RANDOM_NUMBER,RANDOM_SEED,RANGE,RANK,REPEAT,RESHAPE,RRSPACING,%
+ SCALE,SCAN,SELECTED_INT_KIND,SELECTED_REAL_KIND,SET_EXPONENT,SHAPE,%
+ SINH,SIZE,SPACING,SPREAD,SUM,SYSTEM_CLOCK,TINY,TRANSFER,TRANSPOSE,%
+ TRIM,UBOUND,UNPACK,VERIFY},%
deletecomment=[f],% no fixed comment line: 1998 Magne Rudshaug
morecomment=[l]!%
}%
\lst@definelanguage[77]{Fortran}%
- {morekeywords={ACCESS,ASSIGN,BACKSPACE,BLANK,BLOCK,CALL,CHARACTER,%
- CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DIRECT,DO,DOUBLE,%
- ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EOF,EQUIVALENCE,ERR,EXIST,EXTERNAL,%
- FILE,FMT,FORM,FORMAT,FORMATTED,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,%
- INQUIRE,INTEGER,INTRINSIC,IOSTAT,LOGICAL,NAMED,NEXTREC,NUMBER,%
- OPEN,OPENED,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,%
- REC,RECL,RETURN,REWIND,SEQUENTIAL,STATUS,STOP,SUBROUTINE,THEN,%
- TYPE,UNFORMATTED,UNIT,WRITE,SAVE},%
+ {morekeywords={ASSIGN,BACKSPACE,CALL,CHARACTER,%
+ CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DO,DOUBLE,%
+ ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EQUIVALENCE,EXTERNAL,%
+ FILE,FORMAT,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,%
+ INQUIRE,INTEGER,INTRINSIC,LOGICAL,%
+ OPEN,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,%
+ RETURN,REWIND,STOP,SUBROUTINE,THEN,%
+ WRITE,SAVE},%
+ morekeywords=[2]{ACCESS,BLANK,BLOCK,DIRECT,EOF,ERR,EXIST,%
+ FMT,FORM,FORMATTED,IOSTAT,NAMED,NEXTREC,NUMBER,OPENED,%
+ REC,RECL,SEQUENTIAL,STATUS,TYPE,UNFORMATTED,UNIT},%
+ morekeywords=[3]{INT,DBLE,CMPLX,ICHAR,CHAR,AINT,ANINT,% left out real
+ NINT,ABS,MOD,SIGN,DIM,DPROD,MAX,MIN,AIMAG,CONJG,SQRT,EXP,LOG,%
+ LOG10,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,SINH,COSH,TANH,LGE,LLE,LLT,%
+ LEN,INDEX},%
+ morekeywords=[4]{AND,EQ,EQV,FALSE,GE,GT,OR,LE,LT,NE,NEQV,NOT,TRUE},%
sensitive=f,%% not Fortran-77 standard, but allowed in Fortran-95 %%
morecomment=[f]*,%
morecomment=[f]C,%
@@ -1217,17 +1260,35 @@
}[keywords,directives,comments,strings]%
%%
%% Python definition (c) 1998 Michael Weber
+%% Additional definitions (2013) Alexis Dimitriadis
%%
\lst@definelanguage{Python}%
{morekeywords={access,and,break,class,continue,def,del,elif,else,%
except,exec,finally,for,from,global,if,import,in,is,lambda,not,%
or,pass,print,raise,return,try,while},%
+ % Built-ins
+ morekeywords=[2]{abs,all,any,basestring,bin,bool,bytearray,callable,chr,
+ classmethod,cmp,compile,complex,delattr,dict,dir,divmod,enumerate,eval,
+ execfile,file,filter,float,format,frozenset,getattr,globals,hasattr,hash,
+ help,hex,id,input,int,isinstance,issubclass,iter,len,list,locals,long,map,
+ max,memoryview,min,next,object,oct,open,ord,pow,property,range,raw_input,
+ reduce,reload,repr,reversed,round,set,setattr,slice,sorted,staticmethod,str,
+ sum,super,tuple,type,unichr,unicode,vars,xrange,zip,apply,buffer,coerce,
+ intern},
sensitive=true,%
morecomment=[l]\#,%
morestring=[b]',%
morestring=[b]",%
- morecomment=[s]{'''}{'''},% used for documentation text
- morecomment=[s]{"""}{"""}% added by Philipp Matthias Hahn
+ morestring=[s]{'''}{'''},% used for documentation text (mulitiline strings)
+ morestring=[s]{"""}{"""},% added by Philipp Matthias Hahn
+ morestring=[s]{r'}{'},% `raw' strings
+ morestring=[s]{r"}{"},%
+ morestring=[s]{r'''}{'''},%
+ morestring=[s]{r"""}{"""},%
+ morestring=[s]{u'}{'},% unicode strings
+ morestring=[s]{u"}{"},%
+ morestring=[s]{u'''}{'''},%
+ morestring=[s]{u"""}{"""}%
}%
%%
%% Scilab definition (c) 2002,2003 Jean-Philippe Grivet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstlang2.sty new/tex/latex/listings/lstlang2.sty
--- old/tex/latex/listings/lstlang2.sty 2007-02-28 23:32:28.000000000 +0100
+++ new/tex/latex/listings/lstlang2.sty 2014-03-06 00:15:14.000000000 +0100
@@ -7,9 +7,10 @@
%% lstdrvrs.dtx (with options: `lang2')
%%
%% The listings package is copyright 1996--2004 Carsten Heinz, and
-%% continued maintenance on the package is copyright 2006--2007 Brooks Moses.
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
-%% 2007 any individual author listed in this file.
+%% 2007/2013 any individual author listed in this file.
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -18,10 +19,10 @@
%% This file is completely free and comes without any warranty.
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to Brooks Moses at .
+%% programming languages to Jobst Hoffmann at .
%%
\ProvidesFile{lstlang2.sty}
- [2004/09/05 1.3 listings language file]
+ [2014/03/04 1.5c listings language file]
%%
%% Abap definition by Knut Lickert
%%
@@ -75,6 +76,37 @@
raise,raising}%
}[keywords,comments,strings]
%%
+%% ACM and ACMscript definition
+%% (c) 2013 Stefan Pinnow
+%%
+\lst@definelanguage{ACM}{
+ morekeywords={
+ abs,After,acos,And,As,asin,atan,At,Call,Compatibility,Connect,cos,cosh,%
+ Create,Delay,Difference,Do,Else,ElseIf,End,EndFor,EndIf,EndParallel,%
+ EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,ForEach,Free,%
+ Global,Hidden,If,Implementation,In,Initial,Input,InterSection,%
+ IntegerSet,Invoke,Is,Language,Library,Link,Log10,LogE,Max,Min,Model,Of,%
+ Once,Options,Output,Parallel,Parameter,Pause,Port,Print,Private,%
+ Procedure,Product,Ramp,Repeat,Restart,Return,Round,Runs,Sigma,sin,sinh,%
+ Size,SnapShot,sqr,sqrt,SRamp,State,Stream,StringSet,Structure,Switch,%
+ SubRoutine,SymDiff,tan,tanh,Task,Text,Time,Then,Truncate,Union,Until,%
+ Uses,Variable,Wait,When,With,WithIn,WorkSpace%
+ },%
+ sensitive=false,%
+ morecomment=[l]{//},%
+ morecomment=[s]{/*}{*/},%
+ string=[b]{"},%
+}[keywords,comments,strings]%
+\lst@definelanguage{ACMscript}[]{VBScript}{%
+ morekeywords={%
+ ElseIf,False,In,Resume,True%
+ },%
+ deletekeywords={%
+ Abs,Array,Clear,CreateObject,CStr,Err,ForReading,ForWriting,%
+ OpenTextFile,Replace,WriteLine%
+ }%
+}[keywords,comments,strings]%
+%%
%% Corba IDL definition (c) 1999 Jens T. Berger Thielemann
%%
\lst@definelanguage[CORBA]{IDL}%
@@ -256,6 +288,26 @@
morestring=[d]"%
}[keywords,comments,strings]%
%%
+%% GAP definition
+%% (c) 2013 Heiko Oberdiek
+%%
+\lst@definelanguage{GAP}{%
+ morekeywords={%
+ Assert,Info,IsBound,QUIT,%
+ TryNextMethod,Unbind,and,break,%
+ continue,do,elif,%
+ else,end,false,fi,for,%
+ function,if,in,local,%
+ mod,not,od,or,%
+ quit,rec,repeat,return,%
+ then,true,until,while%
+ },%
+ sensitive,%
+ morecomment=[l]\#,%
+ morestring=[b]",%
+ morestring=[b]',%
+}[keywords,comments,strings]
+%%
%% Guarded Command Language (GCL) definition
%% (c) 2002 Mark van Eijk
%%
@@ -304,6 +356,93 @@
morestring=[b]',%
}[keywords,comments,strings]%
%%
+%% http://gretl.sourceforge.net/gretl-help/cmdref.html
+%% (c) 2013 Ignacio D\'iaz-Emparanza
+%%
+\lst@definelanguage{hansl}{%
+ % $-variables are internal functions in hansl
+ keywordsprefix ={\$},
+ morekeywords={ % hansl commands:
+ add,adf,anova,append,ar,ar1,%
+ arbond,arch,arima,biprobit,boxplot,break,%
+ catch,chow,clear,coeffsum,coint,coint2,%
+ corr,corrgm,cusum,data,dataset,debug,%
+ delete,diff,difftest,discrete,dpanel,dummify,%
+ duration,elif,else,end,endif,endloop,%
+ eqnprint,equation,estimate,fcast,foreign,fractint,%
+ freq,function,garch,genr,gmm,gnuplot,%
+ graphpg,hausman,heckit,help,hsk,hurst,%
+ if,include,info,intreg,join,kalman,%
+ kpss,labels,lad,lags,ldiff,leverage,%
+ levinlin,logistic,logit,logs,loop,mahal,%
+ makepkg,markers,meantest,mle,modeltab,modprint,%
+ modtest,mpols,negbin,nls,normtest,nulldata,%
+ ols,omit,open,orthdev,outfile,panel,%
+ pca,pergm,poisson,print,printf,probit,%
+ pvalue,qlrtest,qqplot,quantreg,quit,rename,%
+ reset,restrict,rmplot,run,runs,scatters,%
+ sdiff,set,setinfo,setobs,setmiss,shell,%
+ smpl,spearman,sprintf,square,sscanf,store,%
+ summary,system,tabprint,textplot,tobit,tsls,%
+ var,varlist,vartest,vecm,vif,wls,%
+ xcorrgm,xtab,scalar,series,matrix,string},%
+ morekeywords=[2]{ % Functions
+ abs,acos,acosh,aggregate,argname,%
+ asin,asinh,atan,atanh,atof,%
+ bessel,BFGSmax,bkfilt,boxcox,bwfilt,%
+ cdemean,cdf,cdiv,ceil,cholesky,%
+ chowlin,cmult,cnorm,colname,colnames,%
+ cols,corr,corrgm,cos,cosh,%
+ cov,critical,cum,deseas,det,%
+ diag,diagcat,diff,digamma,dnorm,%
+ dsort,dummify,eigengen,eigensym,eigsolve,%
+ epochday,errmsg,exp,fcstats,fdjac,%
+ fft,ffti,filter,firstobs,fixname,%
+ floor,fracdiff,gammafun,getenv,getline,%
+ ghk,gini,ginv,halton,hdprod,%
+ hpfilt,I,imaxc,imaxr,imhof,%
+ iminc,iminr,inbundle,infnorm,inlist,%
+ int,inv,invcdf,invmills,invpd,%
+ irf,irr,isconst,isnan,isnull,%
+ isodate,iwishart,kdensity,kfilter,ksimul,%
+ ksmooth,kurtosis,lags,lastobs,ldet,%
+ ldiff,lincomb,ljungbox,lngamma,log,%
+ log10,log2,loess,logistic,lower,%
+ lrvar,max,maxc,maxr,mcorr,%
+ mcov,mcovg,mean,meanc,meanr,%
+ median,mexp,min,minc,minr,%
+ missing,misszero,mlag,mnormal,mols,%
+ monthlen,movavg,mpols,mrandgen,mread,%
+ mreverse,mrls,mshape,msortby,muniform,%
+ mwrite,mxtab,nadarwat,nelem,ngetenv,%
+ nobs,normal,npv,NRmax,nullspace,%
+ obs,obslabel,obsnum,ok,onenorm,%
+ ones,orthdev,pdf,pergm,pmax,%
+ pmean,pmin,pnobs,polroots,polyfit,%
+ princomp,prodc,prodr,psd,psdroot,%
+ pshrink,psum,pvalue,pxsum,qform,%
+ qnorm,qrdecomp,quadtable,quantile,randgen,%
+ randgen1,randint,rank,ranking,rcond,%
+ readfile,regsub,remove,replace,resample,%
+ round,rownames,rows,sd,sdc,%
+ sdiff,selifc,selifr,seq,setnote,%
+ simann,sin,sinh,skewness,sort,%
+ sortby,sqrt,sscanf,sst,strlen,%
+ strncmp,strsplit,strstr,strstrip,strsub,%
+ sum,sumall,sumc,sumr,svd,%
+ tan,tanh,toepsolv,tolower,toupper,%
+ tr,transp,trimr,typestr,uniform,%
+ uniq,unvech,upper,urcpval,values,%
+ var,varname,varnum,varsimul,vec,%
+ vech,weekday,wmean,wsd,wvar,%
+ xmax,xmin,xpx,zeromiss,zeros,%
+ },%
+ sensitive=t,%
+ morecomment=[l]{\#},%
+ morecomment=[s]{/*}{*/},%
+ morestring=[b]{"}}%
+\lstalias{gretl}{hansl}
+%%
%% Haskell98 as implemented in Hugs98. See http://www.haskell.org
%% All keywords from Prelude and Standard Libraries
%% (c) 1999 Peter Bartke
@@ -423,7 +562,7 @@
static,supporter,switchable,talkable,transparent,visited,%
workflag,worn},%
%
- % Libary properties
+ % Library properties
morekeywords=[5]{n_to,s_to,e_to,w_to,ne_to,nw_to,se_to,sw_to,in_to,%
out_to,u_to,d_to,add_to_scope,after,article,articles,before,%
cant_go,capacity,daemon,describe,description,door_dir,door_to,%
@@ -431,7 +570,7 @@
life,list_together,name number,orders,parse_name,plural,%
react_after,react_before,short_name,short_name_indef,time_left,%
time_out,when_closed,when_open,when_on,when_off,%
- with_key},
+ with_key},%
%
% Library routines
morekeywords=[6]{Achieved,AfterRoutines,AllowPushDir,Banner,ChangePlayer,%
@@ -619,6 +758,123 @@
morestring=[b]"%
}[keywords,comments,strings]%
%%
+%% Lua definitions (c) 2013 Stephan Hennig
+%%
+\lst@definelanguage[5.0]{Lua}{%
+ alsoletter={.},%
+ morekeywords=[1]{%
+ and, break, do, else, elseif, end, false, for, function, if, in,%
+ local, nil, not, or, repeat, return, then, true, until, while,%
+ },%
+ morekeywords=[2]{%
+ _G, _LOADED, _REQUIREDNAME, _VERSION, LUA_PATH,%
+ assert, collectgarbage, dofile, error, gcinfo, getfenv,%
+ getmetatable, ipairs, loadfile, loadlib, loadstring, newproxy,%
+ next, pairs, pcall, print, rawequal, rawget, rawset, require,%
+ setfenv, setmetatable, tonumber, tostring, type, unpack, xpcall,%
+ coroutine, coroutine.create, coroutine.resume,%
+ coroutine.status, coroutine.wrap, coroutine.yield,%
+ _TRACEBACK, debug, debug.debug, debug.gethook, debug.getinfo,%
+ debug.getlocal, debug.getupvalue, debug.sethook, debug.setlocal,%
+ debug.setupvalue,debug.traceback,%
+ io, io.close, io.flush, io.input, io.lines, io.open, io.output,%
+ io.popen, io.read, io.stderr, io.stdin, io.stdout, io.tmpfile,%
+ io.type, io.write,%
+ __pow, math, math.abs, math.acos, math.asin, math.atan, math.atan2,%
+ math.ceil, math.cos, math.deg, math.exp, math.floor, math.frexp,%
+ math.ldexp, math.log, math.log10, math.max, math.min, math.mod,%
+ math.pi, math.pow, math.rad, math.random, math.randomseed, math.sin,%
+ math.sqrt, math.tan,%
+ os, os.clock, os.date, os.difftime, os.execute, os.exit, os.getenv,%
+ os.remove, os.rename, os.setlocale, os.time, os.tmpname,%
+ string, string.byte, string.char, string.dump, string.find,%
+ string.format, string.gfind, string.gsub, string.len, string.lower,%
+ string.rep, string.sub, string.upper,%
+ table, table.concat, table.foreach, table.foreachi, table.getn,%
+ table.insert, table.remove, table.setn, table.sort,%
+ },%
+ morekeywords=[2]{%
+ _PROMPT, _PROMPT2, arg,%
+ },%
+ sensitive=true,%
+ % single line comments
+ morecomment=[l]{--},%
+ % multi line comments
+ morecomment=[s]{--[[}{]]},%
+ % backslash escaped strings
+ morestring=[b]",%
+ morestring=[b]',%
+ % multi line strings
+ morestring=[s]{[[}{]]},%
+}[keywords,comments,strings]%
+\lst@definelanguage[5.1]{Lua}[5.0]{Lua}{%
+ deletekeywords=[2]{%
+ _LOADED, _REQUIREDNAME, LUA_PATH, gcinfo, loadlib,%
+ _TRACEBACK,%
+ __pow, math.mod,%
+ string.gfind,%
+ table.foreach, table.foreachi, table.getn, table.setn,%
+ },%
+ morekeywords=[2]{%
+ load, select,%
+ coroutine.running,%
+ debug.getfenv, debug.getmetatable, debug.getregistry, debug.setfenv,%
+ debug.setmetatable,%
+ math.cosh, math.fmod, math.huge, math.modf, math.sinh, math.tanh,%
+ module, package, package.config, package.cpath, package.loaded,%
+ package.loaders, package.loadlib, package.path, package.preload,%
+ package.seeall,%
+ string.gmatch, string.match, string.reverse,%
+ table.maxn,%
+ },%
+ morecomment=[s]{--[=[}{]=]},%
+ morecomment=[s]{--[==[}{]==]},%
+ morecomment=[s]{--[===[}{]===]},%
+ morecomment=[s]{--[====[}{]====]},%
+ morecomment=[s]{--[=====[}{]=====]},%
+ morecomment=[s]{--[======[}{]======]},%
+ morecomment=[s]{--[=======[}{]=======]},%
+ morecomment=[s]{--[========[}{]========]},%
+ morecomment=[s]{--[=========[}{]=========]},%
+ morecomment=[s]{--[==========[}{]==========]},%
+ morestring=[s]{[=[}{]=]},%
+ morestring=[s]{[==[}{]==]},%
+ morestring=[s]{[===[}{]===]},%
+ morestring=[s]{[====[}{]====]},%
+ morestring=[s]{[=====[}{]=====]},%
+ morestring=[s]{[======[}{]======]},%
+ morestring=[s]{[=======[}{]=======]},%
+ morestring=[s]{[========[}{]========]},%
+ morestring=[s]{[=========[}{]=========]},%
+ morestring=[s]{[==========[}{]==========]},%
+}[keywords,comments,strings]%
+\lst@definelanguage[5.2]{Lua}[5.1]{Lua}{%
+ morekeywords=[1]{%
+ goto,%
+ },%
+ deletekeywords=[2]{%
+ getfenv, loadstring, module, newproxy, setfenv, unpack,%
+ debug.getfenv, debug.setfenv,%
+ math.log10,%
+ package.loaders, package.seeall,%
+ table.maxn,%
+ },%
+ morekeywords=[2]{%
+ rawlen,%
+ bit32, bit32.arshift, bit32.band, bit32.bnot, bit32.bor,%
+ bit32.btest, bit32.bxor, bit32.extract, bit32.lrotate,%
+ bit32.lshift, bit32.replace, bit32.rrotate, bit32.rshift,%
+ debug.getuservalue, debug.setuservalue, debug.upvalueid,%
+ debug.upvaluejoin,%
+ package.searchers, package.searchpath,%
+ table.pack, table.unpack,%
+ },%
+ morekeywords=[2]{%
+ _ENV,%
+ },%
+ moredelim=[s][keywordstyle3]{::}{::},%
+}[keywords,comments,strings]%
+%%
%% Make definitions (c) 2000 Rolf Niepraschk
%%
\lst@definelanguage[gnu]{make}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstlang3.sty new/tex/latex/listings/lstlang3.sty
--- old/tex/latex/listings/lstlang3.sty 2007-02-28 23:32:28.000000000 +0100
+++ new/tex/latex/listings/lstlang3.sty 2014-03-06 00:15:14.000000000 +0100
@@ -7,9 +7,10 @@
%% lstdrvrs.dtx (with options: `lang3')
%%
%% The listings package is copyright 1996--2004 Carsten Heinz, and
-%% continued maintenance on the package is copyright 2006--2007 Brooks Moses.
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
-%% 2007 any individual author listed in this file.
+%% 2007/2013 any individual author listed in this file.
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -18,10 +19,10 @@
%% This file is completely free and comes without any warranty.
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to Brooks Moses at .
+%% programming languages to Jobst Hoffmann at .
%%
\ProvidesFile{lstlang3.sty}
- [2004/09/05 1.3 listings language file]
+ [2014/03/04 1.5c listings language file]
\lst@definelanguage[68]{Algol}%
{morekeywords={abs,and,arg,begin,bin,bits,bool,by,bytes,case,channel,%
char,co,comment,compl,conj,divab,do,down,elem,elif,else,empty,%
@@ -527,6 +528,42 @@
morecomment=[l]{--},
morestring=[b]",
}[keywords,comments,strings]%
+\lst@definelanguage{LLVM}{%
+ morekeywords={%
+ ret,br,switch,indirectbr,invoke,resume,unreachable,%
+ add,fadd,sub,fsub,mul,fmul,udiv,sdiv,fdiv,urem,srem,frem,%
+ shl,lshr,ashr,and,or,xor,%
+ extractelement,insertelement,shufflevector,%
+ extractvalue,insertvalue,%
+ alloca,load,store,fence,cmpxchg,atomicrmw,getelementptr,%
+ trunc,zext,sext,fptrunc,fpext,fptoui,fptosi,uitofp,sitofp,ptrtoint,%
+ inttoptr,bitcast,to,%
+ icmp,fcmp,phi,select,call,va_arg,landingpad,%
+ xchg,add,sub,and,nand,or,xor,max,min,umax,umin,%
+ eq,ne,ugt,uge,ult,ule,sgt,sge,slt,sle,%
+ false,oeq,ogt,oge,olt,ole,one,ord,ueq,ugt,uge,ult,ule,une,uno,true,%
+ private,linker_private,linker_private_weak,linker_private_weak_def_auto,%
+ internal,available_externally,linkonce,common,weak,appending,extern_weak,%
+ linkonce_odr,weak_odr,external,dllimport,dllexport,%
+ define,declare,%
+ zeroext,signext,inreg,byval,sret,noalias,nocapture,next,%
+ gc,%
+ address_safety,alignstack,alwaysinline,nonlazybind,inlinehint,naked,%
+ noimplicitfloat,noinline,noredzone,noreturn,nounwind,optsize,readnone,%
+ readonly,returns_twice,ssp,sspreq,uwtable,%
+ module,asm,%
+ target,datalayout,%
+ sideeffect,alignstack,%
+ nuw,nsw,exact,inbounds,unnamed_addr},%
+ morekeywords=[2]{%
+ i1,i2,i4,i8,i16,i32,i64,i128,i256,i512,i1024,% <-- Most common integers
+ half,float,double,x86_fp80,fp128,ppc_fp128,x86mmx,%
+ void,label,metadata},%
+ alsoletter=.,%
+ sensitive=false,%
+ morecomment=[l];,%
+ morestring=[b]"%
+}
\lst@definelanguage{Logo}%
{morekeywords={and,atan,arctan,both,break,bf,bl,butfirst,butlast,%
cbreak, close,co,continue,cos,count,clearscreen,cs,debquit,%
@@ -1485,7 +1522,7 @@
ignorespaces,immediate,indent,input,insert,insertpenalties,%
interlinepenalty,jobname,kern,language,lastbox,lastkern,%
lastpenalty,lastskip,lccode,leaders,left,lefthyphenmin,leftskip,%
- leqno,let,limits,linepenalty,lineskip,lineskiplimits,long,%
+ leqno,let,limits,linepenalty,lineskip,lineskiplimit,long,%
looseness,lower,lowercase,mag,mark,mathaccent,mathbin,mathchar,%
mathchardef,mathchoice,mathclose,mathcode,mathinner,mathop,%
mathopen,mathord,mathpunct,mathrel,mathsurround,maxdeadcycles,%
@@ -1514,7 +1551,7 @@
vfilneg,vfuzz,voffset,vrule,vsize,vskip,vsplit,vss,vtop,wd,%
widowpenalty,write,xdef,xleaders,xspaceskip,year},%
sensitive,%
- alsoother={0123456789$_},%
+ alsoother={0123456789$_},%$ to make Emacs fontlocking happy
morecomment=[l]\%%
}[keywords,tex,comments]%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/listings/lstmisc.sty new/tex/latex/listings/lstmisc.sty
--- old/tex/latex/listings/lstmisc.sty 2008-06-10 22:46:51.000000000 +0200
+++ new/tex/latex/listings/lstmisc.sty 2014-03-06 00:15:14.000000000 +0100
@@ -11,12 +11,13 @@
%% (w)(c) 1996--2004 Carsten Heinz and/or any other author listed
%% elsewhere in this file.
%% (c) 2006 Brooks Moses
+%% (c) 2013- Jobst Hoffmann
%%
%% Send comments and ideas on the package, error reports and additional
-%% programming languages to .
+%% programming languages to Jobst Hoffmann at .
%%
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2014/03/04}
+\def\fileversion{1.5c}
\ProvidesFile{lstmisc.sty}
[\filedate\space\fileversion\space(Carsten Heinz)]
\lst@CheckVersion\fileversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listings.tlpobj new/tlpkg/tlpobj/listings.tlpobj
--- old/tlpkg/tlpobj/listings.tlpobj 2010-06-10 18:34:18.000000000 +0200
+++ new/tlpkg/tlpobj/listings.tlpobj 2014-03-06 03:23:25.000000000 +0100
@@ -1,21 +1,23 @@
name listings
category Package
-revision 15878
+revision 33095
shortdesc Typeset source code listings using LaTeX.
relocated 1
-longdesc Typeset programs (programming code) within LaTeX. The source
-longdesc code is read directly by TeX. Keywords, comments and strings
+longdesc The package enables the user to typeset programs (programming
+longdesc code) within LaTeX; the source code is read directly by TeX--no
+longdesc front-end processor is needed. Keywords, comments and strings
longdesc can be typeset using different styles (default is bold for
longdesc keywords, italic for comments and no special style for
-longdesc strings). Includes support for hyperref. To use, simply
-longdesc \usepackage{listings}, identify the language with
-longdesc \lstset{language=Python}, then employ the \begin{lstlisting}
-longdesc ... \end{lstlisting} environment or the
-longdesc \lstinputlisting{filename.py} command. Short (in-line) listings
-longdesc are also available, using either \lstinline|...| or | ... |
-longdesc (after defining the | token with the \lstMakeShortInline
+longdesc strings). Support for hyperref is provided. To use,
+longdesc \usepackage{listings}, identify the language of the object to
+longdesc typeset, using a construct like: \lstset{language=Python}, then
+longdesc use environment lstlisting for inline code. External files may
+longdesc be formatted using \lstinputlisting to process a given file in
+longdesc the form appropriate for the current language. Short (in-line)
+longdesc listings are also available, using either \lstinline|...| or
+longdesc |...| (after defining the | token with the \lstMakeShortInline
longdesc command).
-runfiles size=107
+runfiles size=111
RELOC/tex/latex/listings/listings.cfg
RELOC/tex/latex/listings/listings.sty
RELOC/tex/latex/listings/lstdoc.sty
@@ -24,6 +26,6 @@
RELOC/tex/latex/listings/lstlang3.sty
RELOC/tex/latex/listings/lstmisc.sty
catalogue-ctan /macros/latex/contrib/listings
-catalogue-date 2007-03-12 20:45:12 +0100
+catalogue-date 2014-03-04 22:18:45 +0100
catalogue-license lppl
-catalogue-version 1.4
+catalogue-version 1.5c
++++++ texlive-specs-m-rpmlintrc ++++++
addFilter(".*dangling-symlink.*/fonts/.*")
addFilter(".*dangling-symlink.*/zypper\.py.*")
addFilter(".*description-shorter-than-summary.*")
addFilter(".*devel-file-in-non-devel-package.*/doc/.*")
addFilter(".*files-duplicate.*")
addFilter(".*E:.*files-duplicated-waste.*")
addFilter(".*spelling-error.*")
addFilter(".*zero-length.*")
addFilter(".*E:.*summary-too-long.*")
addFilter(".*incorrect-fsf-address.*")
addFilter(".*hidden-file-or-dir.*/\.tex.*")
addFilter(".*wrong-script-end-of-line-encoding.*")
addFilter(".*script-without-shebang.*/doc/.*")
addFilter(".*wrong-script-interpreter.*/doc/.*")
addFilter(".*non-executable-script.*/doc/.*")